You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2026/03/21 15:04:19 UTC
(cxf) branch main updated: Make sure the test server ports do not collide (#2973)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 6a7c1b6f24a Make sure the test server ports do not collide (#2973)
6a7c1b6f24a is described below
commit 6a7c1b6f24aaac1782e7606517f637b279cb89e9
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Mar 21 11:04:13 2026 -0400
Make sure the test server ports do not collide (#2973)
---
.../{STSServer.java => DelegationSTSServer.java} | 2 +-
.../systest/sts/delegation/SAMLDelegationTest.java | 4 +-
.../systest/sts/delegation/cxf-sts-transport.xml | 6 +-
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 10 +-
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 10 +-
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 10 +-
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 10 +-
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 10 +-
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 10 +-
.../JAXRSClientServerUserResourceAsteriskTest.java | 8 +-
.../JAXRSClientServerUserResourceDefaultTest.java | 8 +-
.../jaxrs/JAXRSClientServerUserResourceTest.java | 8 +-
.../apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java | 10 +-
.../cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java | 10 +-
.../apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java | 10 +-
.../systest/jaxrs/cors/CrossOriginSimpleTest.java | 10 +-
.../systest/handlers/HandlerInvocationTest.java | 4 +-
.../handlers/{Server.java => HandlersServer.java} | 6 +-
.../systest/handlers/TrivialSOAPHandlerTest.java | 8 +-
.../systest/jaxws/AttachmentMtomChunkingTest.java | 8 +-
.../org/apache/cxf/systest/jaxws/CXF5061Test.java | 6 +-
.../org/apache/cxf/systest/jaxws/CXF6655Test.java | 8 +-
.../org/apache/cxf/systest/jaxws/CXF7990Test.java | 8 +-
...java => ClientServerRPCLitDefaultAnnoTest.java} | 10 +-
.../cxf/systest/jaxws/ClientServerRPCLitTest.java | 8 +-
.../apache/cxf/systest/jaxws/ClientServerTest.java | 14 +--
...stomizedMicrometerProviderClientServerTest.java | 6 +-
.../jaxws/{Server.java => JAXWSServer.java} | 10 +-
.../cxf/systest/jaxws/LocatorClientServerTest.java | 8 +-
.../SchemaValidationMetricsClientServerTest.java | 6 +-
...ionWithoutViolationMetricsClientServerTest.java | 6 +-
.../jaxws/websocket/ClientServerWebSocketTest.java | 4 +-
.../{Server.java => WebSocketServer.java} | 8 +-
.../apache/cxf/systest/provider/CXF4130Test.java | 8 +-
.../apache/cxf/systest/provider/CXF4818Test.java | 8 +-
.../InterpretNullAsOnewayProviderTest.java | 8 +-
.../provider/NBProviderClientServerTest.java | 8 +-
.../systest/provider/ProviderClientServerTest.java | 8 +-
.../provider/ProviderRPCClientServerTest.java | 4 +-
.../{Server.java => ProviderRPCServer.java} | 6 +-
.../datasource/DataSourceProviderTest.java | 4 +-
.../{Server.java => DataSourceServer.java} | 6 +-
.../cxf/systest/swa/ClientServerSwaTest.java | 6 +-
.../systest/swa/{Server.java => SwaServer.java} | 6 +-
.../{StaxServer.java => KerberosServer.java} | 8 +-
.../{Server.java => KerberosStaxServer.java} | 8 +-
.../kerberos/wssec/kerberos/KerberosTokenTest.java | 14 +--
.../spnego/{Server.java => SpnegoServer.java} | 8 +-
.../{StaxServer.java => SpnegoStaxServer.java} | 8 +-
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 12 +--
.../cxf/systest/kerberos/wssec/kerberos/server.xml | 40 ++++----
.../kerberos/wssec/kerberos/stax-server.xml | 30 +++---
.../cxf/systest/kerberos/wssec/spnego/server.xml | 16 ++--
.../systest/kerberos/wssec/spnego/stax-server.xml | 14 +--
.../servlet/jetty/JettyEmptyApplicationTest.java | 10 +-
.../jetty/JettyEmptyPathApplicationTest.java | 10 +-
.../servlet/jetty/JettyNoApplicationTest.java | 10 +-
.../JettySingleApplicationOnlyClassesTest.java | 11 ++-
.../JettySingleApplicationOnlySingletonsTest.java | 11 ++-
.../servlet/jetty/JettySingleApplicationTest.java | 10 +-
.../cxf/systest/jaxrs/sse/jetty/JettyWarTest.java | 10 +-
.../systest/jaxrs/sse/tomcat/TomcatWarTest.java | 10 +-
...TracingTest.java => JaxrsBraveTracingTest.java} | 4 +-
...ngTest.java => JaxrsMicrometerTracingTest.java} | 4 +-
...est.java => JaxrsOpenTelemetryTracingTest.java} | 4 +-
...gTest.java => JaxrsOpenTracingTracingTest.java} | 4 +-
...TracingTest.java => JaxwsBraveTracingTest.java} | 4 +-
...ngTest.java => JaxwsMicrometerTracingTest.java} | 4 +-
...est.java => JaxwsOpenTelemetryTracingTest.java} | 4 +-
...gTest.java => JaxwsOpenTracingTracingTest.java} | 4 +-
.../{Server.java => JMSSoapActionServer.java} | 6 +-
.../cxf/systest/jms/action/JMSSoapActionTest.java | 2 +-
.../{Server.java => JMSWSSecurityServer.java} | 6 +-
.../systest/jms/security/JMSWSSecurityTest.java | 2 +-
.../cxf/systest/jms/swa/ClientServerSwaTest.java | 4 +-
.../ClientServerWrappedContinuationTest.java | 10 +-
.../multipart/ClientServerSwaTest.java | 6 +-
.../{Server.java => MultipartServer.java} | 6 +-
.../http_undertow/continuations/jaxws-server.xml | 2 +-
.../apache/cxf/systest/http/HTTPConduitTest.java | 8 +-
.../http/{BusServer.java => HttpBusServer.java} | 8 +-
.../systest/http/{Server.java => HttpServer.java} | 10 +-
.../systest/http/jaxws/JAXWSAsyncClientTest.java | 8 +-
.../cxf/systest/http/jaxws/JAXWSClientTest.java | 8 +-
.../ClientServerWrappedContinuationTest.java | 10 +-
.../https/{BusServer.java => HttpsBusServer.java} | 8 +-
.../cxf/systest/https/conduit/HTTPSClientTest.java | 24 ++---
.../systest/https/conduit/HTTPSConduitTest.java | 10 +-
.../conduit/{Server.java => HttpsServer.java} | 10 +-
.../https/constraints/CertConstraintsTest.java | 22 ++---
.../apache/cxf/systest/servlet/CXFFilterTest.java | 10 +-
.../apache/cxf/systest/servlet/CXFServletTest.java | 10 +-
.../servlet/ExternalServicesServletTest.java | 10 +-
.../cxf/systest/servlet/JsFrontEndServletTest.java | 10 +-
.../servlet/SpringAutoPublishServletTest.java | 10 +-
.../systest/servlet/SpringServletContextTest.java | 10 +-
.../cxf/systest/servlet/SpringServletTest.java | 10 +-
.../soap_udp/{Server.java => SoapUDPServer.java} | 6 +-
.../apache/cxf/systest/soap_udp/SoapUDPTest.java | 4 +-
.../org/apache/cxf/systest/http/Abost.cxf | 2 +-
.../org/apache/cxf/systest/http/Hurlon.cxf | 2 +-
.../org/apache/cxf/systest/http/Rethwel.cxf | 2 +-
.../http_jetty/continuations/jaxws-server.xml | 2 +-
.../apache/cxf/systest/https/conduit/Bethal.cxf | 4 +-
.../systest/https/conduit/BethalClientBeans.xml | 2 +-
.../org/apache/cxf/systest/https/conduit/Gordy.cxf | 4 +-
.../apache/cxf/systest/https/conduit/Morpit.cxf | 2 +-
.../apache/cxf/systest/https/conduit/Poltim.cxf | 4 +-
.../apache/cxf/systest/https/conduit/Tarpin.cxf | 4 +-
.../https/conduit/jaxws-publish-callback.xml | 4 +-
.../cxf/systest/https/conduit/jaxws-publish.xml | 4 +-
.../cxf/systest/https/conduit/jaxws-server.xml | 6 +-
.../https/conduit/jaxws-tlsrefs-publish.xml | 4 +-
.../apache/cxf/systest/https/conduit/pkcs12.xml | 4 +-
.../https/conduit/resource-key-spec-url.xml | 4 +-
.../systest/https/conduit/resource-key-spec.xml | 4 +-
.../https/constraints/jaxws-server-constraints.xml | 48 +++++-----
.../cxf2006/{Server.java => Cxf2006Server.java} | 10 +-
.../RespectBindingFeatureClientServerTest.java | 4 +-
.../systest/callback/CallbackClientServerTest.java | 4 +-
.../callback/{Server.java => CallbackServer.java} | 6 +-
.../corba/{Server.java => CorbaServer.java} | 6 +-
.../org/apache/cxf/systest/corba/CorbaTest.java | 4 +-
.../apache/cxf/systest/corba/CorbaTimeoutTest.java | 2 +-
.../cxf993/{Server.java => Cxf993Server.java} | 6 +-
.../org/apache/cxf/systest/cxf993/Cxf993Test.java | 4 +-
.../systest/exception/GenericExceptionTest.java | 4 +-
.../exception/{Server.java => GenericServer.java} | 6 +-
.../systest/fault/IntFaultClientServerTest.java | 4 +-
.../fault/{Server.java => IntFaultServer.java} | 6 +-
.../systest/interceptor/InterceptorFaultTest.java | 8 +-
.../cxf/systest/jca/OutBoundConnectionTest.java | 10 +-
.../apache/cxf/systest/js/JSClientServerTest.java | 6 +-
.../cxf/systest/js/{Server.java => JSServer.java} | 8 +-
.../{Server.java => MTOMBindingServer.java} | 6 +-
.../mtom_bindingtype/MTOMBindingTypeTest.java | 4 +-
.../mtom_feature/MtomFeatureClientServerTest.java | 4 +-
.../{Server.java => MtomFeatureServer.java} | 6 +-
...ava => MTOMProviderSchemaValidationServer.java} | 6 +-
.../MTOMProviderSchemaValidationTest.java | 4 +-
.../nested_callback/CallbackClientServerTest.java | 6 +-
.../{Server.java => NestedCallbackServer.java} | 6 +-
.../systest/outofband/header/OOBHeaderTest.java | 4 +-
.../header/{Server.java => OOBServer.java} | 6 +-
.../{Server.java => JarResolverServer.java} | 6 +-
.../cxf/systest/resolver/JarResolverTest.java | 4 +-
.../{Server.java => SchemaImportServer.java} | 8 +-
.../cxf/systest/schemaimport/SchemaImportTest.java | 4 +-
.../cxf/systest/soap12/Soap12ClientServerTest.java | 4 +-
.../soap12/{Server.java => Soap12Server.java} | 6 +-
.../soapfault/SOAPFaultRequestTestCase.java | 4 +-
.../{Server.java => SOAPFaultServer.java} | 6 +-
.../systest/soapheader/HeaderClientServerTest.java | 4 +-
.../{Server.java => SoapHeaderServer.java} | 6 +-
.../ExtSoapHeaderClientServerTest.java | 10 +-
.../StaxTransformFeatureTest.java | 8 +-
.../{Server.java => StringArrayServer.java} | 6 +-
.../cxf/systest/stringarray/StringArrayTest.java | 4 +-
.../type_substitution/TypeSubClientServerTest.java | 4 +-
.../{Server.java => TypeSubstitutionServer.java} | 6 +-
.../versioning/ClientServerVersioningTest.java | 4 +-
.../{Server.java => VersioningServer.java} | 6 +-
.../cxf/systest/ws/rm/CachedOutMessageTest.java | 6 +-
.../cxf/systest/ws/rm/DecoupledBareTest.java | 6 +-
.../ws/rm/DecoupledClientServerOnewayTest.java | 6 +-
.../systest/ws/rm/DecoupledClientServerTest.java | 6 +-
.../apache/cxf/systest/ws/rm/RedeliveryTest.java | 10 +-
.../cxf/systest/ws/rm/RetransmissionGZIPTest.java | 8 +-
.../cxf/systest/ws/rm/RetransmissionQueueTest.java | 8 +-
.../systest/ws/rm/{Server.java => RmServer.java} | 6 +-
.../systest/ws/rm/RobustServiceAtMostOnceTest.java | 6 +-
.../systest/ws/rm/RobustServiceWithFaultTest.java | 6 +-
.../org/apache/cxf/systest/ws/rm/SequenceTest.java | 4 +-
.../{Server.java => WSRMOptionalPolicyServer.java} | 6 +-
.../ws/rm/policy/WSRMOptionalPolicyTest.java | 4 +-
.../ws/rm/sec/WSRMWithWSSecurityPolicyTest.java | 6 +-
.../apache/cxf/systest/ws/rm/sec/client-policy.xml | 6 +-
.../apache/cxf/systest/ws/rm/sec/server-policy.xml | 4 +-
.../examples/saml/{Server.java => SamlServer.java} | 8 +-
.../saml/{StaxServer.java => SamlStaxServer.java} | 8 +-
.../systest/wssec/examples/saml/SamlTokenTest.java | 12 +--
.../{Server.java => SecureConversationServer.java} | 8 +-
...rver.java => SecureConversationStaxServer.java} | 8 +-
.../examples/secconv/SecureConversationTest.java | 8 +-
.../ut/{Server.java => UsernameTokenServer.java} | 8 +-
...taxServer.java => UsernameTokenStaxServer.java} | 8 +-
.../wssec/examples/ut/UsernameTokenTest.java | 12 +--
.../examples/x509/{Server.java => X509Server.java} | 8 +-
.../x509/{StaxServer.java => X509StaxServer.java} | 8 +-
.../systest/wssec/examples/x509/X509TokenTest.java | 8 +-
.../cxf/systest/wssec/examples/saml/server.xml | 24 ++---
.../systest/wssec/examples/saml/stax-server.xml | 22 ++---
.../cxf/systest/wssec/examples/secconv/server.xml | 2 +-
.../systest/wssec/examples/secconv/stax-server.xml | 2 +-
.../cxf/systest/wssec/examples/ut/server.xml | 16 ++--
.../cxf/systest/wssec/examples/ut/stax-server.xml | 16 ++--
.../cxf/systest/wssec/examples/x509/server.xml | 8 +-
.../systest/wssec/examples/x509/stax-server.xml | 8 +-
.../ws/action/{Server.java => ActionServer.java} | 6 +-
.../apache/cxf/systest/ws/action/ActionTest.java | 10 +-
.../action/{UTServer.java => UTActionServer.java} | 4 +-
.../{Server.java => AlgorithmSuiteServer.java} | 8 +-
...axServer.java => AlgorithmSuiteStaxServer.java} | 8 +-
.../systest/ws/algsuite/AlgorithmSuiteTest.java | 4 +-
.../ws/algsuite/StaxAlgorithmSuiteTest.java | 4 +-
.../systest/ws/basicauth/BasicAuthJAASTest.java | 2 +-
.../{Server.java => BasicAuthServer.java} | 8 +-
.../cxf/systest/ws/basicauth/BasicAuthTest.java | 4 +-
.../systest/ws/bindings/BindingPropertiesTest.java | 8 +-
.../bindings/{Server.java => BindingServer.java} | 8 +-
.../{StaxServer.java => BindingStaxServer.java} | 8 +-
.../ws/cache/{Server.java => CachingServer.java} | 6 +-
.../apache/cxf/systest/ws/cache/CachingTest.java | 4 +-
.../CryptoCoverageCheckerTest.java | 8 +-
.../{Server.java => CryptoCoverageServer.java} | 6 +-
...axServer.java => CryptoCoverageStaxServer.java} | 6 +-
.../ws/fault/{Server.java => FaultServer.java} | 8 +-
.../org/apache/cxf/systest/ws/fault/FaultTest.java | 4 +-
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 8 +-
.../systest/ws/gcm/{Server.java => GcmServer.java} | 8 +-
.../ws/gcm/{StaxServer.java => GcmStaxServer.java} | 8 +-
.../ws/httpget/{Server.java => HTTPGetServer.java} | 6 +-
.../apache/cxf/systest/ws/httpget/HTTPGetTest.java | 4 +-
.../ws/https/{Server.java => HttpsServer.java} | 8 +-
.../{StaxServer.java => HttpsStaxServer.java} | 8 +-
.../cxf/systest/ws/https/HttpsTokenTest.java | 8 +-
.../cxf/systest/ws/mtom/MTOMSecurityTest.java | 8 +-
.../ws/mtom/{Server.java => MTOMServer.java} | 6 +-
.../mtom/{StaxServer.java => MTOMStaxServer.java} | 6 +-
.../ws/parts/{Server.java => PartsServer.java} | 8 +-
.../{StaxServer.java => PartsStaxServer.java} | 8 +-
.../org/apache/cxf/systest/ws/parts/PartsTest.java | 8 +-
.../ws/password/PasswordPropertiesTest.java | 4 +-
.../password/{Server.java => PasswordServer.java} | 6 +-
.../{Server.java => PolicyAlternativeServer.java} | 8 +-
.../systest/ws/policy/PolicyAlternativeTest.java | 6 +-
.../handler/PolicyHandlerFaultResponseTest.java | 4 +-
.../{Server.java => PolicyHandlerServer.java} | 6 +-
.../{Server.java => PolicyOperationServer.java} | 8 +-
.../ws/policy/operation/PolicyOperationTest.java | 4 +-
.../saml/{StaxServer.java => SamlTokenServer.java} | 8 +-
.../saml/{Server.java => SamlTokenStaxServer.java} | 8 +-
.../apache/cxf/systest/ws/saml/SamlTokenTest.java | 12 +--
.../{Server.java => SamlSubjectConfServer.java} | 8 +-
...xServer.java => SamlSubjectConfStaxServer.java} | 8 +-
.../ws/saml/subjectconf/SamlSubjectConfTest.java | 8 +-
.../systest/ws/security/WSSecurityClientTest.java | 8 +-
.../{Server.java => WSSecurityServer.java} | 6 +-
.../{StaxServer.java => WSSecurityStaxServer.java} | 6 +-
.../handler/{Server.java => WSSecServer.java} | 6 +-
.../cxf/systest/ws/security/handler/WSSecTest.java | 4 +-
.../{PolicyServer.java => SWAActionServer.java} | 6 +-
.../apache/cxf/systest/ws/swa/SWAActionTest.java | 4 +-
.../ws/swa/{Server.java => SWAPolicyServer.java} | 6 +-
.../apache/cxf/systest/ws/swa/SWAPolicyTest.java | 4 +-
.../{Server.java => SupportingTokenServer.java} | 8 +-
...xServer.java => SupportingTokenStaxServer.java} | 8 +-
.../cxf/systest/ws/tokens/SupportingTokenTest.java | 8 +-
...yServer.java => UsernameTokenPolicyServer.java} | 8 +-
.../cxf/systest/ws/ut/UsernameTokenPolicyTest.java | 8 +-
...{PolicyServer.java => UsernameTokenServer.java} | 8 +-
...ver.java => UsernameTokenStaxPolicyServer.java} | 8 +-
.../{Server.java => UsernameTokenStaxServer.java} | 8 +-
.../cxf/systest/ws/ut/UsernameTokenTest.java | 8 +-
.../ws/wssc/{Server.java => WSSCServer.java} | 12 +--
.../wssc/{StaxServer.java => WSSCStaxServer.java} | 12 +--
.../org/apache/cxf/systest/ws/wssc/WSSCTest.java | 12 +--
.../WSSecurity10CustomAlgorithmSuiteTest.java | 12 +--
.../cxf/systest/ws/wssec10/WSSecurity10Test.java | 16 ++--
.../wssec10/server/ServerCustomAlgorithmSuite.java | 4 +-
.../server/StaxServerCustomAlgorithmSuite.java | 4 +-
.../{Server.java => WSSecurity10Server.java} | 8 +-
...StaxServer.java => WSSecurity10StaxServer.java} | 8 +-
.../x509/{StaxServer.java => X509TokenServer.java} | 6 +-
.../x509/{Server.java => X509TokenStaxServer.java} | 6 +-
.../apache/cxf/systest/ws/x509/X509TokenTest.java | 12 +--
.../ws/xkms/{Server.java => NonXKMSServer.java} | 6 +-
.../xkms/{StaxServer.java => XKMSStaxServer.java} | 6 +-
.../org/apache/cxf/systest/ws/xkms/XKMSTest.java | 8 +-
.../org/apache/cxf/systest/ws/action/server.xml | 32 +++----
.../org/apache/cxf/systest/ws/algsuite/server.xml | 24 ++---
.../apache/cxf/systest/ws/algsuite/stax-server.xml | 10 +-
.../systest/ws/basicauth/server-continuation.xml | 6 +-
.../org/apache/cxf/systest/ws/basicauth/server.xml | 6 +-
.../org/apache/cxf/systest/ws/bindings/server.xml | 42 ++++-----
.../apache/cxf/systest/ws/bindings/stax-server.xml | 42 ++++-----
.../org/apache/cxf/systest/ws/cache/server.xml | 4 +-
.../cxf/systest/ws/coverage_checker/server.xml | 14 +--
.../systest/ws/coverage_checker/stax-server.xml | 10 +-
.../org/apache/cxf/systest/ws/fault/server.xml | 16 ++--
.../org/apache/cxf/systest/ws/gcm/server.xml | 6 +-
.../org/apache/cxf/systest/ws/gcm/stax-server.xml | 6 +-
.../org/apache/cxf/systest/ws/httpget/server.xml | 4 +-
.../org/apache/cxf/systest/ws/https/server.xml | 16 ++--
.../apache/cxf/systest/ws/https/stax-server.xml | 16 ++--
.../org/apache/cxf/systest/ws/mtom/server.xml | 16 ++--
.../org/apache/cxf/systest/ws/mtom/stax-server.xml | 6 +-
.../org/apache/cxf/systest/ws/parts/server.xml | 42 ++++-----
.../apache/cxf/systest/ws/parts/stax-server.xml | 40 ++++----
.../org/apache/cxf/systest/ws/password/server.xml | 6 +-
.../cxf/systest/ws/policy/operation/server.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/server.xml | 14 +--
.../org/apache/cxf/systest/ws/saml/server.xml | 50 +++++-----
.../org/apache/cxf/systest/ws/saml/stax-server.xml | 50 +++++-----
.../cxf/systest/ws/saml/subjectconf/server.xml | 6 +-
.../systest/ws/saml/subjectconf/stax-server.xml | 6 +-
.../cxf/systest/ws/security/handler/server.xml | 2 +-
.../org/apache/cxf/systest/ws/security/server.xml | 4 +-
.../apache/cxf/systest/ws/security/stax-server.xml | 4 +-
.../apache/cxf/systest/ws/swa/policy-server.xml | 14 +--
.../org/apache/cxf/systest/ws/swa/server.xml | 10 +-
.../org/apache/cxf/systest/ws/tokens/server.xml | 18 ++--
.../apache/cxf/systest/ws/tokens/stax-server.xml | 18 ++--
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 30 +++---
.../org/apache/cxf/systest/ws/ut/server.xml | 28 +++---
.../cxf/systest/ws/ut/stax-policy-server.xml | 28 +++---
.../org/apache/cxf/systest/ws/ut/stax-server.xml | 28 +++---
.../org/apache/cxf/systest/ws/wssc/server.xml | 4 +-
.../org/apache/cxf/systest/ws/wssec10/server.xml | 10 +-
.../ws/wssec10/server_customAlgorithmSuite.xml | 10 +-
.../cxf/systest/ws/wssec10/server_restricted.xml | 10 +-
.../apache/cxf/systest/ws/wssec10/stax-server.xml | 10 +-
.../wssec10/stax-server_customAlgorithmSuite.xml | 10 +-
.../systest/ws/wssec10/stax-server_restricted.xml | 10 +-
.../org/apache/cxf/systest/ws/x509/server.xml | 104 ++++++++++-----------
.../org/apache/cxf/systest/ws/x509/stax-server.xml | 104 ++++++++++-----------
.../org/apache/cxf/systest/ws/xkms/server.xml | 4 +-
.../org/apache/cxf/systest/ws/xkms/stax-server.xml | 4 +-
.../systest/ws/addr_fromjava/WSAFromJavaTest.java | 6 +-
.../server/{Server.java => WSAFromJavaServer.java} | 6 +-
.../{Server.java => WSAFromWSDLServer.java} | 6 +-
.../systest/ws/addr_fromwsdl/WSAFromWSDLTest.java | 6 +-
.../WSAResponsesClientServerTest.java | 4 +-
.../{Server.java => WSAResponsesServer.java} | 6 +-
.../{Server.java => WSAPureWsdlServer.java} | 6 +-
.../cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java | 6 +-
...SDLAddrPolicyAttachmentJaxwsMMProviderTest.java | 8 +-
.../systest/ws/mex/{Server.java => MEXServer.java} | 6 +-
.../org/apache/cxf/systest/ws/mex/MEXTest.java | 4 +-
.../ws/policy/AddressingAnonymousPolicyTest.java | 14 +--
.../ws/policy/AddressingInlinePolicyTest.java | 8 +-
.../ws/policy/AddressingOptionalPolicyTest.java | 14 +--
.../ws/policy/AddressingPolicy0705Test.java | 14 +--
...dressingPolicyExternalAttachmentWsdl11Test.java | 14 +--
.../systest/ws/policy/AddressingPolicyTest.java | 14 +--
.../systest/ws/policy/HTTPClientPolicyTest.java | 8 +-
.../systest/ws/policy/HTTPServerPolicyTest.java | 8 +-
.../ws/policy/NestedAddressingPolicyTest.java | 8 +-
.../cxf/systest/ws/policy/RM10PolicyWsdlTest.java | 8 +-
.../cxf/systest/ws/policy/RM12PolicyWsdlTest.java | 8 +-
.../apache/cxf/systest/ws/policy/RMPolicyTest.java | 14 +--
.../cxf/systest/ws/policy/rm10wsdl_server.xml | 4 +-
.../cxf/systest/ws/policy/rm12wsdl_server.xml | 4 +-
.../org/apache/cxf/testutil/common/TestUtil.java | 9 ++
354 files changed, 1636 insertions(+), 1625 deletions(-)
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/STSServer.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/DelegationSTSServer.java
similarity index 94%
rename from services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/STSServer.java
rename to services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/DelegationSTSServer.java
index f678d53bb4f..3a45b8d978b 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/STSServer.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/DelegationSTSServer.java
@@ -21,7 +21,7 @@ package org.apache.cxf.systest.sts.delegation;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class STSServer extends AbstractBusTestServerBase {
+public class DelegationSTSServer extends AbstractBusTestServerBase {
protected void run() {
setBus(new SpringBusFactory().createBus(getClass().getResource("cxf-sts-transport.xml")));
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index 9f792491468..7fb2ed3578a 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -63,7 +63,7 @@ import static org.junit.Assert.fail;
*/
public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
- private static final String STSPORT = allocatePort(STSServer.class);
+ private static final String STSPORT = allocatePort(DelegationSTSServer.class);
private static final String SAML2_TOKEN_TYPE =
"http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0";
@@ -80,7 +80,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(STSServer.class, true)
+ launchServer(DelegationSTSServer.class, true)
);
}
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
index af8adcce855..d6376155774 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
@@ -116,19 +116,19 @@
<property name="relationships" ref="relationships"/>
<property name="samlRealmCodec" ref="samlRealmCodec"/>
</bean>
- <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings">
+ <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:${testutil.ports.DelegationSTSServer}/SecurityTokenService/Transport" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTSUT" implementor="#transportUTSTSProviderBean" address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportUT" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_UT_Port" depends-on="ClientAuthHttpsSettings">
+ <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTSUT" implementor="#transportUTSTSProviderBean" address="https://localhost:${testutil.ports.DelegationSTSServer}/SecurityTokenService/TransportUT" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_UT_Port" depends-on="ClientAuthHttpsSettings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
<httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
- <httpj:engine port="${testutil.ports.STSServer}">
+ <httpj:engine port="${testutil.ports.DelegationSTSServer}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="sspass">
<sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/>
diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index bacfc640465..f6e04c5ff89 100644
--- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -29,10 +29,10 @@ import org.junit.BeforeClass;
import static org.junit.Assert.assertTrue;
public class JettyWarTest extends AbstractCdiMultiAppTest {
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyWarServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener());
}
}
@@ -40,13 +40,13 @@ public class JettyWarTest extends AbstractCdiMultiAppTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyWarServer.PORT;
}
}
diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index 2c2f5b5ffe5..bbc334fc06c 100644
--- a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -28,10 +28,10 @@ import org.junit.BeforeClass;
import static org.junit.Assert.assertTrue;
public class JettyWarTest extends AbstractCdiSingleAppTest {
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyWarServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener());
}
}
@@ -39,13 +39,13 @@ public class JettyWarTest extends AbstractCdiSingleAppTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyWarServer.PORT;
}
}
diff --git a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index 454727fbb8d..66419b6d91a 100644
--- a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -37,10 +37,10 @@ import static org.junit.Assert.assertTrue;
public class JettyWarTest extends AbstractCdiSingleAppTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyWarServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener());
}
}
@@ -48,7 +48,7 @@ public class JettyWarTest extends AbstractCdiSingleAppTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}
@@ -102,6 +102,6 @@ public class JettyWarTest extends AbstractCdiSingleAppTest {
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyWarServer.PORT;
}
}
diff --git a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index 677129c7af5..67d677a638f 100644
--- a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -33,10 +33,10 @@ import static org.junit.Assert.assertTrue;
public class JettyWarTest extends AbstractCdiMultiAppTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyWarServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new Listener());
}
}
@@ -45,13 +45,13 @@ public class JettyWarTest extends AbstractCdiMultiAppTest {
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
System.setProperty(Container.class.getName(), JettyContainer.class.getName());
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyWarServer.PORT;
}
}
diff --git a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index a11a9d15265..510e5c2ba18 100644
--- a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -32,10 +32,10 @@ import static org.junit.Assert.assertTrue;
public class JettyWarTest extends AbstractCdiSingleAppTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyWarServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new Listener());
}
}
@@ -44,13 +44,13 @@ public class JettyWarTest extends AbstractCdiSingleAppTest {
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
System.setProperty(Container.class.getName(), JettyContainer.class.getName());
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyWarServer.PORT;
}
}
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index 71573cb26a6..bb2ed74c312 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -32,10 +32,10 @@ import static org.junit.Assert.assertTrue;
public class JettyWarTest extends AbstractBookStoreCdiTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyWarServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyWarServer() {
super("/jaxrs_cdi", "/", PORT, new Listener());
}
}
@@ -44,11 +44,11 @@ public class JettyWarTest extends AbstractBookStoreCdiTest {
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
System.setProperty(Container.class.getName(), JettyContainer.class.getName());
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyWarServer.PORT;
}
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java
index 11e6ef58d27..3e0a4b52483 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java
@@ -47,10 +47,10 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class JAXRSClientServerUserResourceAsteriskTest extends AbstractClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(UserResourceAsteriskServer.class);
public static final String CONTEXT = "/jetty/*/asterisk";
- public static class Server extends AbstractServerTestServerBase {
+ public static class UserResourceAsteriskServer extends AbstractServerTestServerBase {
@Override
protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
@@ -93,14 +93,14 @@ public class JAXRSClientServerUserResourceAsteriskTest extends AbstractClientSer
}
public static void main(String[] args) throws Exception {
- new Server().start();
+ new UserResourceAsteriskServer().start();
}
}
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(UserResourceAsteriskServer.class));
}
@Test
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
index 6e96b0dc651..472fe67bfbd 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
@@ -73,9 +73,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class JAXRSClientServerUserResourceDefaultTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(UserResourceDefaultServer.class);
- public static class Server extends AbstractServerTestServerBase {
+ public static class UserResourceDefaultServer extends AbstractServerTestServerBase {
@Override
protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception {
@@ -122,7 +122,7 @@ public class JAXRSClientServerUserResourceDefaultTest extends AbstractBusClientS
}
public static void main(String[] args) throws Exception {
- new Server().start();
+ new UserResourceDefaultServer().start();
}
}
@@ -130,7 +130,7 @@ public class JAXRSClientServerUserResourceDefaultTest extends AbstractBusClientS
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
assertTrue("server did not launch correctly",
- launchServer(Server.class, true));
+ launchServer(UserResourceDefaultServer.class, true));
createStaticBus();
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
index 34c0b5ca0b9..a0bf08d4401 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
@@ -47,9 +47,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class JAXRSClientServerUserResourceTest extends AbstractClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(UserResourceServer.class);
- public static class Server extends AbstractServerTestServerBase {
+ public static class UserResourceServer extends AbstractServerTestServerBase {
@Override
protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception {
@@ -93,7 +93,7 @@ public class JAXRSClientServerUserResourceTest extends AbstractClientServerTestB
}
public static void main(String[] args) throws Exception {
- new Server().start();
+ new UserResourceServer().start();
}
}
@@ -101,7 +101,7 @@ public class JAXRSClientServerUserResourceTest extends AbstractClientServerTestB
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
assertTrue("server did not launch correctly",
- launchServer(Server.class, true));
+ launchServer(UserResourceServer.class, true));
}
@Test
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
index c1713b0ccd7..c53f85eae8e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java
@@ -31,18 +31,18 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class JAXRSUnicodeTest extends AbstractBusClientServerTestBase {
- public static final int PORT = SpringServer.PORT;
+ public static final int PORT = SpringUnicodeServer.PORT;
@BeforeClass
public static void beforeClass() throws Exception {
// must be 'in-process' to communicate with inner class in single JVM
// and to spawn class SpringServer w/o using main() method
- launchServer(SpringServer.class, true);
+ launchServer(SpringUnicodeServer.class, true);
}
@Ignore
- public static class SpringServer extends AbstractSpringServer {
- public static final int PORT = allocatePortAsInt(SpringServer.class);
- public SpringServer() {
+ public static class SpringUnicodeServer extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(SpringUnicodeServer.class);
+ public SpringUnicodeServer() {
super("/jaxrs_unicode", PORT);
}
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java
index 13961b556cb..97ecc0479f1 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java
@@ -38,18 +38,18 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class JAXRSUriInfoMatchTest extends AbstractClientServerTestBase {
- public static final int PORT = SpringServer.PORT;
+ public static final int PORT = SpringUriInfoMatchServer.PORT;
@BeforeClass
public static void beforeClass() throws Exception {
// must be 'in-process' to communicate with inner class in single JVM
// and to spawn class SpringServer w/o using main() method
- launchServer(SpringServer.class, true);
+ launchServer(SpringUriInfoMatchServer.class, true);
}
@Ignore
- public static class SpringServer extends AbstractSpringServer {
- public static final int PORT = allocatePortAsInt(SpringServer.class);
- public SpringServer() {
+ public static class SpringUriInfoMatchServer extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(SpringUriInfoMatchServer.class);
+ public SpringUriInfoMatchServer() {
super("/jaxrs_uriinfo_match", "/match", PORT);
}
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
index b4313018d35..858bb04a8d5 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
@@ -34,18 +34,18 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class JAXRSUriInfoTest extends AbstractClientServerTestBase {
- public static final int PORT = SpringServer.PORT;
+ public static final int PORT = SpringUriInfoServer.PORT;
@BeforeClass
public static void beforeClass() throws Exception {
// must be 'in-process' to communicate with inner class in single JVM
// and to spawn class SpringServer w/o using main() method
- launchServer(SpringServer.class, true);
+ launchServer(SpringUriInfoServer.class, true);
}
@Ignore
- public static class SpringServer extends AbstractSpringServer {
- public static final int PORT = allocatePortAsInt(SpringServer.class);
- public SpringServer() {
+ public static class SpringUriInfoServer extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(SpringUriInfoServer.class);
+ public SpringUriInfoServer() {
super("/jaxrs_uriinfo", "/app", PORT);
}
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
index 6855fc96ada..7ff161e082d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
@@ -63,12 +63,12 @@ import static org.junit.Assert.assertTrue;
*
*/
public class CrossOriginSimpleTest extends AbstractBusClientServerTestBase {
- public static final int PORT = SpringServer.PORT;
+ public static final int PORT = SpringCrossOriginSimpleServer.PORT;
private WebClient configClient;
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(SpringServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(SpringCrossOriginSimpleServer.class, true));
}
@Before
@@ -572,10 +572,10 @@ public class CrossOriginSimpleTest extends AbstractBusClientServerTestBase {
}
@Ignore
- public static class SpringServer extends AbstractSpringServer {
- public static final int PORT = allocatePortAsInt(SpringServer.class);
+ public static class SpringCrossOriginSimpleServer extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(SpringCrossOriginSimpleServer.class);
- public SpringServer() {
+ public SpringCrossOriginSimpleServer() {
super("/jaxrs_cors", PORT);
}
}
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
index 1b6b4127973..aa33ff30aa3 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
@@ -79,7 +79,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class HandlerInvocationTest extends AbstractBusClientServerTestBase {
- private static String port = TestUtil.getPortNumber(Server.class);
+ private static String port = TestUtil.getPortNumber(HandlersServer.class);
private final QName serviceName = new QName("http://apache.org/handler_test", "HandlerTestService");
private final QName portName = new QName("http://apache.org/handler_test", "SoapPort");
@@ -96,7 +96,7 @@ public class HandlerInvocationTest extends AbstractBusClientServerTestBase {
//System.setProperty(SAAJFactoryResolver.SOAP_FACTORY_KEY,
// "com.ibm.ws.webservices.engine.xmlsoap.SOAPFactory");
createStaticBus();
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(HandlersServer.class, true));
}
@Before
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlersServer.java
similarity index 88%
rename from systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/Server.java
rename to systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlersServer.java
index 1f27ad97ed6..05314153550 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/Server.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlersServer.java
@@ -23,10 +23,10 @@ import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.TestUtil;
-public class Server extends AbstractBusTestServerBase {
+public class HandlersServer extends AbstractBusTestServerBase {
protected void run() {
- String port = TestUtil.getPortNumber(Server.class);
+ String port = TestUtil.getPortNumber(HandlersServer.class);
Object implementor = new HandlerTestImpl();
String address = "http://localhost:" + port + "/HandlerTest/SoapPort";
@@ -37,7 +37,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ HandlersServer s = new HandlersServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java
index 9e1cba81b8a..323fb9548bb 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java
@@ -41,10 +41,10 @@ import static org.junit.Assert.assertTrue;
*/
public class TrivialSOAPHandlerTest extends AbstractClientServerTestBase {
static String address = "http://localhost:"
- + TestUtil.getPortNumber(Server.class)
+ + TestUtil.getPortNumber(TrivialSOAPHandlerServer.class)
+ "/SoapContext/GreeterPort";
- public static class Server extends AbstractBusTestServerBase {
+ public static class TrivialSOAPHandlerServer extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new TrivialSOAPHandlerAnnotatedGreeterImpl();
@@ -54,7 +54,7 @@ public class TrivialSOAPHandlerTest extends AbstractClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ TrivialSOAPHandlerServer s = new TrivialSOAPHandlerServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -69,7 +69,7 @@ public class TrivialSOAPHandlerTest extends AbstractClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server.class));
+ launchServer(TrivialSOAPHandlerServer.class));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AttachmentMtomChunkingTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AttachmentMtomChunkingTest.java
index c4da85e9003..2884f00bd0d 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AttachmentMtomChunkingTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AttachmentMtomChunkingTest.java
@@ -44,10 +44,10 @@ import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
public class AttachmentMtomChunkingTest extends AbstractAttachmentChunkingTest {
- private static final String PORT = allocatePort(DownloadServer.class);
+ private static final String PORT = allocatePort(ChunkingDownloadServer.class);
private static final Logger LOG = LogUtils.getLogger(AttachmentMtomChunkingTest.class);
- public static class DownloadServer extends AbstractBusTestServerBase {
+ public static class ChunkingDownloadServer extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new DownloadImpl();
String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
@@ -57,7 +57,7 @@ public class AttachmentMtomChunkingTest extends AbstractAttachmentChunkingTest {
public static void main(String[] args) {
try {
- DownloadServer s = new DownloadServer();
+ ChunkingDownloadServer s = new ChunkingDownloadServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -70,7 +70,7 @@ public class AttachmentMtomChunkingTest extends AbstractAttachmentChunkingTest {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(DownloadServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(ChunkingDownloadServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java
index 9c8a8e023d7..e1035311b31 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java
@@ -38,7 +38,7 @@ public class CXF5061Test extends AbstractBusClientServerTestBase {
= "http://localhost:" + TestUtil.getPortNumber("org.apache.cxf.systest.jaxws.CXF5061Test")
+ "/cxf5061";
- public static class Server extends AbstractBusTestServerBase {
+ public static class CXF5061Server extends AbstractBusTestServerBase {
protected void run() {
new SpringBusFactory().createBus("org/apache/cxf/systest/jaxws/springWebService.xml");
@@ -46,7 +46,7 @@ public class CXF5061Test extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ CXF5061Server s = new CXF5061Server();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -59,7 +59,7 @@ public class CXF5061Test extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(CXF5061Server.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
index 64c5f83f9cf..46e17fbfdbf 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java
@@ -44,11 +44,11 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class CXF6655Test extends AbstractClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(CXF6655Server.class);
static final int PROXY_PORT = Integer.parseInt(allocatePort(CXF6655Test.class));
static HttpProxyServer proxy;
- public static class Server extends AbstractBusTestServerBase {
+ public static class CXF6655Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new HelloImpl();
@@ -58,7 +58,7 @@ public class CXF6655Test extends AbstractClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ CXF6655Server s = new CXF6655Server();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -77,7 +77,7 @@ public class CXF6655Test extends AbstractClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(CXF6655Server.class, true));
proxy = DefaultHttpProxyServer.bootstrap().withPort(PROXY_PORT).start();
}
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java
index 834ff047a27..52929c04476 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java
@@ -37,9 +37,9 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class CXF7990Test extends AbstractClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(CXF7990Server.class);
- public static class Server extends AbstractBusTestServerBase {
+ public static class CXF7990Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new EchoServiceImpl();
String address = "http://localhost:" + PORT + "/echo/service";
@@ -52,7 +52,7 @@ public class CXF7990Test extends AbstractClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ CXF7990Server s = new CXF7990Server();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -65,7 +65,7 @@ public class CXF7990Test extends AbstractClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(CXF7990Server.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefaultAnnoTest.java
similarity index 87%
rename from systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
rename to systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefaultAnnoTest.java
index 3868e9b9d0a..74f9e02f6f1 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefaultAnnoTest.java
@@ -32,10 +32,10 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class ClientServerRPCLitDefatulAnnoTest extends AbstractClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+public class ClientServerRPCLitDefaultAnnoTest extends AbstractClientServerTestBase {
+ static final String PORT = allocatePort(RPCLitDefaultAnnoServer.class);
- public static class Server extends AbstractBusTestServerBase {
+ public static class RPCLitDefaultAnnoServer extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new HelloImpl();
@@ -45,7 +45,7 @@ public class ClientServerRPCLitDefatulAnnoTest extends AbstractClientServerTestB
public static void main(String[] args) {
try {
- Server s = new Server();
+ RPCLitDefaultAnnoServer s = new RPCLitDefaultAnnoServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -58,7 +58,7 @@ public class ClientServerRPCLitDefatulAnnoTest extends AbstractClientServerTestB
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(RPCLitDefaultAnnoServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
index 2456c6e00b3..197bcaf9c64 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java
@@ -75,11 +75,11 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class ClientServerRPCLitTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(RPCLitServer.class);
private final QName portName = new QName("http://apache.org/hello_world_rpclit", "SoapPortRPCLit");
- public static class Server extends AbstractBusTestServerBase {
+ public static class RPCLitServer extends AbstractBusTestServerBase {
protected void run() {
String address;
@@ -92,7 +92,7 @@ public class ClientServerRPCLitTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ RPCLitServer s = new RPCLitServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -105,7 +105,7 @@ public class ClientServerRPCLitTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(RPCLitServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
index 5d7767b1c6d..edafa3b7b4a 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
@@ -99,13 +99,13 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class ClientServerTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String BARE_PORT = allocatePort(Server.class, 1);
- static final String BOGUS_REAL_PORT = allocatePort(Server.class, 2);
+ static final String PORT = allocatePort(JAXWSServer.class);
+ static final String BARE_PORT = allocatePort(JAXWSServer.class, 1);
+ static final String BOGUS_REAL_PORT = allocatePort(JAXWSServer.class, 2);
- static final String BOGUS_PORT = allocatePort(Server.class, 3);
- static final String PUB_PORT = allocatePort(Server.class, 4);
- static final String CLIENT_PORT = allocatePort(Server.class, 5);
+ static final String BOGUS_PORT = allocatePort(JAXWSServer.class, 3);
+ static final String PUB_PORT = allocatePort(JAXWSServer.class, 4);
+ static final String CLIENT_PORT = allocatePort(JAXWSServer.class, 5);
@@ -130,7 +130,7 @@ public class ClientServerTest extends AbstractBusClientServerTestBase {
// Create bus first so it will be shared between the server and clients
createStaticBus(url.toString());
assertNotNull("cannot find test resource", url);
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(JAXWSServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CustomizedMicrometerProviderClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CustomizedMicrometerProviderClientServerTest.java
index a909f7ae6d8..d135538d340 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CustomizedMicrometerProviderClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CustomizedMicrometerProviderClientServerTest.java
@@ -74,11 +74,11 @@ public class CustomizedMicrometerProviderClientServerTest extends AbstractBusCli
public static final MeterRegistry METER_REGISTER = new SimpleMeterRegistry();
- private static final String PORT = allocatePort(Server.class);
+ private static final String PORT = allocatePort(CustomizedMicrometerProviderServer.class);
private final QName portName = new QName("http://cxf.apache.org/jaxws/schemavalidation", "servicePort");
- public static class Server extends AbstractBusTestServerBase {
+ public static class CustomizedMicrometerProviderServer extends AbstractBusTestServerBase {
protected void run() {
var jaxwsTags = new JaxwsTags();
@@ -117,7 +117,7 @@ public class CustomizedMicrometerProviderClientServerTest extends AbstractBusCli
@BeforeClass
public static void startServers() {
createStaticBus();
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(CustomizedMicrometerProviderServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JAXWSServer.java
similarity index 96%
rename from systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java
rename to systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JAXWSServer.java
index 836d7311128..702e33085f4 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JAXWSServer.java
@@ -45,10 +45,10 @@ import org.apache.hello_world_soap_http.DocLitBareGreeterImpl;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
-public class Server extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(Server.class);
- static final String BARE_PORT = allocatePort(Server.class, 1);
- static final String BOGUS_REAL_PORT = allocatePort(Server.class, 2);
+public class JAXWSServer extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(JAXWSServer.class);
+ static final String BARE_PORT = allocatePort(JAXWSServer.class, 1);
+ static final String BOGUS_REAL_PORT = allocatePort(JAXWSServer.class, 2);
List<Endpoint> eps = new LinkedList<>();
@@ -182,7 +182,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ JAXWSServer s = new JAXWSServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
index 6d7679c1753..453371e1340 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
@@ -41,12 +41,12 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class LocatorClientServerTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(MyServer.class);
+ static final String PORT = allocatePort(LocatorServer.class);
static final Logger LOG = LogUtils.getLogger(LocatorClientServerTest.class);
private final QName serviceName = new QName("http://apache.org/locator", "LocatorService");
- public static class MyServer extends AbstractBusTestServerBase {
+ public static class LocatorServer extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new LocatorServiceImpl();
@@ -57,7 +57,7 @@ public class LocatorClientServerTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- MyServer s = new MyServer();
+ LocatorServer s = new LocatorServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -70,7 +70,7 @@ public class LocatorClientServerTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(MyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(LocatorServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationMetricsClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationMetricsClientServerTest.java
index 226e3547e1c..4dd89a78fb6 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationMetricsClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationMetricsClientServerTest.java
@@ -66,11 +66,11 @@ public class SchemaValidationMetricsClientServerTest extends AbstractBusClientSe
private static final MeterRegistry METER_REGISTER = new SimpleMeterRegistry();
- private static final String PORT = allocatePort(Server.class);
+ private static final String PORT = allocatePort(SchemaValidationMetricsServer.class);
private final QName portName = new QName("http://cxf.apache.org/jaxws/schemavalidation", "servicePort");
- public static class Server extends AbstractBusTestServerBase {
+ public static class SchemaValidationMetricsServer extends AbstractBusTestServerBase {
protected void run() {
var jaxwsTags = new JaxwsTags();
@@ -108,7 +108,7 @@ public class SchemaValidationMetricsClientServerTest extends AbstractBusClientSe
@BeforeClass
public static void startServers() {
createStaticBus();
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(SchemaValidationMetricsServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java
index 3a3087561ec..ef93c881737 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java
@@ -74,11 +74,11 @@ public class SchemaValidationWithoutViolationMetricsClientServerTest extends Abs
public static final MeterRegistry METER_REGISTER = new SimpleMeterRegistry();
- private static final String PORT = allocatePort(Server.class);
+ private static final String PORT = allocatePort(SchemaValidationWithoutViolationServer.class);
private final QName portName = new QName("http://cxf.apache.org/jaxws/schemavalidation", "servicePort");
- public static class Server extends AbstractBusTestServerBase {
+ public static class SchemaValidationWithoutViolationServer extends AbstractBusTestServerBase {
protected void run() {
var jaxwsTags = new JaxwsTags();
@@ -119,7 +119,7 @@ public class SchemaValidationWithoutViolationMetricsClientServerTest extends Abs
@BeforeClass
public static void startServers() {
createStaticBus();
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(SchemaValidationWithoutViolationServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java
index ef2e3ab82d7..088bb707e28 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class ClientServerWebSocketTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(WebSocketServer.class);
static final Logger LOG = LogUtils.getLogger(ClientServerWebSocketTest.class);
private final QName serviceName = new QName("http://apache.org/hello_world_soap_http",
@@ -68,7 +68,7 @@ public class ClientServerWebSocketTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
// set up configuration to enable schema validation
//System.setProperty("org.apache.cxf.transport.websocket.atmosphere.disabled", "true");
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(WebSocketServer.class, true));
createStaticBus();
}
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/WebSocketServer.java
similarity index 90%
rename from systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/Server.java
rename to systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/WebSocketServer.java
index 1f2b7b38bac..76cea2ac65b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/Server.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/WebSocketServer.java
@@ -29,9 +29,9 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.hello_world_soap_http.BaseGreeterImpl;
import org.apache.hello_world_soap_http.GreeterImpl;
-public class Server extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(Server.class);
- static final String BOGUS_REAL_PORT = allocatePort(Server.class, 2);
+public class WebSocketServer extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(WebSocketServer.class);
+ static final String BOGUS_REAL_PORT = allocatePort(WebSocketServer.class, 2);
List<Endpoint> eps = new LinkedList<>();
@@ -68,7 +68,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ WebSocketServer s = new WebSocketServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java
index 2955de9929f..a45a4374367 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java
@@ -47,10 +47,10 @@ import static org.junit.Assert.assertTrue;
public class CXF4130Test extends AbstractBusClientServerTestBase {
public static final String ADDRESS
- = "http://localhost:" + TestUtil.getPortNumber(Server.class)
+ = "http://localhost:" + TestUtil.getPortNumber(CXF4130Server.class)
+ "/InBand33MessageServiceProvider/InBandSoapHeaderSoapHttpPort";
- public static class Server extends AbstractBusTestServerBase {
+ public static class CXF4130Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new CXF4130Provider();
@@ -59,7 +59,7 @@ public class CXF4130Test extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ CXF4130Server s = new CXF4130Server();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -72,7 +72,7 @@ public class CXF4130Test extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(CXF4130Server.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4818Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4818Test.java
index ade9dda45f9..ea88a0acc3e 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4818Test.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4818Test.java
@@ -59,10 +59,10 @@ import static org.junit.Assert.assertTrue;
public class CXF4818Test extends AbstractBusClientServerTestBase {
public static final String ADDRESS
- = "http://localhost:" + TestUtil.getPortNumber(Server.class)
+ = "http://localhost:" + TestUtil.getPortNumber(CXF4818Server.class)
+ "/AddressProvider/AddressProvider";
- public static class Server extends AbstractBusTestServerBase {
+ public static class CXF4818Server extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new CXF4818Provider();
@@ -71,7 +71,7 @@ public class CXF4818Test extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ CXF4818Server s = new CXF4818Server();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -84,7 +84,7 @@ public class CXF4818Test extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(CXF4818Server.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/InterpretNullAsOnewayProviderTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/InterpretNullAsOnewayProviderTest.java
index 186dc2f5dcb..2d2cb1d061f 100755
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/InterpretNullAsOnewayProviderTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/InterpretNullAsOnewayProviderTest.java
@@ -43,13 +43,13 @@ import static org.junit.Assert.assertTrue;
* Testing the null response behavior of jaxws provider (jaxws 2.2 section 5.1.1)
*/
public class InterpretNullAsOnewayProviderTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(NullAsOnewayServer.class);
private static final String ADDRESS1 = "http://localhost:" + PORT + "/test/nullable1";
private static final String ADDRESS2 = "http://localhost:" + PORT + "/test/nullable2";
private static final String ADDRESS3 = "http://localhost:" + PORT + "/test/nullable3";
- public static class Server extends AbstractBusTestServerBase {
+ public static class NullAsOnewayServer extends AbstractBusTestServerBase {
protected void run() {
// endpoint not interpreting null as oneway
@@ -72,7 +72,7 @@ public class InterpretNullAsOnewayProviderTest extends AbstractBusClientServerTe
public static void main(String[] args) throws Exception {
try {
- Server s = new Server();
+ NullAsOnewayServer s = new NullAsOnewayServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -94,7 +94,7 @@ public class InterpretNullAsOnewayProviderTest extends AbstractBusClientServerTe
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(NullAsOnewayServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/NBProviderClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/NBProviderClientServerTest.java
index beaff8b2df9..bfe063300ed 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/NBProviderClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/NBProviderClientServerTest.java
@@ -48,12 +48,12 @@ import static org.junit.Assert.fail;
public class NBProviderClientServerTest extends AbstractBusClientServerTestBase {
public static final String ADDRESS
- = "http://localhost:" + TestUtil.getPortNumber(Server.class)
+ = "http://localhost:" + TestUtil.getPortNumber(NBProviderServer.class)
+ "/SoapContext/SoapProviderPort";
private static QName sayHi = new QName("http://apache.org/hello_world_soap_http/types", "sayHi");
- public static class Server extends AbstractBusTestServerBase {
+ public static class NBProviderServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
@@ -68,7 +68,7 @@ public class NBProviderClientServerTest extends AbstractBusClientServerTestBase
public static void main(String[] args) {
try {
- Server s = new Server();
+ NBProviderServer s = new NBProviderServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -81,7 +81,7 @@ public class NBProviderClientServerTest extends AbstractBusClientServerTestBase
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(NBProviderServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java
index 0ae20390278..5c963541bcf 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java
@@ -48,10 +48,10 @@ import static org.junit.Assert.fail;
public class ProviderClientServerTest extends AbstractBusClientServerTestBase {
public static final String ADDRESS
- = "http://localhost:" + TestUtil.getPortNumber(Server.class)
+ = "http://localhost:" + TestUtil.getPortNumber(ProviderServer.class)
+ "/SoapContext/SoapProviderPort";
- public static class Server extends AbstractBusTestServerBase {
+ public static class ProviderServer extends AbstractBusTestServerBase {
protected void run() {
Object implementor = new HWSoapMessageDocProvider();
@@ -67,7 +67,7 @@ public class ProviderClientServerTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ ProviderServer s = new ProviderServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -80,7 +80,7 @@ public class ProviderClientServerTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(ProviderServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
index e6726a8941b..36ca559409b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
@@ -44,11 +44,11 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class ProviderRPCClientServerTest extends AbstractBusClientServerTestBase {
- private static final String PORT = Server.PORT;
+ private static final String PORT = ProviderRPCServer.PORT;
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(ProviderRPCServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCServer.java
similarity index 95%
rename from systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java
rename to systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCServer.java
index b0a5eb2d0d9..1fbf34d5c33 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCServer.java
@@ -27,8 +27,8 @@ import org.apache.cxf.databinding.source.SourceDataBinding;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.TestUtil;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = TestUtil.getPortNumber(Server.class);
+public class ProviderRPCServer extends AbstractBusTestServerBase {
+ public static final String PORT = TestUtil.getPortNumber(ProviderRPCServer.class);
protected void run() {
Object implementor = new HWSourcePayloadProvider();
@@ -100,7 +100,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ ProviderRPCServer s = new ProviderRPCServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
index 163afa15912..1a0e4070ecf 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class DataSourceProviderTest extends AbstractBusClientServerTestBase {
- static String serverPort = TestUtil.getPortNumber(Server.class);
+ static String serverPort = TestUtil.getPortNumber(DataSourceServer.class);
static final Logger LOG = LogUtils.getLogger(DataSourceProviderTest.class);
private static final String BOUNDARY = "----=_Part_4_701508.1145579811786";
@@ -62,7 +62,7 @@ public class DataSourceProviderTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server.class, true));
+ launchServer(DataSourceServer.class, true));
}
@Test
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceServer.java
similarity index 87%
rename from systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/Server.java
rename to systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceServer.java
index b8ef5b0d59f..c5b4283519f 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/Server.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceServer.java
@@ -23,17 +23,17 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.TestUtil;
-public class Server extends AbstractBusTestServerBase {
+public class DataSourceServer extends AbstractBusTestServerBase {
protected void run() {
- String port = TestUtil.getPortNumber(Server.class);
+ String port = TestUtil.getPortNumber(DataSourceServer.class);
TestProvider servant = new TestProvider();
servant.publish("http://localhost:" + port + "/test/foo");
}
public static void main(String[] args) throws Exception {
try {
- Server s = new Server();
+ DataSourceServer s = new DataSourceServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
index 01ce406607e..e574acb0957 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
@@ -65,8 +65,8 @@ import static org.junit.Assert.assertTrue;
@RunWith(value = Parameterized.class)
public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
- static String serverPort = TestUtil.getPortNumber(Server.class);
- static String serverPortInvalid = TestUtil.getPortNumber(Server.class, 1);
+ static String serverPort = TestUtil.getPortNumber(SwaServer.class);
+ static String serverPortInvalid = TestUtil.getPortNumber(SwaServer.class, 1);
static class TestParam {
private final String port;
@@ -99,7 +99,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(SwaServer.class, true));
}
private String getFullStackTrace(Exception ex) {
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwaServer.java
similarity index 92%
rename from systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java
rename to systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwaServer.java
index 4eef61b9562..af35e53a497 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwaServer.java
@@ -24,10 +24,10 @@ import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.TestUtil;
-public class Server extends AbstractBusTestServerBase {
+public class SwaServer extends AbstractBusTestServerBase {
protected void run() {
- String port = TestUtil.getPortNumber(Server.class);
+ String port = TestUtil.getPortNumber(SwaServer.class);
Object implementor = new SwAServiceImpl();
String address = "http://localhost:" + port + "/swa";
@@ -49,7 +49,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ SwaServer s = new SwaServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/StaxServer.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosServer.java
similarity index 87%
rename from systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/StaxServer.java
rename to systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosServer.java
index 7877dc488cd..0106ab9725e 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/StaxServer.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class KerberosServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public KerberosServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = KerberosServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new KerberosServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/Server.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosStaxServer.java
similarity index 85%
rename from systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/Server.java
rename to systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosStaxServer.java
index 8e5c6c2d94e..f29bae10d1f 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/Server.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class KerberosStaxServer extends AbstractBusTestServerBase {
- public Server() {
+ public KerberosStaxServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = KerberosStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new KerberosStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index 50878effd1e..7d36b3ffd2e 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -46,12 +46,12 @@ import org.junit.BeforeClass;
* A set of tests for Kerberos Tokens that use an Apache Kerby instance as the KDC.
*/
public class KerberosTokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = TestUtil.getPortNumber(Server.class);
- static final String STAX_PORT = TestUtil.getPortNumber(StaxServer.class);
- static final String PORT2 = TestUtil.getPortNumber(Server.class, 2);
- static final String STAX_PORT2 = TestUtil.getPortNumber(StaxServer.class, 2);
+ static final String PORT = TestUtil.getPortNumber(KerberosServer.class);
+ static final String STAX_PORT = TestUtil.getPortNumber(KerberosStaxServer.class);
+ static final String PORT2 = TestUtil.getPortNumber(KerberosServer.class, 2);
+ static final String STAX_PORT2 = TestUtil.getPortNumber(KerberosStaxServer.class, 2);
- static final String PORT3 = TestUtil.getPortNumber(Server.class, 3);
+ static final String PORT3 = TestUtil.getPortNumber(KerberosServer.class, 3);
static final String STSPORT = TestUtil.getPortNumber(STSServer.class);
static final String STAX_STSPORT = TestUtil.getPortNumber(StaxSTSServer.class);
@@ -117,14 +117,14 @@ public class KerberosTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractClientServerTestBase.launchServer(Server.class, true)
+ AbstractClientServerTestBase.launchServer(KerberosServer.class, true)
);
org.junit.Assert.assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractClientServerTestBase.launchServer(StaxServer.class, true)
+ AbstractClientServerTestBase.launchServer(KerberosStaxServer.class, true)
);
org.junit.Assert.assertTrue(
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/Server.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoServer.java
similarity index 87%
rename from systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/Server.java
rename to systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoServer.java
index c83b66e5e09..fd224def1e3 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/Server.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class SpnegoServer extends AbstractBusTestServerBase {
- public Server() {
+ public SpnegoServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = SpnegoServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new SpnegoServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/StaxServer.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoStaxServer.java
similarity index 86%
rename from systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/StaxServer.java
rename to systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoStaxServer.java
index 234c4be9173..2dbe57c139d 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/StaxServer.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class SpnegoStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public SpnegoStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = SpnegoStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new SpnegoStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index 0b0522fbfbd..225892f8629 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -43,10 +43,10 @@ import org.junit.BeforeClass;
* A set of tests for Spnego Tokens that use an Apache Kerby instance as the KDC.
*/
public class SpnegoTokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = TestUtil.getPortNumber(Server.class);
- static final String STAX_PORT = TestUtil.getPortNumber(StaxServer.class);
- static final String PORT2 = TestUtil.getPortNumber(Server.class, 2);
- static final String STAX_PORT2 = TestUtil.getPortNumber(StaxServer.class, 2);
+ static final String PORT = TestUtil.getPortNumber(SpnegoServer.class);
+ static final String STAX_PORT = TestUtil.getPortNumber(SpnegoStaxServer.class);
+ static final String PORT2 = TestUtil.getPortNumber(SpnegoServer.class, 2);
+ static final String STAX_PORT2 = TestUtil.getPortNumber(SpnegoStaxServer.class, 2);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -102,14 +102,14 @@ public class SpnegoTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractClientServerTestBase.launchServer(Server.class, true)
+ AbstractClientServerTestBase.launchServer(SpnegoServer.class, true)
);
org.junit.Assert.assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractClientServerTestBase.launchServer(StaxServer.class, true)
+ AbstractClientServerTestBase.launchServer(SpnegoStaxServer.class, true)
);
}
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
index 62248ccc2dd..175a5633a0e 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
@@ -40,7 +40,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.Server.2}">
+ <httpj:engine port="${testutil.ports.KerberosServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
@@ -64,14 +64,14 @@
<property name="serviceName" value="bob@service.ws.apache.org"/>
<property name="callbackHandler" ref="kerberosCallbackHandler"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport" address="https://localhost:${testutil.ports.KerberosServer.2}/DoubleItKerberosTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport2" address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransport2" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort2" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport2" address="https://localhost:${testutil.ports.KerberosServer.2}/DoubleItKerberosTransport2" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort2" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
@@ -91,35 +91,35 @@
<property name="usernameServiceNameForm" value="true"/>
<property name="callbackHandler" ref="kerberosCallbackHandler2"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport3" address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransport3" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort3" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport3" address="https://localhost:${testutil.ports.KerberosServer.2}/DoubleItKerberosTransport3" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort3" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator2"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetric" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSupporting" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSupporting" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosSymmetricSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosSupporting" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosSupporting" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetric" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
@@ -130,14 +130,14 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransportEndorsing" address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransportEndorsing" address="https://localhost:${testutil.ports.KerberosServer.2}/DoubleItKerberosTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricEndorsing" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricEndorsing" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosAsymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
@@ -148,21 +148,21 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricProtection" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricProtection" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosSymmetricProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricDerivedProtection" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricDerivedProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricDerivedProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricDerivedProtection" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosSymmetricDerivedProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricDerivedProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricSignedEndorsing" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricSignedEndorsing" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosAsymmetricSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
@@ -173,7 +173,7 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosAsymmetricSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
@@ -184,14 +184,14 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosSymmetricEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricSignedEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosSymmetricSignedEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -199,7 +199,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSecureConversation" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSecureConversationPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSecureConversation" address="http://localhost:${testutil.ports.KerberosServer}/DoubleItKerberosSymmetricSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSecureConversationPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -207,7 +207,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="#doubleItNoSecurity" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="STSClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server.3}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="#doubleItNoSecurity" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="STSClientAuthHttpsSettings" address="https://localhost:${testutil.ports.KerberosServer.3}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
@@ -223,7 +223,7 @@
<entry key-ref="bstQName" value-ref="kerberosValidator" />
</util:map>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="DoubleItKerberosTransportActionPort" address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransportAction" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportActionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="DoubleItKerberosTransportActionPort" address="https://localhost:${testutil.ports.KerberosServer.2}/DoubleItKerberosTransportAction" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportActionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -237,7 +237,7 @@
</jaxws:endpoint>
<httpj:engine-factory id="STSClientAuthHttpsSettings" bus="cxf">
- <httpj:engine port="${testutil.ports.Server.3}">
+ <httpj:engine port="${testutil.ports.KerberosServer.3}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="sspass">
<sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/>
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
index 1783caeb061..f8daf2dd6ff 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
@@ -39,7 +39,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.StaxServer.2}">
+ <httpj:engine port="${testutil.ports.KerberosStaxServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
@@ -56,42 +56,42 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItKerberosTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport" address="https://localhost:${testutil.ports.KerberosStaxServer.2}/DoubleItKerberosTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport2" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItKerberosTransport2" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort2" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport2" address="https://localhost:${testutil.ports.KerberosStaxServer.2}/DoubleItKerberosTransport2" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort2" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetric" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSupporting" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosSymmetricSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosSupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSupportingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosSupporting" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSupportingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetric" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
@@ -102,7 +102,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransportEndorsing" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItKerberosTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransportEndorsing" address="https://localhost:${testutil.ports.KerberosStaxServer.2}/DoubleItKerberosTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
@@ -110,7 +110,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricEndorsing" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosAsymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricEndorsing" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosAsymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
@@ -121,21 +121,21 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricProtection" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricProtection" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosSymmetricProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricDerivedProtection" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricDerivedProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricDerivedProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricDerivedProtection" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosSymmetricDerivedProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricDerivedProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricSignedEndorsing" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosAsymmetricSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricSignedEndorsing" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosAsymmetricSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
@@ -146,7 +146,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosAsymmetricSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosAsymmetricSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.username" value="bob"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
@@ -157,14 +157,14 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosSymmetricEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricSignedEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverSymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.KerberosStaxServer}/DoubleItKerberosSymmetricSignedEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
index b6eeaa863ac..e7c29403958 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
@@ -40,7 +40,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.Server.2}">
+ <httpj:engine port="${testutil.ports.SpnegoServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
@@ -59,43 +59,43 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetric" address="http://localhost:${testutil.ports.SpnegoServer}/DoubleItSpnegoSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricDerived" address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricDerivedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricDerived" address="http://localhost:${testutil.ports.SpnegoServer}/DoubleItSpnegoSymmetricDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricDerivedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.SpnegoServer}/DoubleItSpnegoSymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItSpnegoTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransport" address="https://localhost:${testutil.ports.SpnegoServer.2}/DoubleItSpnegoTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsing" address="https://localhost:${testutil.ports.Server.2}/DoubleItSpnegoTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsing" address="https://localhost:${testutil.ports.SpnegoServer.2}/DoubleItSpnegoTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsingSP11" address="https://localhost:${testutil.ports.Server.2}/DoubleItSpnegoTransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingSP11Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsingSP11" address="https://localhost:${testutil.ports.SpnegoServer.2}/DoubleItSpnegoTransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingSP11Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricSecureConversation" address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricSecureConversationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricSecureConversation" address="http://localhost:${testutil.ports.SpnegoServer}/DoubleItSpnegoSymmetricSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricSecureConversationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
index 0bab198a370..22ebcc422a7 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
@@ -40,7 +40,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.StaxServer.2}">
+ <httpj:engine port="${testutil.ports.SpnegoStaxServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
@@ -59,42 +59,42 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSpnegoSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetric" address="http://localhost:${testutil.ports.SpnegoStaxServer}/DoubleItSpnegoSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="ws-security.enable.streaming" value="true"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricDerived" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSpnegoSymmetricDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricDerivedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricDerived" address="http://localhost:${testutil.ports.SpnegoStaxServer}/DoubleItSpnegoSymmetricDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricDerivedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="ws-security.enable.streaming" value="true"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSpnegoSymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.SpnegoStaxServer}/DoubleItSpnegoSymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="ws-security.enable.streaming" value="true"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSpnegoTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransport" address="https://localhost:${testutil.ports.SpnegoStaxServer.2}/DoubleItSpnegoTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="ws-security.enable.streaming" value="true"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsing" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSpnegoTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsing" address="https://localhost:${testutil.ports.SpnegoStaxServer.2}/DoubleItSpnegoTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="ws-security.enable.streaming" value="true"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsingSP11" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSpnegoTransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingSP11Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsingSP11" address="https://localhost:${testutil.ports.SpnegoStaxServer.2}/DoubleItSpnegoTransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingSP11Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="ws-security.enable.streaming" value="true"/>
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
index 298b824a793..2491693c8b3 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
@@ -33,10 +33,10 @@ import static org.junit.Assert.assertTrue;
public class JettyEmptyApplicationTest extends AbstractSciTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyEmptyApplicationServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyEmptyApplicationServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyEmptyApplicationServer() {
super("/",
new Resource[] {
// Limit the classpath scanning to org.apache.demo.resources package
@@ -55,13 +55,13 @@ public class JettyEmptyApplicationTest extends AbstractSciTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyEmptyApplicationServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyEmptyApplicationServer.PORT;
}
@Override
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java
index 32cfd9db0c2..b54bf01a093 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java
@@ -34,10 +34,10 @@ import static org.junit.Assert.assertTrue;
public class JettyEmptyPathApplicationTest extends AbstractSciTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyEmptyPathServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyEmptyPathServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyEmptyPathServer() {
super("/",
new Resource[] {
// Limit the classpath scanning to org.apache.demo.resources package
@@ -61,13 +61,13 @@ public class JettyEmptyPathApplicationTest extends AbstractSciTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyEmptyPathServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyEmptyPathServer.PORT;
}
@Override
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java
index f8902dd8696..f3c3cb689bd 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java
@@ -34,10 +34,10 @@ import static org.junit.Assert.assertTrue;
public class JettyNoApplicationTest extends AbstractSciTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyNoApplicationServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyNoApplicationServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyNoApplicationServer() {
super("/",
new Resource[] {
// Limit the classpath scanning to org.apache.demo.resources package
@@ -58,13 +58,13 @@ public class JettyNoApplicationTest extends AbstractSciTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyNoApplicationServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyNoApplicationServer.PORT;
}
@Override
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java
index b2702433bec..446f929f340 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java
@@ -32,10 +32,10 @@ import static org.junit.Assert.assertTrue;
public class JettySingleApplicationOnlyClassesTest extends AbstractSciTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettySingleApplicationOnlyClassesServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettySingleApplicationOnlyClassesServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettySingleApplicationOnlyClassesServer() {
super("/",
new Resource[] {
// Limit the classpath scanning to org.apache.demo.resources package
@@ -51,13 +51,14 @@ public class JettySingleApplicationOnlyClassesTest extends AbstractSciTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly",
+ launchServer(EmbeddedJettySingleApplicationOnlyClassesServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettySingleApplicationOnlyClassesServer.PORT;
}
@Override
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java
index 0d0ee2fbef8..302ed0bacda 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java
@@ -32,10 +32,10 @@ import static org.junit.Assert.assertTrue;
public class JettySingleApplicationOnlySingletonsTest extends AbstractSciTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettySingleApplicationOnlySingletonsServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettySingleApplicationOnlySingletonsServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettySingleApplicationOnlySingletonsServer() {
super("/",
new Resource[] {
// Limit the classpath scanning to org.apache.demo.resources package
@@ -51,13 +51,14 @@ public class JettySingleApplicationOnlySingletonsTest extends AbstractSciTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly",
+ launchServer(EmbeddedJettySingleApplicationOnlySingletonsServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettySingleApplicationOnlySingletonsServer.PORT;
}
@Override
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java
index 039abe31d39..d13f4c1d5a8 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java
@@ -32,10 +32,10 @@ import static org.junit.Assert.assertTrue;
public class JettySingleApplicationTest extends AbstractSciTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettySingleApplicationServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettySingleApplicationServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettySingleApplicationServer() {
super("/",
new Resource[] {
// Limit the classpath scanning to org.apache.demo.resources package
@@ -51,13 +51,13 @@ public class JettySingleApplicationTest extends AbstractSciTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettySingleApplicationServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettySingleApplicationServer.PORT;
}
@Override
diff --git a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
index b84c328b750..bf241bbb20e 100644
--- a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
+++ b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
@@ -29,10 +29,10 @@ import static org.junit.Assert.assertTrue;
public class JettyWarTest extends AbstractSseTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class EmbeddedJettyWarServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class);
- public EmbeddedJettyServer() {
+ public EmbeddedJettyWarServer() {
super("/jaxrs_sse", "/", PORT);
}
}
@@ -40,12 +40,12 @@ public class JettyWarTest extends AbstractSseTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return EmbeddedJettyWarServer.PORT;
}
}
diff --git a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
index 8425d0d1bf4..99a940f53df 100644
--- a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
+++ b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
@@ -29,10 +29,10 @@ import static org.junit.Assert.assertTrue;
public class TomcatWarTest extends AbstractSseTest {
@Ignore
- public static class EmbeddedTomcatServer extends AbstractTomcatServer {
- public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class);
+ public static class EmbeddedTomcatWarServer extends AbstractTomcatServer {
+ public static final int PORT = allocatePortAsInt(EmbeddedTomcatWarServer.class);
- public EmbeddedTomcatServer() {
+ public EmbeddedTomcatWarServer() {
super("/jaxrs_sse", "/", PORT);
}
}
@@ -40,13 +40,13 @@ public class TomcatWarTest extends AbstractSseTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatWarServer.class, true));
createStaticBus();
}
@Override
protected int getPort() {
- return EmbeddedTomcatServer.PORT;
+ return EmbeddedTomcatWarServer.PORT;
}
@Override
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/JaxrsBraveTracingTest.java
similarity index 95%
rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/JaxrsBraveTracingTest.java
index f402b0a71ca..85718387fcf 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/JaxrsBraveTracingTest.java
@@ -37,8 +37,8 @@ import org.junit.BeforeClass;
import static org.junit.Assert.assertTrue;
-public class BraveTracingTest extends AbstractBraveTracingTest {
- public static final String PORT = allocatePort(BraveTracingTest.class);
+public class JaxrsBraveTracingTest extends AbstractBraveTracingTest {
+ public static final String PORT = allocatePort(JaxrsBraveTracingTest.class);
public static class BraveServer extends AbstractTestServerBase {
private org.apache.cxf.endpoint.Server server;
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/JaxrsMicrometerTracingTest.java
similarity index 97%
rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java
rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/JaxrsMicrometerTracingTest.java
index 2a668deb89c..5f5a56e9be4 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/JaxrsMicrometerTracingTest.java
@@ -51,8 +51,8 @@ import org.junit.BeforeClass;
import static org.apache.cxf.systest.micrometer.ObservationRegistrySupport.createObservationRegistry;
import static org.junit.Assert.assertTrue;
-public class MicrometerTracingTest extends AbstractBraveTracingTest {
- public static final String PORT = allocatePort(MicrometerTracingTest.class);
+public class JaxrsMicrometerTracingTest extends AbstractBraveTracingTest {
+ public static final String PORT = allocatePort(JaxrsMicrometerTracingTest.class);
private static MeterRegistry meterRegistry;
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/JaxrsOpenTelemetryTracingTest.java
similarity index 99%
rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/JaxrsOpenTelemetryTracingTest.java
index 6b218a49df3..f49a46e068a 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/JaxrsOpenTelemetryTracingTest.java
@@ -91,8 +91,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
- public static final String PORT = allocatePort(OpenTelemetryTracingTest.class);
+public class JaxrsOpenTelemetryTracingTest extends AbstractClientServerTestBase {
+ public static final String PORT = allocatePort(JaxrsOpenTelemetryTracingTest.class);
@ClassRule
public static OpenTelemetryRule otelRule = OpenTelemetryRule.create();
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/JaxrsOpenTracingTracingTest.java
similarity index 99%
rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/JaxrsOpenTracingTracingTest.java
index 6566e213582..da278ba6f20 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/JaxrsOpenTracingTracingTest.java
@@ -81,8 +81,8 @@ import static org.hamcrest.Matchers.empty;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class OpenTracingTracingTest extends AbstractClientServerTestBase {
- public static final String PORT = allocatePort(OpenTracingTracingTest.class);
+public class JaxrsOpenTracingTracingTest extends AbstractClientServerTestBase {
+ public static final String PORT = allocatePort(JaxrsOpenTracingTracingTest.class);
private static final AtomicLong RANDOM = new AtomicLong();
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/JaxwsBraveTracingTest.java
similarity index 94%
rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/JaxwsBraveTracingTest.java
index e985f2f043f..f0fe7cfd321 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/JaxwsBraveTracingTest.java
@@ -33,8 +33,8 @@ import org.junit.BeforeClass;
import static org.junit.Assert.assertTrue;
-public class BraveTracingTest extends AbstractBraveTracingTest {
- public static final String PORT = allocatePort(BraveTracingTest.class);
+public class JaxwsBraveTracingTest extends AbstractBraveTracingTest {
+ public static final String PORT = allocatePort(JaxwsBraveTracingTest.class);
public static class Server extends AbstractTestServerBase {
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/MicrometerTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/JaxwsMicrometerTracingTest.java
similarity index 96%
rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/MicrometerTracingTest.java
rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/JaxwsMicrometerTracingTest.java
index 8996da34d7e..b38a4b56e15 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/MicrometerTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/JaxwsMicrometerTracingTest.java
@@ -45,8 +45,8 @@ import org.junit.BeforeClass;
import static org.apache.cxf.systest.micrometer.ObservationRegistrySupport.createObservationRegistry;
import static org.junit.Assert.assertTrue;
-public class MicrometerTracingTest extends AbstractBraveTracingTest {
- public static final String PORT = allocatePort(MicrometerTracingTest.class);
+public class JaxwsMicrometerTracingTest extends AbstractBraveTracingTest {
+ public static final String PORT = allocatePort(JaxwsMicrometerTracingTest.class);
private static MeterRegistry meterRegistry;
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/JaxwsOpenTelemetryTracingTest.java
similarity index 99%
rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/JaxwsOpenTelemetryTracingTest.java
index 295ae79fd79..821b57e943e 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/JaxwsOpenTelemetryTracingTest.java
@@ -78,8 +78,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
- public static final String PORT = allocatePort(OpenTelemetryTracingTest.class);
+public class JaxwsOpenTelemetryTracingTest extends AbstractClientServerTestBase {
+ public static final String PORT = allocatePort(JaxwsOpenTelemetryTracingTest.class);
@ClassRule
public static OpenTelemetryRule otelRule = OpenTelemetryRule.create();
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/JaxwsOpenTracingTracingTest.java
similarity index 98%
rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/JaxwsOpenTracingTracingTest.java
index bdbdceb6f06..d3f9f5e4384 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/JaxwsOpenTracingTracingTest.java
@@ -67,8 +67,8 @@ import static org.hamcrest.Matchers.empty;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class OpenTracingTracingTest extends AbstractClientServerTestBase {
- public static final String PORT = allocatePort(OpenTracingTracingTest.class);
+public class JaxwsOpenTracingTracingTest extends AbstractClientServerTestBase {
+ public static final String PORT = allocatePort(JaxwsOpenTracingTracingTest.class);
private static final AtomicLong RANDOM = new AtomicLong();
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/Server.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionServer.java
similarity index 86%
rename from systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/Server.java
rename to systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionServer.java
index d7ea0ac2ced..de83094e12f 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/Server.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionServer.java
@@ -24,11 +24,11 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class JMSSoapActionServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(JMSSoapActionServer.class);
EmbeddedJMSBrokerLauncher broker;
- public Server(EmbeddedJMSBrokerLauncher b) {
+ public JMSSoapActionServer(EmbeddedJMSBrokerLauncher b) {
broker = b;
}
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionTest.java
index 2d561112da6..3c8dfe2b5c9 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionTest.java
@@ -58,7 +58,7 @@ public class JMSSoapActionTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
broker = new EmbeddedJMSBrokerLauncher("tcp://localhost:" + PORT);
launchServer(broker);
- launchServer(new Server(broker));
+ launchServer(new JMSSoapActionServer(broker));
createStaticBus();
}
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityServer.java
similarity index 90%
rename from systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java
rename to systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityServer.java
index dc1e4aed01b..0cce357219d 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityServer.java
@@ -29,11 +29,11 @@ import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
import org.apache.wss4j.common.ConfigurationConstants;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class JMSWSSecurityServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(JMSWSSecurityServer.class);
EmbeddedJMSBrokerLauncher broker;
- public Server(EmbeddedJMSBrokerLauncher b) {
+ public JMSWSSecurityServer(EmbeddedJMSBrokerLauncher b) {
broker = b;
}
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
index f55da4d6a21..523d7489dd2 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
@@ -65,7 +65,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
broker = new EmbeddedJMSBrokerLauncher("tcp://localhost:" + PORT);
launchServer(broker);
- launchServer(new Server(broker));
+ launchServer(new JMSWSSecurityServer(broker));
createStaticBus();
}
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
index 8d5dc4bbb49..e8dd84a465b 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
@@ -50,7 +50,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
static EmbeddedJMSBrokerLauncher broker;
- public static class Server extends AbstractBusTestServerBase {
+ public static class SwaServer extends AbstractBusTestServerBase {
protected void run() {
try {
JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
@@ -74,7 +74,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
broker = new EmbeddedJMSBrokerLauncher();
System.setProperty("EmbeddedBrokerURL", broker.getBrokerURL());
launchServer(broker);
- launchServer(new Server());
+ launchServer(new SwaServer());
createStaticBus();
}
@AfterClass
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java
index 424a6221f3a..4108c80b042 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java
@@ -46,8 +46,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class ClientServerWrappedContinuationTest extends AbstractClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
- public static final String HTTPS_PORT = allocatePort(Server.class, 1);
+ public static final String PORT = allocatePort(ContinuationServer.class);
+ public static final String HTTPS_PORT = allocatePort(ContinuationServer.class, 1);
private static final String CLIENT_CONFIG_FILE =
"org/apache/cxf/systest/http_undertow/continuations/cxf.xml";
@@ -56,7 +56,7 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes
private static final String SERVER_CONFIG_FILE =
"org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml";
- public static class Server extends AbstractBusTestServerBase {
+ public static class ContinuationServer extends AbstractBusTestServerBase {
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -75,7 +75,7 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes
public static void main(String[] args) {
try {
- Server s = new Server();
+ ContinuationServer s = new ContinuationServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -86,7 +86,7 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(ContinuationServer.class));
}
@Test
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/ClientServerSwaTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/ClientServerSwaTest.java
index ab5c7af190e..a1ea14ea26b 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/ClientServerSwaTest.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/ClientServerSwaTest.java
@@ -50,8 +50,8 @@ import static org.junit.Assert.assertTrue;
@RunWith(value = Parameterized.class)
public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
- static String serverPort = TestUtil.getPortNumber(Server.class);
- static String serverPortInvalid = TestUtil.getPortNumber(Server.class, 1);
+ static String serverPort = TestUtil.getPortNumber(MultipartServer.class);
+ static String serverPortInvalid = TestUtil.getPortNumber(MultipartServer.class, 1);
static class TestParam {
private final String port;
@@ -84,7 +84,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(MultipartServer.class, true));
}
private String getFullStackTrace(Exception ex) {
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/Server.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/MultipartServer.java
similarity index 91%
rename from systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/Server.java
rename to systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/MultipartServer.java
index 4dfa45c0bdf..e797d13fdcd 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/Server.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/MultipartServer.java
@@ -25,10 +25,10 @@ import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.TestUtil;
-public class Server extends AbstractBusTestServerBase {
+public class MultipartServer extends AbstractBusTestServerBase {
protected void run() {
- String port = TestUtil.getPortNumber(Server.class);
+ String port = TestUtil.getPortNumber(MultipartServer.class);
Object implementor = new SwAServiceImpl();
String address = "http://localhost:" + port + "/swa";
@@ -51,7 +51,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ MultipartServer s = new MultipartServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml
index 6297df44df7..4907ade58e9 100644
--- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml
+++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml
@@ -38,7 +38,7 @@ under the License.
<!-- TLS Port configuration parameters for port 9091 -->
<!-- -->
<httpu:engine-factory>
- <httpu:engine port="${testutil.ports.Server.1}">
+ <httpu:engine port="${testutil.ports.ContinuationServer.1}">
<httpu:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
index 0bf25c36f8a..6a10f6db0ce 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
@@ -89,12 +89,12 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
public static String getPort(String s) {
- return BusServer.PORTMAP.get(s);
+ return HttpBusServer.PORTMAP.get(s);
}
@BeforeClass
public static void allocatePorts() {
- BusServer.resetPortMap();
+ HttpBusServer.resetPortMap();
addrMap.clear();
addrMap.put("Mortimer", "http://localhost:" + getPort("PORT0") + "/");
addrMap.put("Rethwel", "http://localhost:" + getPort("PORT1") + "/");
@@ -119,10 +119,10 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
}
Bus bus = BusFactory.getThreadDefaultBus(false);
URL serverC =
- Server.class.getResource(name + ".cxf");
+ HttpServer.class.getResource(name + ".cxf");
BusFactory.setDefaultBus(null);
BusFactory.setThreadDefaultBus(null);
- boolean server = launchServer(Server.class, null,
+ boolean server = launchServer(HttpServer.class, null,
new String[] {
name,
addrMap.get(name),
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HttpBusServer.java
similarity index 88%
rename from systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java
rename to systests/transports/src/test/java/org/apache/cxf/systest/http/HttpBusServer.java
index 33a90c15ac5..315e74f4ad3 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HttpBusServer.java
@@ -31,18 +31,18 @@ import org.apache.cxf.testutil.common.TestUtil;
* This server just instantiates a Bus, full stop.
* Everything else is designed to be spring-loaded.
*/
-public class BusServer extends AbstractBusTestServerBase {
+public class HttpBusServer extends AbstractBusTestServerBase {
public static final Map<String, String> PORTMAP = new HashMap<>();
public static void resetPortMap() {
PORTMAP.clear();
for (int x = 0; x < 9; x++) {
- PORTMAP.put("PORT" + x, TestUtil.getNewPortNumber(BusServer.class, x));
+ PORTMAP.put("PORT" + x, TestUtil.getNewPortNumber(HttpBusServer.class, x));
}
}
public static String getPort(int x) {
if (PORTMAP.isEmpty()) {
for (int y = 0; y < 9; y++) {
- PORTMAP.put("PORT" + y, TestUtil.getPortNumber(BusServer.class, y));
+ PORTMAP.put("PORT" + y, TestUtil.getPortNumber(HttpBusServer.class, y));
}
}
return PORTMAP.get("PORT" + x);
@@ -63,7 +63,7 @@ public class BusServer extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- BusServer s = new BusServer();
+ HttpBusServer s = new HttpBusServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HttpServer.java
similarity index 90%
rename from systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
rename to systests/transports/src/test/java/org/apache/cxf/systest/http/HttpServer.java
index e4b9e007805..7ba4f1e6ada 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HttpServer.java
@@ -27,19 +27,19 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class HttpServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(HttpServer.class);
private String name;
private String address;
private URL configFileURL;
private EndpointImpl ep;
- public Server(String[] args) throws Exception {
+ public HttpServer(String[] args) throws Exception {
this(args[0], args[1], args[2]);
}
- public Server(String n, String addr, String conf) throws Exception {
+ public HttpServer(String n, String addr, String conf) throws Exception {
name = n;
address = addr;
configFileURL = new URL(conf);
@@ -88,7 +88,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server(args);
+ HttpServer s = new HttpServer(args);
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java
index bd700802776..d92b97872ad 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java
@@ -72,10 +72,10 @@ import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class JAXWSAsyncClientTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(JAXWSAsyncServer.class);
static ScheduledExecutorService executor;
- public static class Server extends AbstractBusTestServerBase {
+ public static class JAXWSAsyncServer extends AbstractBusTestServerBase {
protected void run() {
GreeterImpl implementor = new GreeterImpl();
@@ -85,7 +85,7 @@ public class JAXWSAsyncClientTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ JAXWSAsyncServer s = new JAXWSAsyncServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -119,7 +119,7 @@ public class JAXWSAsyncClientTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(JAXWSAsyncServer.class, true));
executor = Executors.newScheduledThreadPool(5);
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSClientTest.java
index fbfed4483f5..60693c2b5ce 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSClientTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSClientTest.java
@@ -59,9 +59,9 @@ import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
public class JAXWSClientTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(JAXWSServer.class);
- public static class Server extends AbstractBusTestServerBase {
+ public static class JAXWSServer extends AbstractBusTestServerBase {
protected void run() {
GreeterImpl implementor = new GreeterImpl();
@@ -71,7 +71,7 @@ public class JAXWSClientTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ JAXWSServer s = new JAXWSServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -93,7 +93,7 @@ public class JAXWSClientTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(JAXWSServer.class, true));
}
@AfterClass
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
index c02601f155a..b40355ae969 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
@@ -42,8 +42,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class ClientServerWrappedContinuationTest extends AbstractClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
- public static final String HTTPS_PORT = allocatePort(Server.class, 1);
+ public static final String PORT = allocatePort(ContinuationServer.class);
+ public static final String HTTPS_PORT = allocatePort(ContinuationServer.class, 1);
private static final String CLIENT_CONFIG_FILE =
"org/apache/cxf/systest/http_jetty/continuations/cxf.xml";
@@ -52,7 +52,7 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes
private static final String SERVER_CONFIG_FILE =
"org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml";
- public static class Server extends AbstractBusTestServerBase {
+ public static class ContinuationServer extends AbstractBusTestServerBase {
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -69,7 +69,7 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes
public static void main(String[] args) {
try {
- Server s = new Server();
+ ContinuationServer s = new ContinuationServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -80,7 +80,7 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(ContinuationServer.class));
}
@Test
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/HttpsBusServer.java
similarity index 87%
rename from systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java
rename to systests/transports/src/test/java/org/apache/cxf/systest/https/HttpsBusServer.java
index 2f3327268f4..b95644405c1 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/HttpsBusServer.java
@@ -31,18 +31,18 @@ import org.apache.cxf.testutil.common.TestUtil;
* This server just instantiates a Bus, full stop.
* Everything else is designed to be spring-loaded.
*/
-public class BusServer extends AbstractBusTestServerBase {
+public class HttpsBusServer extends AbstractBusTestServerBase {
public static final Map<String, String> PORTMAP = new HashMap<>();
public static void resetPortMap() {
PORTMAP.clear();
for (int x = 0; x < 9; x++) {
- PORTMAP.put("PORT" + x, TestUtil.getNewPortNumber(BusServer.class, x));
+ PORTMAP.put("PORT" + x, TestUtil.getNewPortNumber(HttpsBusServer.class, x));
}
}
public static String getPort(int x) {
if (PORTMAP.isEmpty()) {
for (int y = 0; y < 9; y++) {
- PORTMAP.put("PORT" + y, TestUtil.getPortNumber(BusServer.class, y));
+ PORTMAP.put("PORT" + y, TestUtil.getPortNumber(HttpsBusServer.class, y));
}
}
return PORTMAP.get("PORT" + x);
@@ -63,7 +63,7 @@ public class BusServer extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- BusServer s = new BusServer();
+ HttpsBusServer s = new HttpsBusServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
index 187d7c7778e..7e1bc7ae9cd 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
@@ -32,7 +32,7 @@ import org.apache.cxf.configuration.security.KeyManagersType;
import org.apache.cxf.configuration.security.KeyStoreType;
import org.apache.cxf.configuration.security.TrustManagersType;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
-import org.apache.cxf.systest.https.BusServer;
+import org.apache.cxf.systest.https.HttpsBusServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.hello_world.Greeter;
import org.apache.hello_world.services.SOAPService;
@@ -70,7 +70,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void setupPorts() {
- BusServer.resetPortMap();
+ HttpsBusServer.resetPortMap();
}
protected void startServers() throws Exception {
@@ -78,7 +78,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork a new process
- launchServer(BusServer.class, true)
+ launchServer(HttpsBusServer.class, true)
);
}
@@ -144,44 +144,44 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
@Test
public final void testJaxwsServer() throws Exception {
testSuccessfulCall("jaxws-server.xml",
- "https://localhost:" + BusServer.getPort(2) + "/SoapContext/HttpsPort");
+ "https://localhost:" + HttpsBusServer.getPort(2) + "/SoapContext/HttpsPort");
}
@Test
public final void testJaxwsServerChangeHttpsToHttp() throws Exception {
testSuccessfulCall("jaxws-server.xml",
- "http://localhost:" + BusServer.getPort(3) + "/SoapContext/HttpPort");
+ "http://localhost:" + HttpsBusServer.getPort(3) + "/SoapContext/HttpPort");
}
@Test
public final void testJaxwsEndpoint() throws Exception {
testSuccessfulCall("jaxws-publish.xml",
- "https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
+ "https://localhost:" + HttpsBusServer.getPort(1) + "/SoapContext/HttpsPort");
}
@Test
public final void testJaxwsEndpointCallback() throws Exception {
testSuccessfulCall("jaxws-publish-callback.xml",
- "https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
+ "https://localhost:" + HttpsBusServer.getPort(1) + "/SoapContext/HttpsPort");
}
@Test
public final void testJaxwsTLSRefsEndpoint() throws Exception {
testSuccessfulCall("jaxws-tlsrefs-publish.xml",
- "https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
+ "https://localhost:" + HttpsBusServer.getPort(1) + "/SoapContext/HttpsPort");
}
@Test
public final void testPKCS12Endpoint() throws Exception {
testSuccessfulCall("pkcs12.xml",
- "https://localhost:" + BusServer.getPort(6) + "/SoapContext/HttpsPort");
+ "https://localhost:" + HttpsBusServer.getPort(6) + "/SoapContext/HttpsPort");
}
@Test
public final void testResourceKeySpecEndpoint() throws Exception {
testSuccessfulCall("resource-key-spec.xml",
- "https://localhost:" + BusServer.getPort(4) + "/SoapContext/HttpsPort");
+ "https://localhost:" + HttpsBusServer.getPort(4) + "/SoapContext/HttpsPort");
}
@Test
public final void testResourceKeySpecEndpointURL() throws Exception {
testSuccessfulCall("resource-key-spec-url.xml",
- "https://localhost:" + BusServer.getPort(5) + "/SoapContext/HttpsPort",
- new URL("https://localhost:" + BusServer.getPort(5) + "/SoapContext/HttpsPort?wsdl"),
+ "https://localhost:" + HttpsBusServer.getPort(5) + "/SoapContext/HttpsPort",
+ new URL("https://localhost:" + HttpsBusServer.getPort(5) + "/SoapContext/HttpsPort?wsdl"),
true);
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
index df9290cc3c9..c94e5ca0fd2 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
@@ -65,7 +65,7 @@ import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.message.Message;
-import org.apache.cxf.systest.https.BusServer;
+import org.apache.cxf.systest.https.HttpsBusServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.http.MessageTrustDecider;
@@ -155,12 +155,12 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
public static String getPort(String s) {
- return BusServer.PORTMAP.get(s);
+ return HttpsBusServer.PORTMAP.get(s);
}
@BeforeClass
public static void allocatePorts() {
- BusServer.resetPortMap();
+ HttpsBusServer.resetPortMap();
addrMap.clear();
addrMap.put("Mortimer", List.of("http://localhost:" + getPort("PORT0") + "/"));
addrMap.put("Tarpin", List.of("https://localhost:" + getPort("PORT1") + "/"));
@@ -189,10 +189,10 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
}
Bus bus = BusFactory.getThreadDefaultBus(false);
URL serverC =
- Server.class.getResource(name + ".cxf");
+ HttpsServer.class.getResource(name + ".cxf");
BusFactory.setDefaultBus(null);
BusFactory.setThreadDefaultBus(null);
- boolean server = launchServer(Server.class, null,
+ boolean server = launchServer(HttpsServer.class, null,
new String[] {
name,
addrMap.get(name).stream().collect(Collectors.joining(",")),
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HttpsServer.java
similarity index 90%
rename from systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/Server.java
rename to systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HttpsServer.java
index a1887d7a063..88a183714ea 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/Server.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HttpsServer.java
@@ -28,19 +28,19 @@ import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.systest.http.GreeterImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class HttpsServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(HttpsServer.class);
private String name;
private String[] addresses;
private URL configFileURL;
private EndpointImpl[] eps;
- public Server(String[] args) throws Exception {
+ public HttpsServer(String[] args) throws Exception {
this(args[0], args[1], args[2]);
}
- public Server(String n, String addr, String conf) throws Exception {
+ public HttpsServer(String n, String addr, String conf) throws Exception {
name = n;
addresses = addr.split(",");
configFileURL = new URL(conf);
@@ -93,7 +93,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server(args);
+ HttpsServer s = new HttpsServer(args);
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java
index 01f2f8fc998..5a3004b2b7b 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java
@@ -24,7 +24,7 @@ import java.net.URL;
import jakarta.xml.ws.BindingProvider;
import org.apache.cxf.BusFactory;
import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.systest.https.BusServer;
+import org.apache.cxf.systest.https.HttpsBusServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.hello_world.Greeter;
import org.apache.hello_world.services.SOAPService;
@@ -48,7 +48,7 @@ public class CertConstraintsTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void allocatePorts() {
- BusServer.resetPortMap();
+ HttpsBusServer.resetPortMap();
}
/**
@@ -71,7 +71,7 @@ public class CertConstraintsTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork a new process
- launchServer(BusServer.class, true)
+ launchServer(HttpsBusServer.class, true)
);
}
@@ -130,35 +130,35 @@ public class CertConstraintsTest extends AbstractBusClientServerTestBase {
//
// Good Subject DN
//
- testSuccessfulCall("https://localhost:" + BusServer.getPort(0) + "/SoapContext/HttpsPort");
+ testSuccessfulCall("https://localhost:" + HttpsBusServer.getPort(0) + "/SoapContext/HttpsPort");
//
// Bad Subject DN
//
- testFailedCall("https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
+ testFailedCall("https://localhost:" + HttpsBusServer.getPort(1) + "/SoapContext/HttpsPort");
//
// Mixed Subject DN (ALL)
//
- testFailedCall("https://localhost:" + BusServer.getPort(2) + "/SoapContext/HttpsPort");
+ testFailedCall("https://localhost:" + HttpsBusServer.getPort(2) + "/SoapContext/HttpsPort");
//
// Mixed Subject DN (ANY)
//
- testSuccessfulCall("https://localhost:" + BusServer.getPort(3) + "/SoapContext/HttpsPort");
+ testSuccessfulCall("https://localhost:" + HttpsBusServer.getPort(3) + "/SoapContext/HttpsPort");
//
// Mixed Issuer DN (ALL)
//
- testFailedCall("https://localhost:" + BusServer.getPort(4) + "/SoapContext/HttpsPort");
+ testFailedCall("https://localhost:" + HttpsBusServer.getPort(4) + "/SoapContext/HttpsPort");
//
// Mixed Issuer DN (ANY)
//
- testSuccessfulCall("https://localhost:" + BusServer.getPort(5) + "/SoapContext/HttpsPort");
+ testSuccessfulCall("https://localhost:" + HttpsBusServer.getPort(5) + "/SoapContext/HttpsPort");
//
// Bad server Subject DN
//
- testFailedCall("https://localhost:" + BusServer.getPort(6) + "/SoapContext/HttpsPort");
+ testFailedCall("https://localhost:" + HttpsBusServer.getPort(6) + "/SoapContext/HttpsPort");
//
// Bad server Issuer DN
//
- testFailedCall("https://localhost:" + BusServer.getPort(7) + "/SoapContext/HttpsPort");
+ testFailedCall("https://localhost:" + HttpsBusServer.getPort(7) + "/SoapContext/HttpsPort");
stopServers();
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
index b4e6baf8c8a..8c94a150a75 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java
@@ -49,10 +49,10 @@ import static org.junit.Assert.assertTrue;
public class CXFFilterTest extends AbstractServletTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class CXFFilterEmbeddedJettyServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(CXFFilterEmbeddedJettyServer.class);
- public EmbeddedJettyServer() {
+ public CXFFilterEmbeddedJettyServer() {
super("/org/apache/cxf/systest/servlet/web-filter.xml", "/", CONTEXT, PORT);
}
}
@@ -60,7 +60,7 @@ public class CXFFilterTest extends AbstractServletTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(CXFFilterEmbeddedJettyServer.class, true));
createStaticBus();
}
@@ -116,6 +116,6 @@ public class CXFFilterTest extends AbstractServletTest {
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return CXFFilterEmbeddedJettyServer.PORT;
}
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
index 3c96a769482..6e9e98c8584 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
@@ -62,10 +62,10 @@ import static org.junit.Assert.assertTrue;
public class CXFServletTest extends AbstractServletTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class CXFServletEmbeddedJettyServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(CXFServletEmbeddedJettyServer.class);
- public EmbeddedJettyServer() {
+ public CXFServletEmbeddedJettyServer() {
super("/org/apache/cxf/systest/servlet/web.xml", "/", CONTEXT, PORT);
}
}
@@ -73,7 +73,7 @@ public class CXFServletTest extends AbstractServletTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(CXFServletEmbeddedJettyServer.class, true));
createStaticBus();
}
@@ -372,6 +372,6 @@ public class CXFServletTest extends AbstractServletTest {
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return CXFServletEmbeddedJettyServer.PORT;
}
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
index 7f848b9bf81..b8939d22f01 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
@@ -50,10 +50,10 @@ public class ExternalServicesServletTest extends AbstractServletTest {
private static final String FORCED_BASE_ADDRESS = "http://localhost/somewhere";
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class ExternalServicesEmbeddedJettyServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(ExternalServicesEmbeddedJettyServer.class);
- public EmbeddedJettyServer() {
+ public ExternalServicesEmbeddedJettyServer() {
super("/org/apache/cxf/systest/servlet/web-external.xml", "/", CONTEXT, PORT);
}
}
@@ -61,7 +61,7 @@ public class ExternalServicesServletTest extends AbstractServletTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(ExternalServicesEmbeddedJettyServer.class, true));
createStaticBus();
}
@@ -117,6 +117,6 @@ public class ExternalServicesServletTest extends AbstractServletTest {
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return ExternalServicesEmbeddedJettyServer.PORT;
}
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java
index 9212e13869d..d8d4ea7f83b 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java
@@ -41,10 +41,10 @@ import static org.junit.Assert.assertTrue;
public class JsFrontEndServletTest extends AbstractServletTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class JsFrontEndEmbeddedJettyServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(JsFrontEndEmbeddedJettyServer.class);
- public EmbeddedJettyServer() {
+ public JsFrontEndEmbeddedJettyServer() {
super("/org/apache/cxf/systest/servlet/web-js.xml", "/", CONTEXT, PORT);
}
}
@@ -52,7 +52,7 @@ public class JsFrontEndServletTest extends AbstractServletTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(JsFrontEndEmbeddedJettyServer.class, true));
createStaticBus();
}
@@ -88,6 +88,6 @@ public class JsFrontEndServletTest extends AbstractServletTest {
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return JsFrontEndEmbeddedJettyServer.PORT;
}
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringAutoPublishServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringAutoPublishServletTest.java
index 8209ab6c3b3..fa67bb26ae8 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringAutoPublishServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringAutoPublishServletTest.java
@@ -43,10 +43,10 @@ import static org.junit.Assert.assertTrue;
public class SpringAutoPublishServletTest extends AbstractServletTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class SpringEmbeddedJettyServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(SpringEmbeddedJettyServer.class);
- public EmbeddedJettyServer() {
+ public SpringEmbeddedJettyServer() {
super("/org/apache/cxf/systest/servlet/web-spring-auto-launch.xml", "/", CONTEXT, PORT);
}
}
@@ -54,7 +54,7 @@ public class SpringAutoPublishServletTest extends AbstractServletTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(SpringEmbeddedJettyServer.class, true));
createStaticBus();
}
@@ -129,6 +129,6 @@ public class SpringAutoPublishServletTest extends AbstractServletTest {
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return SpringEmbeddedJettyServer.PORT;
}
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletContextTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletContextTest.java
index 87e0a870fc3..71d24bd6217 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletContextTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletContextTest.java
@@ -47,10 +47,10 @@ import static org.junit.Assert.assertTrue;
public class SpringServletContextTest extends AbstractServletTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class SpringServletContexEmbeddedJettyServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(SpringServletContexEmbeddedJettyServer.class);
- public EmbeddedJettyServer() {
+ public SpringServletContexEmbeddedJettyServer() {
super("/org/apache/cxf/systest/servlet/web-spring-context.xml", "/", CONTEXT, PORT);
}
}
@@ -91,7 +91,7 @@ public class SpringServletContextTest extends AbstractServletTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(SpringServletContexEmbeddedJettyServer.class, true));
createStaticBus();
}
@@ -115,6 +115,6 @@ public class SpringServletContextTest extends AbstractServletTest {
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return SpringServletContexEmbeddedJettyServer.PORT;
}
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
index c46280554d9..7ce8cf35613 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java
@@ -44,10 +44,10 @@ import static org.junit.Assert.assertTrue;
public class SpringServletTest extends AbstractServletTest {
@Ignore
- public static class EmbeddedJettyServer extends AbstractJettyServer {
- public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
+ public static class SpringServletEmbeddedJettyServer extends AbstractJettyServer {
+ public static final int PORT = allocatePortAsInt(SpringServletEmbeddedJettyServer.class);
- public EmbeddedJettyServer() {
+ public SpringServletEmbeddedJettyServer() {
super("/org/apache/cxf/systest/servlet/web-spring.xml", "/", CONTEXT, PORT);
}
}
@@ -55,7 +55,7 @@ public class SpringServletTest extends AbstractServletTest {
@BeforeClass
public static void startServers() throws Exception {
AbstractResourceInfo.clearAllMaps();
- assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
+ assertTrue("server did not launch correctly", launchServer(SpringServletEmbeddedJettyServer.class, true));
}
@AfterClass
@@ -152,6 +152,6 @@ public class SpringServletTest extends AbstractServletTest {
@Override
protected int getPort() {
- return EmbeddedJettyServer.PORT;
+ return SpringServletEmbeddedJettyServer.PORT;
}
}
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPServer.java
similarity index 91%
rename from systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/Server.java
rename to systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPServer.java
index 49f9c41a0f9..87d23e0ede5 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/Server.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPServer.java
@@ -25,8 +25,8 @@ import org.apache.cxf.annotations.GZIP;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.hello_world_soap_http.BaseGreeterImpl;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class SoapUDPServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(SoapUDPServer.class);
Endpoint ep;
protected void run() {
@@ -45,7 +45,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ SoapUDPServer s = new SoapUDPServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java
index cb9ced41dd6..fa63bcb4a6c 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class SoapUDPTest extends AbstractBusClientServerTestBase {
- private static final String PORT = Server.PORT;
+ private static final String PORT = SoapUDPServer.PORT;
private final QName serviceName = new QName("http://apache.org/hello_world_soap_http",
"SOAPService");
private final QName localPortName = new QName("http://apache.org/hello_world_soap_http",
@@ -47,7 +47,7 @@ public class SoapUDPTest extends AbstractBusClientServerTestBase {
staticBus = BusFactory.getDefaultBus();
new LoggingFeature().initialize(staticBus);
BusFactory.setThreadDefaultBus(staticBus);
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(SoapUDPServer.class, true));
}
@Test
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
index c06dbea5e84..38a8a1e5c74 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
@@ -40,7 +40,7 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<http:destination name="{http://apache.org/hello_world}Abost.http-destination">
- <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.3}/Hurlon"/>
+ <http:server RedirectURL="http://localhost:${testutil.ports.HttpBusServer.3}/Hurlon"/>
</http:destination>
</beans>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
index a8f5b00dc17..90438bf6d36 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
@@ -41,7 +41,7 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<http:destination name="{http://apache.org/hello_world}Hurlon.http-destination">
- <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.2}/Abost"/>
+ <http:server RedirectURL="http://localhost:${testutil.ports.HttpBusServer.2}/Abost"/>
</http:destination>
</beans>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
index 2c6393c0e65..0daddb27a37 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
@@ -42,7 +42,7 @@
<http:destination name="{http://apache.org/hello_world}Rethwel.http-destination">
- <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/>
+ <http:server RedirectURL="http://localhost:${testutil.ports.HttpBusServer.0}/Mortimer"/>
</http:destination>
</beans>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
index 12b289f7f47..ce6fa0d1439 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
@@ -38,7 +38,7 @@ under the License.
<!-- TLS Port configuration parameters for port 9091 -->
<!-- -->
<httpj:engine-factory>
- <httpj:engine port="${testutil.ports.Server.1}">
+ <httpj:engine port="${testutil.ports.ContinuationServer.1}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf
index 8302e28a9f5..390b394c64a 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf
@@ -47,7 +47,7 @@
</http:destination>
<httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.4}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.4}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v">
<sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v"
@@ -60,7 +60,7 @@
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
- <httpj:engine port="${testutil.ports.BusServer.6}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.6}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v">
<sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v"
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientBeans.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientBeans.xml
index ef6164d0e80..45a7267a3a9 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientBeans.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/BethalClientBeans.xml
@@ -26,5 +26,5 @@
xsi:schemaLocation="http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http:/ [...]
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
<import resource="classpath:org/apache/cxf/systest/https/conduit/BethalClientConfig.cxf"/>
- <jaxws:client xmlns:s="http://apache.org/hello_world" id="Bethal" serviceClass="org.apache.hello_world.Greeter" serviceName="s:SOAPService" endpointName="s:Bethal" address="https://localhost:${testutil.ports.BusServer.4}/Bethal"/>
+ <jaxws:client xmlns:s="http://apache.org/hello_world" id="Bethal" serviceClass="org.apache.hello_world.Greeter" serviceName="s:SOAPService" endpointName="s:Bethal" address="https://localhost:${testutil.ports.HttpsBusServer.4}/Bethal"/>
</beans>
\ No newline at end of file
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf
index 8986a203883..f1634901fef 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf
@@ -42,11 +42,11 @@
<http:destination
name="{http://apache.org/hello_world}Gordy.http-destination">
- <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.4}/Bethal"/>
+ <http:server RedirectURL="https://localhost:${testutil.ports.HttpsBusServer.4}/Bethal"/>
</http:destination>
<httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.3}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.3}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf
index 28e4e816513..d8ab26fcaf4 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Morpit.cxf
@@ -44,7 +44,7 @@
</http:destination>
<httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.5}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.5}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf
index 5a376b40802..fb8dc3104a0 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Poltim.cxf
@@ -42,11 +42,11 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<http:destination name="{http://apache.org/hello_world}Poltim.http-destination">
- <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/>
+ <http:server RedirectURL="http://localhost:${testutil.ports.HttpsBusServer.0}/Mortimer"/>
</http:destination>
<httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.2}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
index 4cb48566657..c191a4b6d9f 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
@@ -42,11 +42,11 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<http:destination name="{http://apache.org/hello_world}Tarpin.http-destination">
- <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.3}/Gordy"/>
+ <http:server RedirectURL="https://localhost:${testutil.ports.HttpsBusServer.3}/Gordy"/>
</http:destination>
<httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.1}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
index 4a653d49038..7d754ffd1ea 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
@@ -38,12 +38,12 @@ under the License.
<!-- -->
<!-- Spring-load an HTTPS servant -->
<!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.HttpsBusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
<!-- -->
<!-- TLS Port configuration parameters for port 9001 -->
<!-- -->
<httpj:engine-factory id="port-9001-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.1}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.https.conduit.KeyPasswordCallbackHandler">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml
index a02440bf65c..af273a50d6b 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml
@@ -38,12 +38,12 @@ under the License.
<!-- -->
<!-- Spring-load an HTTPS servant -->
<!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.HttpsBusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
<!-- -->
<!-- TLS Port configuration parameters for port 9001 -->
<!-- -->
<httpj:engine-factory id="port-9001-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.1}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml
index d793b5576cc..a1646058d1a 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml
@@ -38,13 +38,13 @@ under the License.
<!-- -->
<!-- Spring-load an HTTPS servant -->
<!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9002-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.HttpsBusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9002-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
<!-- Non http endpoint -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpEndpoint" address="http://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpPort" serviceName="s:SOAPService" endpointName="e:HttpsPort">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpEndpoint" address="http://localhost:${testutil.ports.HttpsBusServer.3}/SoapContext/HttpPort" serviceName="s:SOAPService" endpointName="e:HttpsPort">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
@@ -53,7 +53,7 @@ under the License.
<!-- TLS Port configuration parameters for port 9002 -->
<!-- -->
<httpj:engine-factory id="port-9002-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.2}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="changit">
<sec:keyStore type="JKS" password="password" resource="keys/MultipleKeys.jks"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml
index 379423b8ddf..e741eb4fd9a 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml
@@ -38,14 +38,14 @@ under the License.
<!-- -->
<!-- Spring-load an HTTPS servant -->
<!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.HttpsBusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
<!-- -->
<!-- TLS Port configuration parameters for port 9001 -->
<!-- -->
<bean id="serverKeyManagers" class="org.apache.cxf.systest.https.conduit.HTTPSClientTest$ServerManagersFactory" factory-method="getKeyManagers"/>
<bean id="serverTrustManagers" class="org.apache.cxf.systest.https.conduit.HTTPSClientTest$ServerManagersFactory" factory-method="getTrustManagers"/>
<httpj:engine-factory id="port-9001-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.1}">
<httpj:tlsServerParameters>
<sec:keyManagers ref="serverKeyManagers"/>
<sec:trustManagers ref="serverTrustManagers"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml
index 8a6d104acc4..e1b0ae28256 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml
@@ -40,7 +40,7 @@ under the License.
<!-- -->
<!-- Spring-load an HTTPS servant -->
<!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9006-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.HttpsBusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9006-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
@@ -49,7 +49,7 @@ under the License.
<!-- TLS Port configuration parameters for port 9006 -->
<!-- -->
<httpj:engine-factory id="port-9006-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.6}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.6}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="pkcs12" password="password" resource="keys/Bethal.p12"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml
index 260f0ed4f52..073e2b8635f 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml
@@ -39,7 +39,7 @@ under the License.
<!-- -->
<!-- Spring-load an HTTPS servant -->
<!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" wsdlLocation="/wsdl/hello_world_services.wsdl" depends-on="port-9005-tls-config">
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.HttpsBusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" wsdlLocation="/wsdl/hello_world_services.wsdl" depends-on="port-9005-tls-config">
<jaxws:features>
<bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
</jaxws:features>
@@ -50,7 +50,7 @@ under the License.
<!-- This test exercises the resource attribute in a keyStore element -->
<!-- -->
<httpj:engine-factory id="port-9005-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.5}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.5}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml
index f9a42c345d1..98bc99381a0 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml
@@ -38,14 +38,14 @@ under the License.
<!-- -->
<!-- Spring-load an HTTPS servant -->
<!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9004-tls-config"/>
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.HttpsBusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9004-tls-config"/>
<!-- -->
<!-- TLS Port configuration parameters for port 9004 -->
<!-- -->
<!-- This test exercises the resource attribute in a keyStore element -->
<!-- -->
<httpj:engine-factory id="port-9004-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.4}">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.4}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml
index 686788a9714..bf37d066208 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml
@@ -38,42 +38,42 @@ under the License.
<!-- -->
<!-- Spring-load an HTTPS servant -->
<!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-0" address="https://localhost:${testutil.ports.BusServer.0}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.0-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-0" address="https://localhost:${testutil.ports.HttpsBusServer.0}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.HttpsBusServer.0-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-1" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.1-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-1" address="https://localhost:${testutil.ports.HttpsBusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.HttpsBusServer.1-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-2" address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.2-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-2" address="https://localhost:${testutil.ports.HttpsBusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.HttpsBusServer.2-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-3" address="https://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.3-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-3" address="https://localhost:${testutil.ports.HttpsBusServer.3}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.HttpsBusServer.3-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-4" address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.4-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-4" address="https://localhost:${testutil.ports.HttpsBusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.HttpsBusServer.4-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-5" address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.5-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-5" address="https://localhost:${testutil.ports.HttpsBusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.HttpsBusServer.5-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-6" address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.6-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-6" address="https://localhost:${testutil.ports.HttpsBusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.HttpsBusServer.6-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
</jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-7" address="https://localhost:${testutil.ports.BusServer.7}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.7-tls-config">
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-7" address="https://localhost:${testutil.ports.HttpsBusServer.7}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.HttpsBusServer.7-tls-config">
<jaxws:serviceBean>
<bean class="org.apache.cxf.systest.http.GreeterImpl"/>
</jaxws:serviceBean>
@@ -81,8 +81,8 @@ under the License.
<!-- -->
<!-- TLS Port configuration parameters for port 9000 -->
<!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.0-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.0}">
+ <httpj:engine-factory id="port-testutil.ports.HttpsBusServer.0-tls-config">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.0}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
@@ -102,8 +102,8 @@ under the License.
<!-- -->
<!-- TLS Port configuration parameters for port 9007 -->
<!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.1-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:engine-factory id="port-testutil.ports.HttpsBusServer.1-tls-config">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.1}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
@@ -122,8 +122,8 @@ under the License.
<!-- -->
<!-- TLS Port configuration parameters for port 9008 -->
<!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.2-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.2}">
+ <httpj:engine-factory id="port-testutil.ports.HttpsBusServer.2-tls-config">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
@@ -143,8 +143,8 @@ under the License.
<!-- -->
<!-- TLS Port configuration parameters for port 9009 -->
<!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.3-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.3}">
+ <httpj:engine-factory id="port-testutil.ports.HttpsBusServer.3-tls-config">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.3}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
@@ -164,8 +164,8 @@ under the License.
<!-- -->
<!-- TLS Port configuration parameters for port 9010 -->
<!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.4-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.4}">
+ <httpj:engine-factory id="port-testutil.ports.HttpsBusServer.4-tls-config">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.4}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
@@ -185,8 +185,8 @@ under the License.
<!-- -->
<!-- TLS Port configuration parameters for port 9011 -->
<!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.5-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.5}">
+ <httpj:engine-factory id="port-testutil.ports.HttpsBusServer.5-tls-config">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.5}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
@@ -206,8 +206,8 @@ under the License.
<!-- -->
<!-- TLS Port configuration parameters for port 9012 -->
<!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.6-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.6}">
+ <httpj:engine-factory id="port-testutil.ports.HttpsBusServer.6-tls-config">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.6}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
@@ -222,8 +222,8 @@ under the License.
<!-- -->
<!-- TLS Port configuration parameters for port 9013 -->
<!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.7-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.7}">
+ <httpj:engine-factory id="port-testutil.ports.HttpsBusServer.7-tls-config">
+ <httpj:engine port="${testutil.ports.HttpsBusServer.7}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password" resource="keys/Gordy.jks"/>
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Cxf2006Server.java
similarity index 89%
rename from systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Cxf2006Server.java
index 3ec9bab07f5..914aecc8dc2 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Cxf2006Server.java
@@ -28,16 +28,16 @@ import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class Cxf2006Server extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(Cxf2006Server.class);
Endpoint ep;
String wsdlLocation;
- public Server() {
+ public Cxf2006Server() {
this(new String[] {"/wsdl_systest/cxf2006.wsdl"});
}
- public Server(String[] args) {
+ public Cxf2006Server(String[] args) {
wsdlLocation = args.length > 0 ? args[0] : "/wsdl_systest/cxf2006.wsdl";
}
@@ -61,7 +61,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ Cxf2006Server s = new Cxf2006Server();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java
index 9da3113a4de..b7a9524b4b1 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class RespectBindingFeatureClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = Cxf2006Server.PORT;
private final QName portName = new QName("http://apache.org/hello_world_rpclit", "SoapPortRPCLit");
private SOAPServiceRPCLit service = new SOAPServiceRPCLit();
private ServerLauncher serverLauncher;
@@ -51,7 +51,7 @@ public class RespectBindingFeatureClientServerTest extends AbstractBusClientServ
private void startServers(String wsdlLocation) throws Exception {
String[] args = new String[] {wsdlLocation};
- serverLauncher = new ServerLauncher(Server.class.getName(), null, args, true);
+ serverLauncher = new ServerLauncher(Cxf2006Server.class.getName(), null, args, true);
boolean isServerReady = serverLauncher.launchServer();
assertTrue("server did not launch correctly", isServerReady);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java
index c047533bb2d..09dd90daa79 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class CallbackClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = CallbackServer.PORT;
public static final String CB_PORT = allocatePort(CallbackClientServerTest.class);
private static final QName SERVICE_NAME
@@ -49,7 +49,7 @@ public class CallbackClientServerTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(CallbackServer.class, true));
createStaticBus();
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackServer.java
similarity index 89%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackServer.java
index 77e77daaf90..b1e95d9b451 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackServer.java
@@ -24,8 +24,8 @@ import jakarta.xml.ws.Endpoint;
import org.apache.cxf.BusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class CallbackServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(CallbackServer.class);
Endpoint ep;
@@ -42,7 +42,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ CallbackServer s = new CallbackServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaServer.java
similarity index 89%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaServer.java
index d8a9e18efa5..bf21f58cd08 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaServer.java
@@ -24,8 +24,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PERSIST_PORT = allocatePort(Server.class);
+public class CorbaServer extends AbstractBusTestServerBase {
+ public static final String PERSIST_PORT = allocatePort(CorbaServer.class);
protected void run() {
System.setProperty("com.sun.CORBA.POA.ORBServerId", "1");
@@ -37,6 +37,6 @@ public class Server extends AbstractBusTestServerBase {
}
public static void main(String[] args) throws Exception {
- new Server().start();
+ new CorbaServer().start();
}
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
index 7406856a752..69365dbb984 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.fail;
*/
public class CorbaTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PERSIST_PORT;
+ public static final String PORT = CorbaServer.PERSIST_PORT;
private static final QName SERVICE_NAME =
new QName("http://cxf.apache.org/hello_world_corba",
@@ -53,7 +53,7 @@ public class CorbaTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
assertTrue(
"Server failed to launch",
- launchServer(Server.class)
+ launchServer(CorbaServer.class)
);
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index 234b6301a6e..a4731fdfa58 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.fail;
*/
public class CorbaTimeoutTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PERSIST_PORT;
+ public static final String PORT = CorbaServer.PERSIST_PORT;
private static final QName SERVICE_NAME =
new QName("http://cxf.apache.org/hello_world_corba",
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Server.java
similarity index 88%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Server.java
index ee386f903fa..887ea302c56 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Server.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.cxf993;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class Cxf993Server extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(Cxf993Server.class);
protected void run() {
Object implementor = new Cxf993Impl();
@@ -33,7 +33,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ Cxf993Server s = new Cxf993Server();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java
index 602b3102ace..ae3a5593195 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java
@@ -37,12 +37,12 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class Cxf993Test extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = Cxf993Server.PORT;
private final QName serviceName = new QName("urn://testnotification", "NotificationService");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Cxf993Server.class));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java
index aaeb3b4c61c..82c3bb04990 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java
@@ -44,12 +44,12 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class GenericExceptionTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = GenericServer.PORT;
private final QName serviceName = new QName("http://cxf.apache.org/test/HelloService", "HelloService");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(GenericServer.class));
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericServer.java
similarity index 88%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericServer.java
index 487ad71f5d4..e481f43cb8e 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericServer.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.exception;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class GenericServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(GenericServer.class);
protected void run() {
Object implementor = new GenericsEchoImpl();
@@ -33,7 +33,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ GenericServer s = new GenericServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
index fffb0d9e63f..5fc52d69d7b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
@@ -46,13 +46,13 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class IntFaultClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = IntFaultServer.PORT;
private final QName serviceName = new QName("http://apache.org/intfault",
"SOAPService");
@BeforeClass
public static void startServers() throws Exception {
createStaticBus();
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(IntFaultServer.class, true));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultServer.java
similarity index 88%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultServer.java
index ffc5c56c37c..ae0acb6df7a 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultServer.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.fault;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class IntFaultServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(IntFaultServer.class);
Endpoint ep;
protected void run() {
@@ -38,7 +38,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ IntFaultServer s = new IntFaultServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
index 113016ef335..ad700cfa40b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
@@ -72,7 +72,7 @@ import static org.junit.Assert.fail;
*
*/
public class InterceptorFaultTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(InterceptorFaultServer.class);
private static final Logger LOG = LogUtils.getLogger(InterceptorFaultTest.class);
@@ -96,7 +96,7 @@ public class InterceptorFaultTest extends AbstractBusClientServerTestBase {
* QOS interceptors such as the RM, addressing and policy interceptors).
*
*/
- public static class Server extends AbstractBusTestServerBase {
+ public static class InterceptorFaultServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
@@ -121,7 +121,7 @@ public class InterceptorFaultTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ InterceptorFaultServer s = new InterceptorFaultServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -145,7 +145,7 @@ public class InterceptorFaultTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
System.setProperty("org.apache.cxf.transports.http_jetty.DontClosePort." + PORT, "true");
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(InterceptorFaultServer.class, true));
createStaticBus();
}
@AfterClass
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java
index e7ce0baf8ef..4b12ffb373b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java
@@ -45,15 +45,15 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class OutBoundConnectionTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = OutBoundServer.PORT;
private final QName serviceName = new QName("http://apache.org/hello_world_soap_http",
"SOAPService");
private final QName portName = new QName("http://apache.org/hello_world_soap_http",
"SoapPort");
- public static class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+ public static class OutBoundServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(OutBoundServer.class);
Endpoint ep;
protected void run() {
@@ -69,7 +69,7 @@ public class OutBoundConnectionTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ OutBoundServer s = new OutBoundServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -82,7 +82,7 @@ public class OutBoundConnectionTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(OutBoundServer.class, true));
createStaticBus();
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java
index d346577e114..fe72bd37677 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java
@@ -38,14 +38,14 @@ import static org.junit.Assert.assertTrue;
public class JSClientServerTest extends AbstractBusClientServerTestBase {
- public static final String JS_PORT = Server.JS_PORT;
- public static final String JSX_PORT = Server.JSX_PORT;
+ public static final String JS_PORT = JSServer.JS_PORT;
+ public static final String JSX_PORT = JSServer.JSX_PORT;
private static final String NS = "http://apache.org/hello_world_soap_http";
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(JSServer.class, true));
createStaticBus();
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSServer.java
similarity index 89%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSServer.java
index 5515735b894..c52947fe1ac 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSServer.java
@@ -26,9 +26,9 @@ import java.nio.charset.StandardCharsets;
import org.apache.cxf.js.rhino.ProviderFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String JS_PORT = allocatePort(Server.class);
- public static final String JSX_PORT = allocatePort(Server.class, 1);
+public class JSServer extends AbstractBusTestServerBase {
+ public static final String JS_PORT = allocatePort(JSServer.class);
+ public static final String JSX_PORT = allocatePort(JSServer.class, 1);
ProviderFactory pf = new ProviderFactory();
protected void run() {
@@ -51,7 +51,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
System.err.println("Server main");
- Server s = new Server();
+ JSServer s = new JSServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingServer.java
similarity index 87%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingServer.java
index de925dfdb70..f506e57f074 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingServer.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.mtom_bindingtype;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class MTOMBindingServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(MTOMBindingServer.class);
protected void run() {
Object implementor = new HelloImpl();
@@ -33,7 +33,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ MTOMBindingServer s = new MTOMBindingServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
index e38ed4ee212..aba60c6c52c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class MTOMBindingTypeTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = MTOMBindingServer.PORT;
private final QName serviceName = new QName("http://apache.org/cxf/systest/mtom_feature",
"HelloService");
@@ -59,7 +59,7 @@ public class MTOMBindingTypeTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(MTOMBindingServer.class, true));
}
protected ByteArrayOutputStream setupInLogging() {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
index 959c0e30729..d43083c5e50 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
@@ -46,14 +46,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = MtomFeatureServer.PORT;
private final QName serviceName = new QName("http://apache.org/cxf/systest/mtom_feature",
"HelloService");
private Hello port = getPort();
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(MtomFeatureServer.class, true));
}
@Before
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureServer.java
similarity index 87%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureServer.java
index 893d93ea9f3..20eb3ccdbb7 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureServer.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.mtom_feature;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class MtomFeatureServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(MtomFeatureServer.class);
protected void run() {
Object implementor = new HelloImpl();
@@ -33,7 +33,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ MtomFeatureServer s = new MtomFeatureServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationServer.java
similarity index 85%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationServer.java
index 6e74d01ee7e..e4f8890f114 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationServer.java
@@ -24,8 +24,8 @@ import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class MTOMProviderSchemaValidationServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(MTOMProviderSchemaValidationServer.class);
protected void run() {
TestProvider implementor = new TestProvider();
@@ -36,7 +36,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) throws Exception {
try {
- Server s = new Server();
+ MTOMProviderSchemaValidationServer s = new MTOMProviderSchemaValidationServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationTest.java
index 82a0fc7882f..a8842625047 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationTest.java
@@ -36,13 +36,13 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public final class MTOMProviderSchemaValidationTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = MTOMProviderSchemaValidationServer.PORT;
private final QName serviceName = new QName("http://cxf.apache.org/", "HelloWS");
@BeforeClass
public static void startservers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(MTOMProviderSchemaValidationServer.class, true));
}
@Test
public void testSchemaValidation() throws Exception {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
index 81b6e589a0b..ed019233f02 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
@@ -40,8 +40,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class CallbackClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
- public static final String CB_PORT = allocatePort(CallbackClientServerTest.class);
+ public static final String PORT = NestedCallbackServer.PORT;
+ public static final String CB_PORT = allocatePort(NestedCallbackServer.class);
private static final QName SERVICE_NAME
= new QName("http://apache.org/nested_callback", "SOAPService");
@@ -60,7 +60,7 @@ public class CallbackClientServerTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(NestedCallbackServer.class, true));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/NestedCallbackServer.java
similarity index 86%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/NestedCallbackServer.java
index 0cbe3a14ef8..95a1c66f307 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/NestedCallbackServer.java
@@ -23,8 +23,8 @@ package org.apache.cxf.systest.nested_callback;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class NestedCallbackServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(NestedCallbackServer.class);
protected void run() {
Object implementor = new ServerImpl();
@@ -35,7 +35,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ NestedCallbackServer s = new NestedCallbackServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
index 2c714e3bcbe..e4e70a65746 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class OOBHeaderTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = OOBServer.PORT;
public static final String CONFIG_FILE = "org/apache/cxf/systest/outofband/header/cxf.xml";
public static final String TEST_HDR_NS = "http://cxf.apache.org/outofband/Header";
@@ -74,7 +74,7 @@ public class OOBHeaderTest extends AbstractBusClientServerTestBase {
System.setProperty("cxf.config.file", "org/apache/cxf/systest/outofband/header/cxf.xml");
createStaticBus(CONFIG_FILE);
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(OOBServer.class, true));
}
private void addOutOfBoundHeader(PutLastTradedPricePortType portType, boolean invalid, boolean mu) {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBServer.java
similarity index 96%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBServer.java
index 6bec5722d52..733ad5df5df 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBServer.java
@@ -32,8 +32,8 @@ import org.apache.cxf.Bus;
import org.apache.cxf.annotations.EndpointProperty;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class OOBServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(OOBServer.class);
Bus bus;
@@ -89,7 +89,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ OOBServer s = new OOBServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverServer.java
similarity index 87%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverServer.java
index 2213b64c55f..6f16caf7cac 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverServer.java
@@ -23,8 +23,8 @@ import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.hello_world_soap_http.GreeterImpl;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class JarResolverServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(JarResolverServer.class);
protected void run() {
Object implementor = new GreeterImpl();
String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
@@ -34,7 +34,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ JarResolverServer s = new JarResolverServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
index 0bb9266a7b1..16a9b4fb813 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
@@ -36,14 +36,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class JarResolverTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = JarResolverServer.PORT;
private final QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
private final QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapPort");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(JarResolverServer.class, true));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportServer.java
similarity index 89%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportServer.java
index 0e3693b91ce..2f08ac3e30a 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportServer.java
@@ -21,10 +21,10 @@ package org.apache.cxf.systest.schemaimport;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class SchemaImportServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(SchemaImportServer.class);
- public Server() {
+ public SchemaImportServer() {
}
protected void run() {
@@ -44,7 +44,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ SchemaImportServer s = new SchemaImportServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportTest.java
index c148af79243..498fd174f7f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportTest.java
@@ -31,11 +31,11 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class SchemaImportTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = SchemaImportServer.PORT;
@BeforeClass
public static void startservers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(SchemaImportServer.class, true));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java
index 76873f38a1f..81ca7bf141c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class Soap12ClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = Soap12Server.PORT;
private final QName serviceName = new QName("http://apache.org/hello_world_soap12_http",
"SOAPService");
@@ -62,7 +62,7 @@ public class Soap12ClientServerTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(Soap12Server.class, true));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12Server.java
similarity index 90%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12Server.java
index c0870b688d6..a2a7c588a45 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12Server.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.soap12;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class Soap12Server extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(Soap12Server.class);
Endpoint ep;
Endpoint ep11;
@@ -45,7 +45,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ Soap12Server s = new Soap12Server();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java
index b4ab5020874..6b7870ff869 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java
@@ -32,12 +32,12 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class SOAPFaultRequestTestCase extends AbstractClientServerTestBase {
- private static final String PORT = Server.PORT;
+ private static final String PORT = SOAPFaultServer.PORT;
private final QName portName = new QName("http://cxf.apache.org/soapfault", "SoapFaultPortType");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(SOAPFaultServer.class));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultServer.java
similarity index 87%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultServer.java
index bd0c4228463..96f1682c926 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultServer.java
@@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class SOAPFaultServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(SOAPFaultServer.class);
protected void run() {
String address = "http://localhost:" + PORT + "/SoapFault";
@@ -34,7 +34,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ SOAPFaultServer s = new SOAPFaultServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
index 48942ebacd0..0f874aa256f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
@@ -47,13 +47,13 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class HeaderClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = SoapHeaderServer.PORT;
private final QName serviceName = new QName("http://cxf.apache.org/pizza", "PizzaService");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(SoapHeaderServer.class, true));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/SoapHeaderServer.java
similarity index 87%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/SoapHeaderServer.java
index dad44a63cee..c3709f94bfa 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/SoapHeaderServer.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.soapheader;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class SoapHeaderServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(SoapHeaderServer.class);
protected void run() {
Object implementor = new PizzaImpl();
@@ -33,7 +33,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ SoapHeaderServer s = new SoapHeaderServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java
index 50f177c9784..4e48e12b62b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java
@@ -45,14 +45,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class ExtSoapHeaderClientServerTest extends AbstractClientServerTestBase {
- public static final String PORT0 = allocatePort(Server.class, 0);
- public static final String PORT1 = allocatePort(Server.class, 1);
+ public static final String PORT0 = allocatePort(ExtSoapHeaderServer.class, 0);
+ public static final String PORT1 = allocatePort(ExtSoapHeaderServer.class, 1);
private static SamplePortType client;
private static final QName SERVIVE_NAME = new QName("http://cxf.apache.org/soap_ext_header/ws", "SampleService");
- public static class Server extends AbstractServerTestServerBase {
+ public static class ExtSoapHeaderServer extends AbstractServerTestServerBase {
@Override
protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception {
@@ -74,13 +74,13 @@ public class ExtSoapHeaderClientServerTest extends AbstractClientServerTestBase
}
public static void main(String[] args) throws Exception {
- new Server().start();
+ new ExtSoapHeaderServer().start();
}
}
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(ExtSoapHeaderServer.class, true));
initClient();
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java
index d84e87cd8e8..07c7ea9c436 100755
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.fail;
*
*/
public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(StaxTransformServer.class);
private static final Logger LOG = LogUtils.getLogger(StaxTransformFeatureTest.class);
private static final String GREETER_PORT_ADDRESS = "http://localhost:" + PORT + "/SoapContext/GreeterPort";
@@ -69,7 +69,7 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase {
private Greeter greeter;
- public static class Server extends AbstractBusTestServerBase {
+ public static class StaxTransformServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
@@ -109,7 +109,7 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ StaxTransformServer s = new StaxTransformServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -125,7 +125,7 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
// force the info logging for this test
LOG.setLevel(Level.INFO);
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(StaxTransformServer.class, true));
}
@AfterClass
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayServer.java
similarity index 88%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayServer.java
index 1bd8d0556ac..d265ec3abf0 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayServer.java
@@ -21,8 +21,8 @@ package org.apache.cxf.systest.stringarray;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class StringArrayServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(StringArrayServer.class);
protected void run() {
Object implementor = new StringArrayTestImpl();
@@ -37,7 +37,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ StringArrayServer s = new StringArrayServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
index fdeaca0c317..ddede2a259f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
@@ -38,11 +38,11 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertTrue;
public class StringArrayTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = StringArrayServer.PORT;
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(StringArrayServer.class, true));
}
@AfterClass
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java
index 6addcbf29dc..b364c0e21da 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java
@@ -40,13 +40,13 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class TypeSubClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = TypeSubstitutionServer.PORT;
private final QName serviceName = new QName("http://apache.org/type_substitution/",
"CarDealerService");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(TypeSubstitutionServer.class, true));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubstitutionServer.java
similarity index 86%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubstitutionServer.java
index 1797f26cb8b..eff051aa527 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubstitutionServer.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.type_substitution;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class TypeSubstitutionServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(TypeSubstitutionServer.class);
protected void run() {
Object implementor = new CarDealerImpl();
@@ -34,7 +34,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ TypeSubstitutionServer s = new TypeSubstitutionServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/ClientServerVersioningTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/ClientServerVersioningTest.java
index cb820fd8f64..efe0210eead 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/ClientServerVersioningTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/ClientServerVersioningTest.java
@@ -37,12 +37,12 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class ClientServerVersioningTest extends AbstractClientServerTestBase {
- private static final String PORT = Server.PORT;
+ private static final String PORT = VersioningServer.PORT;
private final QName portName = new QName("http://apache.org/hello_world_mixedstyle", "SoapPort");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(VersioningServer.class));
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/VersioningServer.java
similarity index 92%
rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java
rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/VersioningServer.java
index 207c3c1d0e3..cb8f9463f1b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/VersioningServer.java
@@ -28,8 +28,8 @@ import org.apache.cxf.transport.MultipleEndpointObserver;
import org.apache.hello_world_mixedstyle.GreeterImplMixedStyle;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class VersioningServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(VersioningServer.class);
protected void run() {
setBus(BusFactory.getDefaultBus());
@@ -56,7 +56,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ VersioningServer s = new VersioningServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
index 6bb596c6e38..ca26208bb76 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue;
* Tests the WS-RM processing with the cached out message (using temporary files).
*/
public class CachedOutMessageTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(CachedOutMessageServer.class);
public static final String DECOUPLE_PORT = allocatePort("decoupled.port");
private static final Logger LOG = LogUtils.getLogger(RetransmissionQueueTest.class);
@@ -54,7 +54,7 @@ public class CachedOutMessageTest extends AbstractBusClientServerTestBase {
- public static class Server extends AbstractBusTestServerBase {
+ public static class CachedOutMessageServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -87,7 +87,7 @@ public class CachedOutMessageTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
CachedOutputStream.setDefaultThreshold(16);
assertTrue("server did not launch correctly",
- launchServer(Server.class, true));
+ launchServer(CachedOutMessageServer.class, true));
}
@AfterClass
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java
index 04e8975a46a..def4a8b5f7a 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java
@@ -50,12 +50,12 @@ import static org.junit.Assert.assertTrue;
* exchange of WS-RM protocol messages.
*/
public class DecoupledBareTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(DecoupledBareServer.class);
public static final String DECOUPLE_PORT = allocatePort(DecoupledBareTest.class);
private static final Logger LOG = LogUtils.getLogger(DecoupledBareTest.class);
- public static class Server extends AbstractBusTestServerBase {
+ public static class DecoupledBareServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
@@ -81,7 +81,7 @@ public class DecoupledBareTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(DecoupledBareServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java
index 06de107d7e4..8bc41286f27 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java
@@ -48,12 +48,12 @@ import static org.junit.Assert.assertTrue;
* exchange of WS-RM protocol messages.
*/
public class DecoupledClientServerOnewayTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(DecoupledOnewayServer.class);
public static final String DECOUPLE_PORT = allocatePort(DecoupledClientServerOnewayTest.class);
private static final Logger LOG = LogUtils.getLogger(DecoupledClientServerOnewayTest.class);
- public static class Server extends AbstractBusTestServerBase {
+ public static class DecoupledOnewayServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -91,7 +91,7 @@ public class DecoupledClientServerOnewayTest extends AbstractBusClientServerTest
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server.class, true));
+ launchServer(DecoupledOnewayServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
index 61b3061077f..631a8f663e5 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
@@ -49,12 +49,12 @@ import static org.junit.Assert.assertTrue;
* exchange of WS-RM protocol messages.
*/
public class DecoupledClientServerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(DecoupledServer.class);
public static final String DECOUPLE_PORT = allocatePort(DecoupledClientServerTest.class);
private static final Logger LOG = LogUtils.getLogger(DecoupledClientServerTest.class);
- public static class Server extends AbstractBusTestServerBase {
+ public static class DecoupledServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -90,7 +90,7 @@ public class DecoupledClientServerTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server.class, true));
+ launchServer(DecoupledServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
index 97f299931d2..ba104e2ba26 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue;
* Tests the redelivery of the message upon a delivery error.
*/
public class RedeliveryTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(RedeliveryServer.class);
private static final Logger LOG = LogUtils.getLogger(RedeliveryTest.class);
private static GreeterRecorderImpl serverGreeter;
@@ -56,12 +56,12 @@ public class RedeliveryTest extends AbstractBusClientServerTestBase {
private Greeter greeter;
- public static class Server extends AbstractBusTestServerBase {
+ public static class RedeliveryServer extends AbstractBusTestServerBase {
String port;
String pfx;
Endpoint ep;
- public Server(String[] args) {
+ public RedeliveryServer(String[] args) {
port = args[0];
pfx = args[1];
}
@@ -97,7 +97,7 @@ public class RedeliveryTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server(args);
+ RedeliveryServer s = new RedeliveryServer(args);
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -112,7 +112,7 @@ public class RedeliveryTest extends AbstractBusClientServerTestBase {
public static void startServers() throws Exception {
RMTxStore.deleteDatabaseFiles("redlv-server", true);
assertTrue("server did not launch correctly",
- launchServer(Server.class, null, new String[]{PORT, "redlv"}, true));
+ launchServer(RedeliveryServer.class, null, new String[]{PORT, "redlv"}, true));
}
@AfterClass
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java
index 3f5ef1e7a2a..517eadb783f 100755
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java
@@ -53,13 +53,13 @@ import static org.junit.Assert.fail;
* with retransmission.
*/
public class RetransmissionGZIPTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(RetransmissionGZIPServer.class);
public static final String DECOUPLE_PORT = allocatePort(RetransmissionGZIPTest.class);
private static final Logger LOG = LogUtils.getLogger(RetransmissionQueueTest.class);
private Bus bus;
- public static class Server extends AbstractBusTestServerBase {
+ public static class RetransmissionGZIPServer extends AbstractBusTestServerBase {
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -83,7 +83,7 @@ public class RetransmissionGZIPTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ RetransmissionGZIPServer s = new RetransmissionGZIPServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -97,7 +97,7 @@ public class RetransmissionGZIPTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server.class, true));
+ launchServer(RetransmissionGZIPServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
index 2f0966f49b9..a8707f30466 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
@@ -49,13 +49,13 @@ import static org.junit.Assert.fail;
* the message is queued and retransmission is scheduled.
*/
public class RetransmissionQueueTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(RetransmissionQueueServer.class);
public static final String DECOUPLE_PORT = allocatePort(RetransmissionQueueTest.class);
private static final Logger LOG = LogUtils.getLogger(RetransmissionQueueTest.class);
private Bus bus;
- public static class Server extends AbstractBusTestServerBase {
+ public static class RetransmissionQueueServer extends AbstractBusTestServerBase {
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -79,7 +79,7 @@ public class RetransmissionQueueTest extends AbstractBusClientServerTestBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ RetransmissionQueueServer s = new RetransmissionQueueServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
@@ -93,7 +93,7 @@ public class RetransmissionQueueTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server.class, true));
+ launchServer(RetransmissionQueueServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/Server.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RmServer.java
similarity index 93%
rename from systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/Server.java
rename to systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RmServer.java
index e68375cca22..b93a100aff7 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/Server.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RmServer.java
@@ -26,8 +26,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class RmServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(RmServer.class);
private static final String ADDRESS = "http://localhost:" + PORT + "/SoapContext/ControlPort";
private static final String GREETER_ADDRESS
= "http://localhost:" + PORT + "/SoapContext/GreeterPort";
@@ -58,7 +58,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ RmServer s = new RmServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
index 8c8ff6ac83c..409541b182a 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue;
* exchange of WS-RM protocol messages.
*/
public class RobustServiceAtMostOnceTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(RobustServiceAtMostOnceServer.class);
public static final String GREETMEONEWAY_ACTION
= "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";
private static final Logger LOG = LogUtils.getLogger(RobustServiceAtMostOnceTest.class);
@@ -53,7 +53,7 @@ public class RobustServiceAtMostOnceTest extends AbstractBusClientServerTestBase
private Greeter greeter;
- public static class Server extends AbstractBusTestServerBase {
+ public static class RobustServiceAtMostOnceServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -86,7 +86,7 @@ public class RobustServiceAtMostOnceTest extends AbstractBusClientServerTestBase
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(RobustServiceAtMostOnceServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
index 7f9649f2f36..d348334015b 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue;
* exchange of WS-RM protocol messages.
*/
public class RobustServiceWithFaultTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(RobustServiceWithFaultServer.class);
public static final String GREETMEONEWAY_ACTION
= "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";
private static final Logger LOG = LogUtils.getLogger(RobustServiceWithFaultTest.class);
@@ -58,7 +58,7 @@ public class RobustServiceWithFaultTest extends AbstractBusClientServerTestBase
private Greeter greeter;
- public static class Server extends AbstractBusTestServerBase {
+ public static class RobustServiceWithFaultServer extends AbstractBusTestServerBase {
Endpoint ep;
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
@@ -90,7 +90,7 @@ public class RobustServiceWithFaultTest extends AbstractBusClientServerTestBase
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(RobustServiceWithFaultServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
index 6dcef6952f3..f39100aa145 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
@@ -106,7 +106,7 @@ import static org.junit.Assert.fail;
* exchange of WS-RM protocol messages.
*/
public class SequenceTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = RmServer.PORT;
private static final Logger LOG = LogUtils.getLogger(SequenceTest.class);
private static final QName GREETMEONEWAY_NAME
@@ -135,7 +135,7 @@ public class SequenceTest extends AbstractBusClientServerTestBase {
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(RmServer.class));
}
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/Server.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyServer.java
similarity index 86%
rename from systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/Server.java
rename to systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyServer.java
index 9655bf25df1..f338abaef4d 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/Server.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyServer.java
@@ -21,8 +21,8 @@ package org.apache.cxf.systest.ws.rm.policy;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class WSRMOptionalPolicyServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(WSRMOptionalPolicyServer.class);
private static final String ADDRESS = "http://localhost:" + PORT + "/GreetingServer";
protected void run() {
@@ -32,7 +32,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ WSRMOptionalPolicyServer s = new WSRMOptionalPolicyServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java
index 357754ede09..07ed139bbd0 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java
@@ -34,14 +34,14 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class WSRMOptionalPolicyTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = WSRMOptionalPolicyServer.PORT;
private static final URL WSDL = GreetingService.class.getResource("greeting.wsdl");
private static final QName SERVICE = new QName("http://ws.samples.apache.org/", "GreetingService");
private static final String ENDPOINT = "http://localhost:" + PORT + "/GreetingServer";
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(WSRMOptionalPolicyServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
index c69cd6aad18..245c9f29b5e 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java
@@ -50,10 +50,10 @@ import static org.junit.Assert.assertTrue;
* Tests the correct interaction of ws-rm calls with security.when policy validator verifies the calls.
*/
public class WSRMWithWSSecurityPolicyTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(WSRMWithWSSecurityPolicyServer.class);
private static final Logger LOG = LogUtils.getLogger(WSRMWithWSSecurityPolicyTest.class);
- public static class Server extends AbstractBusTestServerBase {
+ public static class WSRMWithWSSecurityPolicyServer extends AbstractBusTestServerBase {
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus("/org/apache/cxf/systest/ws/rm/sec/server-policy.xml");
@@ -64,7 +64,7 @@ public class WSRMWithWSSecurityPolicyTest extends AbstractBusClientServerTestBas
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ assertTrue("server did not launch correctly", launchServer(WSRMWithWSSecurityPolicyServer.class, true));
}
@Test
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
index 04dca130a55..cac50ea166f 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
@@ -41,7 +41,7 @@ under the License.
<!--jaxws:client id="GreeterAsymmetricClient" name="{http://cxf.apache.org/greeter_control}GreeterAsymmetricPort"-->
- <jaxws:client id="GreeterCombinedClient" address="http://localhost:${testutil.ports.Server}/RMGreeterAsymmetric" serviceClass="org.apache.cxf.greeter_control.Greeter">
+ <jaxws:client id="GreeterCombinedClient" address="http://localhost:${testutil.ports.WSRMWithWSSecurityPolicyServer}/RMGreeterAsymmetric" serviceClass="org.apache.cxf.greeter_control.Greeter">
<jaxws:properties>
<entry key="security.username" value="Alice"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/>
@@ -57,11 +57,11 @@ under the License.
</jaxws:features>
</jaxws:client>
- <jaxws:client id="GreeterPlainClient" address="http://localhost:${testutil.ports.Server}/RMGreeterNoSecurity" serviceClass="org.apache.cxf.greeter_control.Greeter">
+ <jaxws:client id="GreeterPlainClient" address="http://localhost:${testutil.ports.WSRMWithWSSecurityPolicyServer}/RMGreeterNoSecurity" serviceClass="org.apache.cxf.greeter_control.Greeter">
</jaxws:client>
<jaxws:client id="GreeterCombinedClientNoProperty"
- address="http://localhost:${testutil.ports.Server}/RMGreeterAsymmetric"
+ address="http://localhost:${testutil.ports.WSRMWithWSSecurityPolicyServer}/RMGreeterAsymmetric"
serviceClass="org.apache.cxf.greeter_control.Greeter">
<jaxws:features>
<p:policies>
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
index 58a5c58232e..34f6ca6da1d 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
@@ -39,7 +39,7 @@
</cxf:features>
</cxf:bus>
<!-- -->
- <jaxws:endpoint xmlns:s="http://cxf.apache.org/greeter_control" id="AsymmetricEndpoint" address="http://localhost:${testutil.ports.Server}/RMGreeterAsymmetric" serviceName="s:GreeterService" endpointName="s:GreeterPort" implementor="org.apache.cxf.systest.ws.rm.GreeterImpl">
+ <jaxws:endpoint xmlns:s="http://cxf.apache.org/greeter_control" id="AsymmetricEndpoint" address="http://localhost:${testutil.ports.WSRMWithWSSecurityPolicyServer}/RMGreeterAsymmetric" serviceName="s:GreeterService" endpointName="s:GreeterPort" implementor="org.apache.cxf.systest.ws.rm.GreeterImpl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -53,7 +53,7 @@
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://cxf.apache.org/greeter_control" id="NoSecurityEndpoint" address="http://localhost:${testutil.ports.Server}/RMGreeterNoSecurity" serviceName="s:GreeterService" endpointName="s:GreeterPort" implementor="org.apache.cxf.systest.ws.rm.GreeterImpl">
+ <jaxws:endpoint xmlns:s="http://cxf.apache.org/greeter_control" id="NoSecurityEndpoint" address="http://localhost:${testutil.ports.WSRMWithWSSecurityPolicyServer}/RMGreeterNoSecurity" serviceName="s:GreeterService" endpointName="s:GreeterPort" implementor="org.apache.cxf.systest.ws.rm.GreeterImpl">
<jaxws:features>
<p:policies>
</p:policies>
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/Server.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlServer.java
similarity index 87%
rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/Server.java
rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlServer.java
index 904f6cdcf93..5b786f96de5 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/Server.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class SamlServer extends AbstractBusTestServerBase {
- public Server() {
+ public SamlServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = SamlServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new SamlServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/StaxServer.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlStaxServer.java
similarity index 86%
rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/StaxServer.java
rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlStaxServer.java
index c24d0d46235..9dabc55d969 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/StaxServer.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class SamlStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public SamlStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = SamlStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new SamlStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
index deeb80ee855..d658080b65a 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
@@ -49,10 +49,10 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class SamlTokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
- static final String PORT2 = allocatePort(Server.class, 2);
- static final String STAX_PORT2 = allocatePort(StaxServer.class, 2);
+ static final String PORT = allocatePort(SamlServer.class);
+ static final String STAX_PORT = allocatePort(SamlStaxServer.class);
+ static final String PORT2 = allocatePort(SamlServer.class, 2);
+ static final String STAX_PORT2 = allocatePort(SamlStaxServer.class, 2);
static final String STS_PORT = allocatePort(STSServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
@@ -70,13 +70,13 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(SamlServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(SamlStaxServer.class, true)
);
assertTrue(
"Server failed to launch",
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/Server.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationServer.java
similarity index 84%
rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/Server.java
rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationServer.java
index 00a6634a18c..440077d2c3e 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/Server.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class SecureConversationServer extends AbstractBusTestServerBase {
- public Server() {
+ public SecureConversationServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = SecureConversationServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new SecureConversationServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxServer.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationStaxServer.java
similarity index 83%
rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxServer.java
rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationStaxServer.java
index cb3dd61aafb..fd38313fb7d 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxServer.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class SecureConversationStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public SecureConversationStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = SecureConversationStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new SecureConversationStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
index a2a5d7d1603..03e90288b80 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
@@ -46,8 +46,8 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class SecureConversationTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(SecureConversationServer.class);
+ static final String STAX_PORT = allocatePort(SecureConversationStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -64,13 +64,13 @@ public class SecureConversationTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(SecureConversationServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(SecureConversationStaxServer.class, true)
);
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/Server.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenServer.java
similarity index 85%
rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/Server.java
rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenServer.java
index 21b9855b2f5..2546cf1d1e4 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/Server.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class UsernameTokenServer extends AbstractBusTestServerBase {
- public Server() {
+ public UsernameTokenServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = UsernameTokenServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new UsernameTokenServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/StaxServer.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenStaxServer.java
similarity index 84%
rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/StaxServer.java
rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenStaxServer.java
index 7841793e2de..69095815ad5 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/StaxServer.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class UsernameTokenStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public UsernameTokenStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = UsernameTokenStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new UsernameTokenStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
index eb45d795394..ad8a6736b4b 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
@@ -46,10 +46,10 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class UsernameTokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String PORT2 = allocatePort(Server.class, 2);
- static final String STAX_PORT = allocatePort(StaxServer.class);
- static final String STAX_PORT2 = allocatePort(StaxServer.class, 2);
+ static final String PORT = allocatePort(UsernameTokenServer.class);
+ static final String PORT2 = allocatePort(UsernameTokenServer.class, 2);
+ static final String STAX_PORT = allocatePort(UsernameTokenStaxServer.class);
+ static final String STAX_PORT2 = allocatePort(UsernameTokenStaxServer.class, 2);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -66,13 +66,13 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(UsernameTokenServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(UsernameTokenStaxServer.class, true)
);
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/Server.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509Server.java
similarity index 87%
rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/Server.java
rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509Server.java
index 6403468febe..17489f5ed8f 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/Server.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509Server.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class X509Server extends AbstractBusTestServerBase {
- public Server() {
+ public X509Server() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = X509Server.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new X509Server();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxServer.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509StaxServer.java
similarity index 86%
rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxServer.java
rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509StaxServer.java
index 1f8f21fcf61..c83256ff167 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxServer.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509StaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class X509StaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public X509StaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = X509StaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new X509StaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
index 56585874a26..37c8d07faa3 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
@@ -46,8 +46,8 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class X509TokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(X509Server.class);
+ static final String STAX_PORT = allocatePort(X509StaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -64,13 +64,13 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(X509Server.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(X509StaxServer.class, true)
);
}
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
index 0f753c0a5a1..6cd60f5dfb7 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
@@ -41,22 +41,22 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Bearer" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlBearer" serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Bearer" address="http://localhost:${testutil.ports.saml.SamlServer}/DoubleItSamlBearer" serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.saml1.validator" value-ref="allowUnsignedBearerAssertions"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSenderVouches" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlTLSSenderVouches" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSenderVouches" address="https://localhost:${testutil.ports.saml.SamlServer.2}/DoubleItSamlTLSSenderVouches" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlTLSHOKSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.saml.SamlServer.2}/DoubleItSamlTLSHOKSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSigned" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlAsymmetricSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSigned" address="http://localhost:${testutil.ports.saml.SamlServer}/DoubleItSamlAsymmetricSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -64,7 +64,7 @@
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricInitiator" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlAsymmetricInitiator" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricInitiator" address="http://localhost:${testutil.ports.saml.SamlServer}/DoubleItSamlAsymmetricInitiator" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -72,7 +72,7 @@
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlAsymmetricSaml2Bearer" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.saml.SamlServer}/DoubleItSamlAsymmetricSaml2Bearer" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -81,17 +81,17 @@
<entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSenderVouchesSaml2" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlTLSSenderVouchesSaml2" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSenderVouchesSaml2" address="https://localhost:${testutil.ports.saml.SamlServer.2}/DoubleItSamlTLSSenderVouchesSaml2" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.saml.SamlServer.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSV" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlSymmetricSV" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSV" address="http://localhost:${testutil.ports.saml.SamlServer}/DoubleItSamlSymmetricSV" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<!-- TODO Fix the way these properties are inverted -->
@@ -102,7 +102,7 @@
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlSymmetricIssuedToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.saml.SamlServer}/DoubleItSamlSymmetricIssuedToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.username" value="bob"/>
@@ -111,11 +111,11 @@
</jaxws:properties>
</jaxws:endpoint>
<!-- -->
- <!-- Any services listening on port ${testutil.ports.saml.Server} must use the following -->
+ <!-- Any services listening on port ${testutil.ports.saml.SamlServer} must use the following -->
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.saml.Server.2}">
+ <httpj:engine port="${testutil.ports.saml.SamlServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/bob.jks"/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
index b70205c48f7..998caa3da06 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
@@ -41,25 +41,25 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Bearer" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlBearer" serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Bearer" address="http://localhost:${testutil.ports.saml.SamlStaxServer}/DoubleItSamlBearer" serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.enable.streaming" value="true"/>
<entry key="ws-security.saml1.validator" value-ref="allowUnsignedBearerAssertions"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSenderVouches" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlTLSSenderVouches" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSenderVouches" address="https://localhost:${testutil.ports.saml.SamlStaxServer.2}/DoubleItSamlTLSSenderVouches" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlTLSHOKSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.saml.SamlStaxServer.2}/DoubleItSamlTLSHOKSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSigned" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlAsymmetricSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSigned" address="http://localhost:${testutil.ports.saml.SamlStaxServer}/DoubleItSamlAsymmetricSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -68,7 +68,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricInitiator" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlAsymmetricInitiator" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricInitiator" address="http://localhost:${testutil.ports.saml.SamlStaxServer}/DoubleItSamlAsymmetricInitiator" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -77,7 +77,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlAsymmetricSaml2Bearer" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.saml.SamlStaxServer}/DoubleItSamlAsymmetricSaml2Bearer" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -87,19 +87,19 @@
<entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSenderVouchesSaml2" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlTLSSenderVouchesSaml2" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSenderVouchesSaml2" address="https://localhost:${testutil.ports.saml.SamlStaxServer.2}/DoubleItSamlTLSSenderVouchesSaml2" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.saml.SamlStaxServer.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSV" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlSymmetricSV" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSV" address="http://localhost:${testutil.ports.saml.SamlStaxServer}/DoubleItSamlSymmetricSV" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<!-- TODO Fix the way these properties are inverted -->
@@ -111,7 +111,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlSymmetricIssuedToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.saml.SamlStaxServer}/DoubleItSamlSymmetricIssuedToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.username" value="bob"/>
@@ -125,7 +125,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.saml.StaxServer.2}">
+ <httpj:engine port="${testutil.ports.saml.SamlStaxServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/bob.jks"/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
index 602d79f48ea..33c355eb469 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SecureConversation" address="http://localhost:${testutil.ports.secconv.Server}/DoubleItSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SecureConversation" address="http://localhost:${testutil.ports.secconv.SecureConversationServer}/DoubleItSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl">
<jaxws:properties>
<entry key="security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties.sct" value="bob.properties"/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
index 16de664dc30..4ff8812597f 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SecureConversation" address="http://localhost:${testutil.ports.secconv.StaxServer}/DoubleItSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SecureConversation" address="http://localhost:${testutil.ports.secconv.SecureConversationStaxServer}/DoubleItSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl">
<jaxws:properties>
<entry key="security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties.sct" value="bob.properties"/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
index 5cd91ac40ea..de377723257 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
@@ -33,28 +33,28 @@
<bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Plaintext" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintext" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Plaintext" address="http://localhost:${testutil.ports.ut.UsernameTokenServer}/DoubleItUTPlaintext" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="PlaintextNoPassword" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintextNoPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextNoPasswordPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="PlaintextNoPassword" address="http://localhost:${testutil.ports.ut.UsernameTokenServer}/DoubleItUTPlaintextNoPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextNoPasswordPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.enable.ut-no-password.principal" value="true"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Digest" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTDigest" serviceName="s:DoubleItService" endpointName="s:DoubleItDigestPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Digest" address="http://localhost:${testutil.ports.ut.UsernameTokenServer}/DoubleItUTDigest" serviceName="s:DoubleItService" endpointName="s:DoubleItDigestPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSupporting" address="https://localhost:${testutil.ports.ut.Server.2}/DoubleItUTTLSSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSupporting" address="https://localhost:${testutil.ports.ut.UsernameTokenServer.2}/DoubleItUTTLSSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTAsymmetricSESupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.ut.UsernameTokenServer}/DoubleItUTAsymmetricSESupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -62,13 +62,13 @@
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTAsymmetricEncrSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.ut.UsernameTokenServer}/DoubleItUTAsymmetricEncrSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSESupporting" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTSymmetricSESupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSESupporting" address="http://localhost:${testutil.ports.ut.UsernameTokenServer}/DoubleItUTSymmetricSESupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -80,7 +80,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.ut.Server.2}">
+ <httpj:engine port="${testutil.ports.ut.UsernameTokenServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
index 767263ff52a..c63e1c24600 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
@@ -33,32 +33,32 @@
<bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Plaintext" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintext" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Plaintext" address="http://localhost:${testutil.ports.ut.UsernameTokenStaxServer}/DoubleItUTPlaintext" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="PlaintextNoPassword" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintextNoPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextNoPasswordPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="PlaintextNoPassword" address="http://localhost:${testutil.ports.ut.UsernameTokenStaxServer}/DoubleItUTPlaintextNoPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextNoPasswordPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.enable.ut-no-password.principal" value="true"/>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Digest" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTDigest" serviceName="s:DoubleItService" endpointName="s:DoubleItDigestPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Digest" address="http://localhost:${testutil.ports.ut.UsernameTokenStaxServer}/DoubleItUTDigest" serviceName="s:DoubleItService" endpointName="s:DoubleItDigestPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSupporting" address="https://localhost:${testutil.ports.ut.StaxServer.2}/DoubleItUTTLSSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TLSSupporting" address="https://localhost:${testutil.ports.ut.UsernameTokenStaxServer.2}/DoubleItUTTLSSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTAsymmetricSESupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.ut.UsernameTokenStaxServer}/DoubleItUTAsymmetricSESupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -67,14 +67,14 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTAsymmetricEncrSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.ut.UsernameTokenStaxServer}/DoubleItUTAsymmetricEncrSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSESupporting" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTSymmetricSESupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSESupporting" address="http://localhost:${testutil.ports.ut.UsernameTokenStaxServer}/DoubleItUTSymmetricSESupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -87,7 +87,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.ut.StaxServer.2}">
+ <httpj:engine port="${testutil.ports.ut.UsernameTokenStaxServer.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
index 261e754c515..6f0b9cb0326 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.X509Server}/DoubleItX509AsymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -46,7 +46,7 @@
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricProtectTokens" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.X509Server}/DoubleItX509AsymmetricProtectTokens" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -54,7 +54,7 @@
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.X509Server}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.username" value="bob"/>
@@ -62,7 +62,7 @@
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsing" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsing" address="http://localhost:${testutil.ports.x509.X509Server}/DoubleItX509SymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<!-- TODO Fix the way these properties are inverted -->
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
index 03f317eb288..8809992dd75 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.X509StaxServer}/DoubleItX509AsymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -47,7 +47,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricProtectTokens" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.X509StaxServer}/DoubleItX509AsymmetricProtectTokens" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -56,7 +56,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.X509StaxServer}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.username" value="bob"/>
@@ -65,7 +65,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsing" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsing" address="http://localhost:${testutil.ports.x509.X509StaxServer}/DoubleItX509SymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<!-- TODO Fix the way these properties are inverted -->
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionServer.java
index 9a0561af2a9..8b63cfca9be 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class ActionServer extends AbstractBusTestServerBase {
- public Server() {
+ public ActionServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = ActionServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index 655bda7da5c..5931869f640 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -73,8 +73,8 @@ import static org.junit.Assert.fail;
* A set of tests for WS-Security actions (i.e. the non WS-SecurityPolicy approach).
*/
public class ActionTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
- public static final String PORT2 = allocatePort(Server.class, 2);
+ public static final String PORT = allocatePort(ActionServer.class);
+ public static final String PORT2 = allocatePort(ActionServer.class, 2);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -88,13 +88,13 @@ public class ActionTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(ActionServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(UTServer.class, true)
+ launchServer(UTActionServer.class, true)
);
}
@@ -161,7 +161,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
// Here the Server is adding the WSS4JInInterceptor in code
portQName = new QName(NAMESPACE, "DoubleItUsernameTokenPort3");
port = service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(port, UTServer.PORT);
+ updateAddressPort(port, UTActionServer.PORT);
assertEquals(50, port.doubleIt(25));
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTActionServer.java
similarity index 93%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTActionServer.java
index f6ed0631819..bc737736d53 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTActionServer.java
@@ -31,9 +31,9 @@ import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
/**
* Test adding the WSS4JInInterceptor in code.
*/
-public class UTServer extends AbstractBusTestServerBase {
+public class UTActionServer extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(UTServer.class);
+ public static final String PORT = allocatePort(UTActionServer.class);
protected void run() {
DoubleItPortTypeImpl implementor = new DoubleItPortTypeImpl();
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteServer.java
similarity index 85%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteServer.java
index b4b36fadb3d..5b1a0b064cd 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class AlgorithmSuiteServer extends AbstractBusTestServerBase {
- public Server() {
+ public AlgorithmSuiteServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = AlgorithmSuiteServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new AlgorithmSuiteServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteStaxServer.java
similarity index 84%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteStaxServer.java
index 546093a8e6f..d3f63c3a94a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class AlgorithmSuiteStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public AlgorithmSuiteStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = AlgorithmSuiteStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new AlgorithmSuiteStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
index bbfe26311a8..2fbaf29b53c 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.fail;
* clients against the DOM server.
*/
public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(AlgorithmSuiteServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -55,7 +55,7 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(AlgorithmSuiteServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
index aa5e06090fb..11007d66e0e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.fail;
* clients against the StAX server.
*/
public class StaxAlgorithmSuiteTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(AlgorithmSuiteStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -55,7 +55,7 @@ public class StaxAlgorithmSuiteTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(AlgorithmSuiteStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthJAASTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthJAASTest.java
index bbce3a2bb2b..28adf7d7ba1 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthJAASTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthJAASTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
* expected next interceptor
*/
public class BasicAuthJAASTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(BasicAuthServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthServer.java
similarity index 86%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthServer.java
index eb0053fb85d..0957b7f3a43 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class BasicAuthServer extends AbstractBusTestServerBase {
- public Server() {
+ public BasicAuthServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = BasicAuthServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new BasicAuthServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
index 12e53abec8e..41f4957dca9 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail;
* the WS-SecurityPolicy enforcement of whether the credentials are present or not.
*/
public class BasicAuthTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(BasicAuthServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -57,7 +57,7 @@ public class BasicAuthTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(BasicAuthServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
index 595c3b7d206..101f528d0a2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
@@ -47,8 +47,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(BindingServer.class);
+ static final String STAX_PORT = allocatePort(BindingStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -65,13 +65,13 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(BindingServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(BindingStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingServer.java
index 4aaa7b1e190..fb212697970 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class BindingServer extends AbstractBusTestServerBase {
- public Server() {
+ public BindingServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = BindingServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new BindingServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingStaxServer.java
similarity index 85%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingStaxServer.java
index 78238b70d1a..bc6e8ad04f6 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class BindingStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public BindingStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = BindingStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new BindingStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingServer.java
index 07ce94c8e2c..fe38223bcd3 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class CachingServer extends AbstractBusTestServerBase {
- public Server() {
+ public CachingServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = CachingServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
index fbe3cbc640c..6ac648682be 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class CachingTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(CachingServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -79,7 +79,7 @@ public class CachingTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(CachingServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
index 3ba3cf51428..22a5b86595f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
@@ -53,8 +53,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
- public static final String STAX_PORT = allocatePort(StaxServer.class);
+ public static final String PORT = allocatePort(CryptoCoverageServer.class);
+ public static final String STAX_PORT = allocatePort(CryptoCoverageStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -77,13 +77,13 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(CryptoCoverageServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(CryptoCoverageStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageServer.java
index 9a31dcc3d11..d95082d90db 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class CryptoCoverageServer extends AbstractBusTestServerBase {
- public Server() {
+ public CryptoCoverageServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = CryptoCoverageServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageStaxServer.java
similarity index 86%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageStaxServer.java
index 286d682ccb6..bd6299bb88a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageStaxServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class CryptoCoverageStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public CryptoCoverageStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = CryptoCoverageStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultServer.java
index 07010fe1e99..6ba9dcd3a5f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class FaultServer extends AbstractBusTestServerBase {
- public Server() {
+ public FaultServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = FaultServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new FaultServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index 66316a5f5e9..9177c950738 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.fail;
* A set of tests for (signing and encrypting) SOAP Faults.
*/
public class FaultTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(FaultServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -65,7 +65,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(FaultServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
index 84c676031ac..f9fb789cfb9 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
@@ -47,8 +47,8 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class GCMTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(GcmServer.class);
+ static final String STAX_PORT = allocatePort(GcmStaxServer.class);
static final String MGF_PORT = allocatePort(MGFServer.class);
static final String MGF_STAX_PORT = allocatePort(MGFStaxServer.class);
@@ -70,13 +70,13 @@ public class GCMTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(GcmServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(GcmStaxServer.class, true)
);
assertTrue(
"Server failed to launch",
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmServer.java
index f8f9c46528d..d418848ca1f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class GcmServer extends AbstractBusTestServerBase {
- public Server() {
+ public GcmServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = GcmServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new GcmServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmStaxServer.java
similarity index 86%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmStaxServer.java
index 666fce1dc60..093e492ab39 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class GcmStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public GcmStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = GcmStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new GcmStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetServer.java
index 4c83c3abb20..2919944e232 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class HTTPGetServer extends AbstractBusTestServerBase {
- public Server() {
+ public HTTPGetServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = HTTPGetServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
index 456a6bf6c62..98a8f4c5a16 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail;
* A set of tests for CXF-4629.
*/
public class HTTPGetTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(HTTPGetServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -58,7 +58,7 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(HTTPGetServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsServer.java
index ca2b5b8b0c4..09bdce15000 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class HttpsServer extends AbstractBusTestServerBase {
- public Server() {
+ public HttpsServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = HttpsServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new HttpsServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsStaxServer.java
similarity index 86%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsStaxServer.java
index eed164fbd62..e5ef6a8585e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class HttpsStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public HttpsStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = HttpsStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new HttpsStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
index b1d6ac8cdfe..e69329752d2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
@@ -47,8 +47,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class HttpsTokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(HttpsServer.class);
+ static final String STAX_PORT = allocatePort(HttpsStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -65,13 +65,13 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(HttpsServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(HttpsStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java
index d125c398cd0..d611e866464 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java
@@ -45,8 +45,8 @@ import static org.junit.Assert.assertTrue;
* A set of secured MTOM
*/
public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
- public static final String STAX_PORT = allocatePort(StaxServer.class);
+ public static final String PORT = allocatePort(MTOMServer.class);
+ public static final String STAX_PORT = allocatePort(MTOMStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -57,13 +57,13 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(MTOMServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(MTOMStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMServer.java
index b041bb57c3e..1e70fb2d08c 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class MTOMServer extends AbstractBusTestServerBase {
- public Server() {
+ public MTOMServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = MTOMServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMStaxServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMStaxServer.java
index 83c6dfb6e5e..921f295cd86 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMStaxServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class MTOMStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public MTOMStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = MTOMStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsServer.java
index 9fd6be15691..d98704c8a9d 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class PartsServer extends AbstractBusTestServerBase {
- public Server() {
+ public PartsServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = PartsServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new PartsServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsStaxServer.java
similarity index 86%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsStaxServer.java
index 773da0acc5f..07f8c05594d 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class PartsStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public PartsStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = PartsStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new PartsStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
index b8ad1ddc3b4..c13a8b4c264 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
@@ -51,8 +51,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class PartsTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(PartsServer.class);
+ static final String STAX_PORT = allocatePort(PartsStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -69,13 +69,13 @@ public class PartsTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(PartsServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(PartsStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordPropertiesTest.java
index c4e5c8f4a28..846419a95ad 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordPropertiesTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordPropertiesTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class PasswordPropertiesTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(PasswordServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -66,7 +66,7 @@ public class PasswordPropertiesTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(PasswordServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordServer.java
index a403de16866..d21ccc6d010 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class PasswordServer extends AbstractBusTestServerBase {
- public Server() {
+ public PasswordServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = PasswordServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeServer.java
similarity index 84%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeServer.java
index 2c94e47b342..41254a96cc4 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class PolicyAlternativeServer extends AbstractBusTestServerBase {
- public Server() {
+ public PolicyAlternativeServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = PolicyAlternativeServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new PolicyAlternativeServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
index 4cecca20676..7bf4da6e9cf 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
@@ -48,8 +48,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String PORT2 = allocatePort(Server.class, 2);
+ static final String PORT = allocatePort(PolicyAlternativeServer.class);
+ static final String PORT2 = allocatePort(PolicyAlternativeServer.class, 2);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -66,7 +66,7 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(PolicyAlternativeServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java
index e7d3c71123c..f41f4237b9e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java
@@ -37,13 +37,13 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class PolicyHandlerFaultResponseTest extends AbstractBusClientServerTestBase {
- public static final String PORT = Server.PORT;
+ public static final String PORT = PolicyHandlerServer.PORT;
private final QName serviceName = new QName("http://handler.policy.ws.systest.cxf.apache.org/",
"HelloPolicyService");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(PolicyHandlerServer.class));
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerServer.java
index 5f8457c9419..4c3e4d3fb32 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerServer.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.ws.policy.handler;
import jakarta.xml.ws.Endpoint;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class PolicyHandlerServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(PolicyHandlerServer.class);
protected void run() {
Object implementor = new HelloServiceImpl();
String address = "http://localhost:" + PORT + "/policytest";
@@ -32,7 +32,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ PolicyHandlerServer s = new PolicyHandlerServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationServer.java
similarity index 85%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationServer.java
index ff61ef6ef78..e40cec31212 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class PolicyOperationServer extends AbstractBusTestServerBase {
- public Server() {
+ public PolicyOperationServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = PolicyOperationServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new PolicyOperationServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationTest.java
index c7c112a3fcc..4d68b2fafb5 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
* no-security case passes through without any policy errors.
*/
public class PolicyOperationTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(PolicyOperationServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -52,7 +52,7 @@ public class PolicyOperationTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(PolicyOperationServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenServer.java
index 09459d4eb7b..9ef51060977 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class SamlTokenServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public SamlTokenServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = SamlTokenServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new SamlTokenServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenStaxServer.java
similarity index 85%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenStaxServer.java
index 888e32773c6..6ec05c205ef 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class SamlTokenStaxServer extends AbstractBusTestServerBase {
- public Server() {
+ public SamlTokenStaxServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = SamlTokenStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new SamlTokenStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
index 7a96347c968..f4892e8ec3c 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
@@ -64,10 +64,10 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class SamlTokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
- static final String PORT2 = allocatePort(Server.class, 2);
- static final String STAX_PORT2 = allocatePort(StaxServer.class, 2);
+ static final String PORT = allocatePort(SamlTokenServer.class);
+ static final String STAX_PORT = allocatePort(SamlTokenStaxServer.class);
+ static final String PORT2 = allocatePort(SamlTokenServer.class, 2);
+ static final String STAX_PORT2 = allocatePort(SamlTokenStaxServer.class, 2);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -84,13 +84,13 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(SamlTokenServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(SamlTokenStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfServer.java
similarity index 85%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfServer.java
index c8d432c5372..1e568d1ceae 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class SamlSubjectConfServer extends AbstractBusTestServerBase {
- public Server() {
+ public SamlSubjectConfServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = SamlSubjectConfServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new SamlSubjectConfServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfStaxServer.java
similarity index 84%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfStaxServer.java
index 4a2ea83ed0f..b3254914f0c 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class SamlSubjectConfStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public SamlSubjectConfStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = SamlSubjectConfStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new SamlSubjectConfStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
index 2db79254602..abb2978f083 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
@@ -50,8 +50,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(SamlSubjectConfServer.class);
+ static final String STAX_PORT = allocatePort(SamlSubjectConfStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -68,13 +68,13 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(SamlSubjectConfServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(SamlSubjectConfStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
index 016b798b8d7..016787f605a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
@@ -73,8 +73,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class WSSecurityClientTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
- public static final String STAX_PORT = allocatePort(StaxServer.class);
+ public static final String PORT = allocatePort(WSSecurityServer.class);
+ public static final String STAX_PORT = allocatePort(WSSecurityStaxServer.class);
public static final String DEC_PORT = allocatePort(WSSecurityClientTest.class);
private static final java.net.URL WSDL_LOC;
@@ -120,13 +120,13 @@ public class WSSecurityClientTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(WSSecurityServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(WSSecurityStaxServer.class, true)
);
createStaticBus();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityServer.java
index dae642e3ba6..2067691026f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityServer.java
@@ -24,8 +24,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class WSSecurityServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(WSSecurityServer.class);
protected void run() {
SpringBusFactory factory = new SpringBusFactory();
@@ -38,7 +38,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ WSSecurityServer s = new WSSecurityServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityStaxServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityStaxServer.java
index 7365e77e8ec..379a35efd6c 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityStaxServer.java
@@ -24,8 +24,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(StaxServer.class);
+public class WSSecurityStaxServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(WSSecurityStaxServer.class);
protected void run() {
SpringBusFactory factory = new SpringBusFactory();
@@ -38,7 +38,7 @@ public class StaxServer extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- StaxServer s = new StaxServer();
+ WSSecurityStaxServer s = new WSSecurityStaxServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecServer.java
similarity index 89%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecServer.java
index 17f234eddbe..3589a4c88b0 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecServer.java
@@ -23,8 +23,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(Server.class);
+public class WSSecServer extends AbstractBusTestServerBase {
+ public static final String PORT = allocatePort(WSSecServer.class);
protected void run() {
SpringBusFactory factory = new SpringBusFactory();
@@ -35,7 +35,7 @@ public class Server extends AbstractBusTestServerBase {
public static void main(String[] args) {
try {
- Server s = new Server();
+ WSSecServer s = new WSSecServer();
s.start();
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
index 064617ef69e..1c80f181a2d 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
@@ -35,11 +35,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class WSSecTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(WSSecServer.class);
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("Server failed to launch", launchServer(Server.class));
+ assertTrue("Server failed to launch", launchServer(WSSecServer.class));
}
@org.junit.AfterClass
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/PolicyServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/PolicyServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionServer.java
index d17f578fc13..f6707a8dc28 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/PolicyServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class PolicyServer extends AbstractBusTestServerBase {
+public class SWAActionServer extends AbstractBusTestServerBase {
- public PolicyServer() {
+ public SWAActionServer() {
}
protected void run() {
- URL busFile = PolicyServer.class.getResource("policy-server.xml");
+ URL busFile = SWAActionServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
index 3acef473fa1..eba2b8ff359 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
* A set of tests for the SwA specification (SOAP with Attachments)
*/
public class SWAActionTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
+ public static final String PORT = allocatePort(SWAActionServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -52,7 +52,7 @@ public class SWAActionTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(SWAActionServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyServer.java
index e5da4bd6388..47b369ef3d2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class SWAPolicyServer extends AbstractBusTestServerBase {
- public Server() {
+ public SWAPolicyServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = SWAPolicyServer.class.getResource("policy-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
index b5d2d0abcad..33aa54e5bfb 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java
@@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class SWAPolicyTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(PolicyServer.class);
+ public static final String PORT = allocatePort(SWAPolicyServer.class);
public static final String STAX_PORT = allocatePort(StaxPolicyServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
@@ -67,7 +67,7 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(PolicyServer.class, true)
+ launchServer(SWAPolicyServer.class, true)
);
assertTrue(
"Server failed to launch",
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenServer.java
similarity index 85%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenServer.java
index 47930af1871..d320f8ffc69 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class SupportingTokenServer extends AbstractBusTestServerBase {
- public Server() {
+ public SupportingTokenServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = SupportingTokenServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new SupportingTokenServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenStaxServer.java
similarity index 84%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenStaxServer.java
index 3c96b2b94b0..d0b1e1f4b2a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class SupportingTokenStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public SupportingTokenStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = SupportingTokenStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new SupportingTokenStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
index 595014350da..88bc3c95bfa 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
@@ -48,9 +48,9 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class SupportingTokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
+ static final String PORT = allocatePort(SupportingTokenServer.class);
static final String TLS_PORT = allocatePort(TLSServer.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String STAX_PORT = allocatePort(SupportingTokenStaxServer.class);
static final String TLS_STAX_PORT = allocatePort(TLSStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
@@ -68,7 +68,7 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(SupportingTokenServer.class, true)
);
assertTrue(
"Server failed to launch",
@@ -80,7 +80,7 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(SupportingTokenStaxServer.class, true)
);
assertTrue(
"Server failed to launch",
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxPolicyServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyServer.java
similarity index 84%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxPolicyServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyServer.java
index 12726d93be2..bd672eabb4e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxPolicyServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxPolicyServer extends AbstractBusTestServerBase {
+public class UsernameTokenPolicyServer extends AbstractBusTestServerBase {
- public StaxPolicyServer() {
+ public UsernameTokenPolicyServer() {
}
protected void run() {
- URL busFile = StaxPolicyServer.class.getResource("stax-policy-server.xml");
+ URL busFile = UsernameTokenPolicyServer.class.getResource("policy-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxPolicyServer();
+ new UsernameTokenPolicyServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
index 0f16c5c435b..b7bddd99179 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
@@ -58,8 +58,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(PolicyServer.class);
- static final String STAX_PORT = allocatePort(StaxPolicyServer.class);
+ static final String PORT = allocatePort(UsernameTokenPolicyServer.class);
+ static final String STAX_PORT = allocatePort(UsernameTokenStaxPolicyServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -76,13 +76,13 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(PolicyServer.class, true)
+ launchServer(UsernameTokenPolicyServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxPolicyServer.class, true)
+ launchServer(UsernameTokenStaxPolicyServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/PolicyServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenServer.java
similarity index 86%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/PolicyServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenServer.java
index 749403b6a04..41de53b5a55 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/PolicyServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class PolicyServer extends AbstractBusTestServerBase {
+public class UsernameTokenServer extends AbstractBusTestServerBase {
- public PolicyServer() {
+ public UsernameTokenServer() {
}
protected void run() {
- URL busFile = PolicyServer.class.getResource("policy-server.xml");
+ URL busFile = UsernameTokenServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new PolicyServer();
+ new UsernameTokenServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxPolicyServer.java
similarity index 82%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxPolicyServer.java
index 83e7e2a26af..3b8b7340843 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxPolicyServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class UsernameTokenStaxPolicyServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public UsernameTokenStaxPolicyServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = UsernameTokenStaxPolicyServer.class.getResource("stax-policy-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new StaxServer();
+ new UsernameTokenStaxPolicyServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxServer.java
similarity index 84%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxServer.java
index 2b4ccc7b085..b9aff470a4e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxServer.java
@@ -26,20 +26,20 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class UsernameTokenStaxServer extends AbstractBusTestServerBase {
- public Server() {
+ public UsernameTokenStaxServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = UsernameTokenStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
try {
- new Server();
+ new UsernameTokenStaxServer();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
index fce54c88221..1d8844e57bf 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
@@ -65,8 +65,8 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class UsernameTokenTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
+ static final String PORT = allocatePort(UsernameTokenServer.class);
+ static final String STAX_PORT = allocatePort(UsernameTokenStaxServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -83,13 +83,13 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(UsernameTokenServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(UsernameTokenStaxServer.class, true)
);
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCServer.java
similarity index 97%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCServer.java
index 1dbdbabe5ef..015812de4d0 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCServer.java
@@ -30,15 +30,15 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.ws.security.SecurityConstants;
-public class Server extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(Server.class);
- static final String PORT2 = allocatePort(Server.class, 2);
+public class WSSCServer extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(WSSCServer.class);
+ static final String PORT2 = allocatePort(WSSCServer.class, 2);
- public Server() throws Exception {
+ public WSSCServer() throws Exception {
}
- protected Server(String baseUrl) throws Exception {
+ protected WSSCServer(String baseUrl) throws Exception {
doPublish(baseUrl.replace(PORT, PORT2).replace("http", "https")
+ "SecureConversation_UserNameOverTransport_IPingService",
@@ -91,7 +91,7 @@ public class Server extends AbstractBusTestServerBase {
"org/apache/cxf/systest/ws/wssc/server.xml");
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
- new Server("http://localhost:" + PORT + "/");
+ new WSSCServer("http://localhost:" + PORT + "/");
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCStaxServer.java
similarity index 97%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCStaxServer.java
index 2a2b689c774..c22250f9872 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCStaxServer.java
@@ -30,15 +30,15 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.ws.security.SecurityConstants;
-public class StaxServer extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(StaxServer.class);
- static final String PORT2 = allocatePort(StaxServer.class, 2);
+public class WSSCStaxServer extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(WSSCStaxServer.class);
+ static final String PORT2 = allocatePort(WSSCStaxServer.class, 2);
- public StaxServer() throws Exception {
+ public WSSCStaxServer() throws Exception {
}
- protected StaxServer(String baseUrl) throws Exception {
+ protected WSSCStaxServer(String baseUrl) throws Exception {
doPublish(baseUrl.replace(PORT, PORT2).replace("http", "https")
+ "SecureConversation_UserNameOverTransport_IPingService",
@@ -91,7 +91,7 @@ public class StaxServer extends AbstractBusTestServerBase {
"org/apache/cxf/systest/ws/wssc/server.xml");
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
- new StaxServer("http://localhost:" + PORT + "/");
+ new WSSCStaxServer("http://localhost:" + PORT + "/");
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
index 9548069e08a..8003f424b1a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
@@ -54,10 +54,10 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class WSSCTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String PORT2 = allocatePort(Server.class, 2);
- static final String STAX_PORT = allocatePort(StaxServer.class);
- static final String STAX_PORT2 = allocatePort(StaxServer.class, 2);
+ static final String PORT = allocatePort(WSSCServer.class);
+ static final String PORT2 = allocatePort(WSSCServer.class, 2);
+ static final String STAX_PORT = allocatePort(WSSCStaxServer.class);
+ static final String STAX_PORT2 = allocatePort(WSSCStaxServer.class, 2);
private static final String OUT = "CXF : ping";
private static wssec.wssc.PingService svc;
@@ -101,13 +101,13 @@ public class WSSCTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(WSSCServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(WSSCStaxServer.class, true)
);
bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/client.xml");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10CustomAlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10CustomAlgorithmSuiteTest.java
index 06d6a24caa5..73cf98fec22 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10CustomAlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10CustomAlgorithmSuiteTest.java
@@ -29,10 +29,10 @@ import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.systest.ws.wssec10.server.Server;
import org.apache.cxf.systest.ws.wssec10.server.ServerCustomAlgorithmSuite;
-import org.apache.cxf.systest.ws.wssec10.server.StaxServer;
import org.apache.cxf.systest.ws.wssec10.server.StaxServerCustomAlgorithmSuite;
+import org.apache.cxf.systest.ws.wssec10.server.WSSecurity10Server;
+import org.apache.cxf.systest.ws.wssec10.server.WSSecurity10StaxServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
@@ -55,10 +55,10 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class WSSecurity10CustomAlgorithmSuiteTest extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
- static final String SSL_PORT = allocatePort(Server.class, 1);
- static final String STAX_SSL_PORT = allocatePort(StaxServer.class, 1);
+ static final String PORT = allocatePort(WSSecurity10Server.class);
+ static final String STAX_PORT = allocatePort(WSSecurity10StaxServer.class);
+ static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1);
+ static final String STAX_SSL_PORT = allocatePort(WSSecurity10StaxServer.class, 1);
private static final String INPUT = "foo";
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
index 8a47f65da32..7384ecedbe2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
@@ -31,8 +31,8 @@ import jakarta.xml.ws.BindingProvider;
import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.systest.ws.wssec10.server.Server;
-import org.apache.cxf.systest.ws.wssec10.server.StaxServer;
+import org.apache.cxf.systest.ws.wssec10.server.WSSecurity10Server;
+import org.apache.cxf.systest.ws.wssec10.server.WSSecurity10StaxServer;
import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.transport.http.HTTPConduit;
@@ -53,10 +53,10 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class WSSecurity10Test extends AbstractBusClientServerTestBase {
- static final String PORT = allocatePort(Server.class);
- static final String STAX_PORT = allocatePort(StaxServer.class);
- static final String SSL_PORT = allocatePort(Server.class, 1);
- static final String STAX_SSL_PORT = allocatePort(StaxServer.class, 1);
+ static final String PORT = allocatePort(WSSecurity10Server.class);
+ static final String STAX_PORT = allocatePort(WSSecurity10StaxServer.class);
+ static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1);
+ static final String STAX_SSL_PORT = allocatePort(WSSecurity10StaxServer.class, 1);
private static final String INPUT = "foo";
private static boolean unrestrictedPoliciesInstalled;
@@ -116,13 +116,13 @@ public class WSSecurity10Test extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(WSSecurity10Server.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(WSSecurity10StaxServer.class, true)
);
if (unrestrictedPoliciesInstalled) {
createStaticBus("org/apache/cxf/systest/ws/wssec10/client.xml");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/ServerCustomAlgorithmSuite.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/ServerCustomAlgorithmSuite.java
index 7c2bb024b4d..d87ebc63745 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/ServerCustomAlgorithmSuite.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/ServerCustomAlgorithmSuite.java
@@ -24,8 +24,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class ServerCustomAlgorithmSuite extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(Server.class);
- static final String SSL_PORT = allocatePort(Server.class, 1);
+ static final String PORT = allocatePort(WSSecurity10Server.class);
+ static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1);
private static String configFileName = "org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml";
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServerCustomAlgorithmSuite.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServerCustomAlgorithmSuite.java
index f80929f2f10..f87361c3bfb 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServerCustomAlgorithmSuite.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServerCustomAlgorithmSuite.java
@@ -24,8 +24,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class StaxServerCustomAlgorithmSuite extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(Server.class);
- static final String SSL_PORT = allocatePort(Server.class, 1);
+ static final String PORT = allocatePort(WSSecurity10Server.class);
+ static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1);
private static String configFileName =
"org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml";
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10Server.java
similarity index 86%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10Server.java
index cbf153eb0fd..6540790d106 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10Server.java
@@ -24,9 +24,9 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(Server.class);
- static final String SSL_PORT = allocatePort(Server.class, 1);
+public class WSSecurity10Server extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(WSSecurity10Server.class);
+ static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1);
private static boolean unrestrictedPoliciesInstalled;
private static String configFileName;
@@ -40,7 +40,7 @@ public class Server extends AbstractBusTestServerBase {
}
};
- public Server() throws Exception {
+ public WSSecurity10Server() throws Exception {
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10StaxServer.java
similarity index 85%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10StaxServer.java
index d84afc92a30..0d997cee096 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10StaxServer.java
@@ -24,9 +24,9 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.test.TestUtilities;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
- static final String PORT = allocatePort(StaxServer.class);
- static final String SSL_PORT = allocatePort(StaxServer.class, 1);
+public class WSSecurity10StaxServer extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(WSSecurity10StaxServer.class);
+ static final String SSL_PORT = allocatePort(WSSecurity10StaxServer.class, 1);
private static boolean unrestrictedPoliciesInstalled;
private static String configFileName;
@@ -40,7 +40,7 @@ public class StaxServer extends AbstractBusTestServerBase {
}
};
- public StaxServer() throws Exception {
+ public WSSecurity10StaxServer() throws Exception {
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenServer.java
index 01a69931380..01196e730c3 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class X509TokenServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public X509TokenServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = X509TokenServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenStaxServer.java
similarity index 86%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenStaxServer.java
index 69b95b956e0..29d844b87b2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenStaxServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class X509TokenStaxServer extends AbstractBusTestServerBase {
- public Server() {
+ public X509TokenStaxServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = X509TokenStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index b34738db558..834e9a0beae 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -78,11 +78,11 @@ import static org.junit.Assert.fail;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class X509TokenTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
- public static final String STAX_PORT = allocatePort(StaxServer.class);
+ public static final String PORT = allocatePort(X509TokenServer.class);
+ public static final String STAX_PORT = allocatePort(X509TokenStaxServer.class);
public static final String INTERMEDIARY_PORT = allocatePort(Intermediary.class);
- static final String PORT2 = allocatePort(Server.class, 2);
- static final String STAX_PORT2 = allocatePort(StaxServer.class, 2);
+ static final String PORT2 = allocatePort(X509TokenServer.class, 2);
+ static final String STAX_PORT2 = allocatePort(X509TokenStaxServer.class, 2);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -102,13 +102,13 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(X509TokenServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(X509TokenStaxServer.class, true)
);
assertTrue(
"Intermediary failed to launch",
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/NonXKMSServer.java
similarity index 88%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/Server.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/NonXKMSServer.java
index df1e4707227..16f9ef409d7 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/NonXKMSServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class Server extends AbstractBusTestServerBase {
+public class NonXKMSServer extends AbstractBusTestServerBase {
- public Server() {
+ public NonXKMSServer() {
}
protected void run() {
- URL busFile = Server.class.getResource("server.xml");
+ URL busFile = NonXKMSServer.class.getResource("server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSStaxServer.java
similarity index 87%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/StaxServer.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSStaxServer.java
index cc0f0c9cc7b..bb2b21e0969 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/StaxServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSStaxServer.java
@@ -26,14 +26,14 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-public class StaxServer extends AbstractBusTestServerBase {
+public class XKMSStaxServer extends AbstractBusTestServerBase {
- public StaxServer() {
+ public XKMSStaxServer() {
}
protected void run() {
- URL busFile = StaxServer.class.getResource("stax-server.xml");
+ URL busFile = XKMSStaxServer.class.getResource("stax-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
index a1e17afa33b..ab65f66929a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
@@ -65,8 +65,8 @@ import static org.junit.Assert.assertTrue;
*/
@RunWith(value = org.junit.runners.Parameterized.class)
public class XKMSTest extends AbstractBusClientServerTestBase {
- public static final String PORT = allocatePort(Server.class);
- public static final String STAX_PORT = allocatePort(StaxServer.class);
+ public static final String PORT = allocatePort(NonXKMSServer.class);
+ public static final String STAX_PORT = allocatePort(XKMSStaxServer.class);
static final String PORT2 = allocatePort(XKMSServer.class);
private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
@@ -84,13 +84,13 @@ public class XKMSTest extends AbstractBusClientServerTestBase {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(Server.class, true)
+ launchServer(NonXKMSServer.class, true)
);
assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- launchServer(StaxServer.class, true)
+ launchServer(XKMSStaxServer.class, true)
);
assertTrue(
"Server failed to launch",
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
index ca91f95bea1..f2cbd719de5 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
@@ -39,7 +39,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TripleDESEncryption" address="http://localhost:${testutil.ports.action.Server}/DoubleIt3DESEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleIt3DESEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TripleDESEncryption" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleIt3DESEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleIt3DESEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -64,7 +64,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -76,7 +76,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken2" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken2" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItUsernameToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -88,7 +88,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameTokenNoVal" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameTokenNoVal" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenNoValPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameTokenNoVal" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItUsernameTokenNoVal" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenNoValPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -102,7 +102,7 @@
<entry key="ws-security.validate.token" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedPassword" address="http://localhost:${testutil.ports.action.Server}/DoubleItEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPasswordPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedPassword" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPasswordPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -127,7 +127,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedTimestamp" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignedTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedTimestamp" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItSignedTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -153,7 +153,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.action.Server}/DoubleItAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -162,7 +162,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.action.Server}/DoubleItAsymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItAsymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -171,7 +171,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Encryption" address="http://localhost:${testutil.ports.action.Server}/DoubleItEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Encryption" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -197,7 +197,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeClient" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeClient" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeClientPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeClient" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItSignatureNegativeClient" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeClientPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -223,7 +223,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeClient2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeClient2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeClientPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeClient2" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItSignatureNegativeClient2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeClientPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -249,7 +249,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeServer" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeServer" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeServerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeServer" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItSignatureNegativeServer" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeServerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -275,7 +275,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeServer2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeServer2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeServerPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeServer2" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItSignatureNegativeServer2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeServerPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor">
<constructor-arg>
@@ -300,7 +300,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSAML" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignedSAML" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSAMLPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSAML" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItSignedSAML" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSAMLPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -313,7 +313,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItSignatureConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -326,7 +326,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureConfig2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig2" address="http://localhost:${testutil.ports.action.ActionServer}/DoubleItSignatureConfig2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
index 426cd3f7160..b40493fcef0 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItSymmetric128" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -50,7 +50,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128no2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItSymmetric128no2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -62,7 +62,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128no3" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItSymmetric128no3" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -74,7 +74,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128Inclusive" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItSymmetric128Inclusive" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -87,7 +87,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128Inclusive2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItSymmetric128Inclusive2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -100,7 +100,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndpointCombined" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetricCombined" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricCombinedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndpointCombined" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItSymmetricCombined" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricCombinedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -112,7 +112,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEP" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItEncryptionOAEP" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -127,7 +127,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEP2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint2" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItEncryptionOAEP2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -142,7 +142,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint3" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEPno3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint3" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItEncryptionOAEPno3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -157,7 +157,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEndpoint" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -171,7 +171,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSignatureno2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEndpoint2" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItSignatureno2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -185,7 +185,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="DoubleItMultipleAlgSuites" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItMultipleAlgSuites" serviceName="s:DoubleItService" endpointName="s:DoubleItMultipleAlgSuitesPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="DoubleItMultipleAlgSuites" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteServer}/DoubleItMultipleAlgSuites" serviceName="s:DoubleItService" endpointName="s:DoubleItMultipleAlgSuitesPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
index 2fd73161957..ba7f8742985 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteStaxServer}/DoubleItSymmetric128" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -51,7 +51,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128no2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteStaxServer}/DoubleItSymmetric128no2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -64,7 +64,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128no3" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteStaxServer}/DoubleItSymmetric128no3" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -77,7 +77,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128Inclusive" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteStaxServer}/DoubleItSymmetric128Inclusive" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -91,7 +91,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128Inclusive2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.algsuite.AlgorithmSuiteStaxServer}/DoubleItSymmetric128Inclusive2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml
index 33653c1dcd0..591238f0cf2 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml
@@ -38,7 +38,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.basicauth.Server}">
+ <httpj:engine port="${testutil.ports.basicauth.BasicAuthServer}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
@@ -50,10 +50,10 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.basicauth.Server}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImplContinuation" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.basicauth.BasicAuthServer}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImplContinuation" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
<jaxws:properties />
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.basicauth.Server}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImplContinuation" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.basicauth.BasicAuthServer}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImplContinuation" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
<jaxws:properties />
</jaxws:endpoint>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
index 2e89a7a4fd8..e5a33944c0d 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
@@ -38,7 +38,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.basicauth.Server}">
+ <httpj:engine port="${testutil.ports.basicauth.BasicAuthServer}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
@@ -55,10 +55,10 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.basicauth.Server}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.basicauth.BasicAuthServer}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
<jaxws:properties />
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.basicauth.Server}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.basicauth.BasicAuthServer}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
<jaxws:properties />
</jaxws:endpoint>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
index d8a875e7e30..e3ed9d7ab7b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -51,7 +51,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItNotOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItNotOnlySignPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItNotOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItNotOnlySignPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -64,7 +64,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -77,7 +77,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItEncryptSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -90,7 +90,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItIncludeTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItIncludeTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -103,7 +103,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItIncludeTimestamp2" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItIncludeTimestamp2" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -116,7 +116,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -129,7 +129,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptBeforeSigning2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItEncryptBeforeSigning2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -142,7 +142,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignBeforeEncrypting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItSignBeforeEncrypting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -155,7 +155,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignBeforeEncrypting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItSignBeforeEncrypting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -168,7 +168,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItTimestampFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -181,7 +181,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampFirst2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItTimestampFirst2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -194,7 +194,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampLast" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItTimestampLast" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -207,7 +207,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampLast2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItTimestampLast2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -220,7 +220,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItStrict" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItStrict" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -233,7 +233,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItStrict2" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItStrict2" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -246,7 +246,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTokenProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItTokenProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -259,7 +259,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTokenProtection2" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItTokenProtection2" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -272,7 +272,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmation" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItSignatureConfirmation" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -285,7 +285,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmation2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItSignatureConfirmation2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -299,7 +299,7 @@
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmationEncBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.BindingServer}/DoubleItSignatureConfirmationEncBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
index c9230b965c6..bb14ea0dc7b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -52,7 +52,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItNotOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItNotOnlySignPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItNotOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItNotOnlySignPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -66,7 +66,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -80,7 +80,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItEncryptSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -94,7 +94,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItIncludeTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItIncludeTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -108,7 +108,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItIncludeTimestamp2" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItIncludeTimestamp2" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -122,7 +122,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -136,7 +136,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptBeforeSigning2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItEncryptBeforeSigning2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -150,7 +150,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignBeforeEncrypting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItSignBeforeEncrypting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -164,7 +164,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignBeforeEncrypting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItSignBeforeEncrypting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -178,7 +178,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItTimestampFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -192,7 +192,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampFirst2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItTimestampFirst2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -206,7 +206,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampLast" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItTimestampLast" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -220,7 +220,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampLast2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItTimestampLast2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -234,7 +234,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItStrict" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItStrict" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -248,7 +248,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItStrict2" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItStrict2" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -262,7 +262,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTokenProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItTokenProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -276,7 +276,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTokenProtection2" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItTokenProtection2" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -290,7 +290,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmation" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItSignatureConfirmation" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -304,7 +304,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmation2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItSignatureConfirmation2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -319,7 +319,7 @@
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmationEncBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.BindingStaxServer}/DoubleItSignatureConfirmationEncBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
index 599b354d511..582438d188d 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
@@ -39,14 +39,14 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CacheSymmetric" address="http://localhost:${testutil.ports.cache.Server}/DoubleItCacheSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CacheSymmetric" address="http://localhost:${testutil.ports.cache.CachingServer}/DoubleItCacheSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.crypto" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CachePerProxySymmetric" address="http://localhost:${testutil.ports.cache.Server}/DoubleItCachePerProxySymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CachePerProxySymmetric" address="http://localhost:${testutil.ports.cache.CachingServer}/DoubleItCachePerProxySymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.crypto" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
index 7ae0fd66757..71d9a07f8a6 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestamp" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItBodyTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestamp" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageServer}/DoubleItBodyTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -53,7 +53,7 @@
<bean class="org.apache.cxf.ws.security.wss4j.DefaultCryptoCoverageChecker"/>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestampSoap12" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItBodyTimestampSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampSoap12Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestampSoap12" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageServer}/DoubleItBodyTimestampSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampSoap12Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -70,7 +70,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedBody" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedBody" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageServer}/DoubleItSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -89,7 +89,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="WSA" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItWSA" serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="WSA" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageServer}/DoubleItWSA" serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -106,7 +106,7 @@
<wsa:addressing xmlns:wsa="http://cxf.apache.org/ws/addressing"/>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ClientChecker" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItClientChecker" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ClientChecker" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageServer}/DoubleItClientChecker" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -120,7 +120,7 @@
</bean>
</jaxws:outInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ClientChecker2" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItClientChecker2" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ClientChecker2" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageServer}/DoubleItClientChecker2" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -146,7 +146,7 @@
</bean>
</jaxws:outFaultInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedUsernameToken" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItEncryptedUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedUsernameToken" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageServer}/DoubleItEncryptedUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
index 716683c20b6..9be64308676 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestamp" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItBodyTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestamp" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageStaxServer}/DoubleItBodyTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
@@ -53,7 +53,7 @@
<bean class="org.apache.cxf.ws.security.wss4j.StaxCryptoCoverageChecker"/>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestampSoap12" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItBodyTimestampSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampSoap12Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestampSoap12" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageStaxServer}/DoubleItBodyTimestampSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampSoap12Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
@@ -70,7 +70,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedBody" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedBody" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageStaxServer}/DoubleItSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
@@ -89,7 +89,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="WSA" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItWSA" serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="WSA" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageStaxServer}/DoubleItWSA" serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
@@ -106,7 +106,7 @@
<wsa:addressing xmlns:wsa="http://cxf.apache.org/ws/addressing"/>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedUsernameToken" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItEncryptedUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedUsernameToken" address="http://localhost:${testutil.ports.coverage_checker.CryptoCoverageStaxServer}/DoubleItEncryptedUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
index 8f0ecd70656..66fca48e2a7 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
@@ -33,44 +33,44 @@
<bean class="org.apache.cxf.ext.logging.LoggingFeature"/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap11" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11Port" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11" address="http://localhost:${testutil.ports.fault.FaultServer}/DoubleItSoap11" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11Port" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap12" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12Port" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap12" address="http://localhost:${testutil.ports.fault.FaultServer}/DoubleItSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12Port" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap12Dispatch" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap12Dispatch" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12DispatchPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap12Dispatch" address="http://localhost:${testutil.ports.fault.FaultServer}/DoubleItSoap12Dispatch" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12DispatchPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap12Mtom" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap12Mtom" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12MtomPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap12Mtom" address="http://localhost:${testutil.ports.fault.FaultServer}/DoubleItSoap12Mtom" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12MtomPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="mtom-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11PolicyWithParts" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap11PolicyWithParts" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11PolicyWithPartsPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11PolicyWithParts" address="http://localhost:${testutil.ports.fault.FaultServer}/DoubleItSoap11PolicyWithParts" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11PolicyWithPartsPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="JavaFirst" address="http://localhost:${testutil.ports.fault.Server}/DoubleItJavaFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItJavaFirstPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImplJavaFirst" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="JavaFirst" address="http://localhost:${testutil.ports.fault.FaultServer}/DoubleItJavaFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItJavaFirstPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImplJavaFirst" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11Unsecured" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap11Unsecured" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11UnsecuredPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11Unsecured" address="http://localhost:${testutil.ports.fault.FaultServer}/DoubleItSoap11Unsecured" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11UnsecuredPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -95,7 +95,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11Unsecured2" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap11Unsecured2" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11UnsecuredPort2" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11Unsecured2" address="http://localhost:${testutil.ports.fault.FaultServer}/DoubleItSoap11Unsecured2" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11UnsecuredPort2" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
index 75de417a301..89778eeba9d 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM128" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM128" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM128" address="http://localhost:${testutil.ports.gcm.GcmServer}/DoubleItGCM128" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -46,7 +46,7 @@
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM192" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM192" address="http://localhost:${testutil.ports.gcm.GcmServer}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -55,7 +55,7 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256" address="http://localhost:${testutil.ports.gcm.GcmServer}/DoubleItGCM256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
index 90f25d46228..4e7dc734577 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
@@ -38,7 +38,7 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM128" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM128" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM128" address="http://localhost:${testutil.ports.gcm.GcmStaxServer}/DoubleItGCM128" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -47,7 +47,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM192" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM192" address="http://localhost:${testutil.ports.gcm.GcmStaxServer}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -57,7 +57,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256" address="http://localhost:${testutil.ports.gcm.GcmStaxServer}/DoubleItGCM256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
index 32184f1c06c..a88d9f66ecf 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
@@ -38,13 +38,13 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifier" address="http://localhost:${testutil.ports.httpget.Server}/DoubleItX509KeyIdentifier" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifier" address="http://localhost:${testutil.ports.httpget.HTTPGetServer}/DoubleItX509KeyIdentifier" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBody" address="http://localhost:${testutil.ports.httpget.Server}/DoubleItSignBody" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBody" address="http://localhost:${testutil.ports.httpget.HTTPGetServer}/DoubleItSignBody" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
index e0a6be33624..345b8041014 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
@@ -38,7 +38,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="${testutil.ports.https.Server}">
+ <httpj:engine port="${testutil.ports.https.HttpsServer}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
@@ -55,49 +55,49 @@
<property name="enforcePrincipal" value="false"/>
</bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert" address="https://localhost:${testutil.ports.https.Server}/DoubleItRequireClientCert" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert" address="https://localhost:${testutil.ports.https.HttpsServer}/DoubleItRequireClientCert" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert2" address="https://localhost:${testutil.ports.https.Server}/DoubleItRequireClientCert2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert2" address="https://localhost:${testutil.ports.https.HttpsServer}/DoubleItRequireClientCert2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement" address="https://localhost:${testutil.ports.https.Server}/DoubleItNoClientCertRequirement" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement" address="https://localhost:${testutil.ports.https.HttpsServer}/DoubleItNoClientCertRequirement" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/clean-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement2" address="https://localhost:${testutil.ports.https.Server}/DoubleItNoClientCertRequirement2" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
... 4142 lines suppressed ...