JBossWS SVN: r19639 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/metadata and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-15 17:46:07 -0400 (Wed, 15 Apr 2015)
New Revision: 19639
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3904] WSDLcontract retrieval enhancement and early availability check
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2015-04-15 21:45:09 UTC (rev 19638)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2015-04-15 21:46:07 UTC (rev 19639)
@@ -220,4 +220,7 @@
@Message(id = 24108, value = "Invalid request received:bindingOperation and dispatched method are missing for service implementation invocation")
IllegalArgumentException missingBindingOpeartionAndDispatchedMethod();
+
+ @Message(id = 24109, value = "Could not get WSDL contract for endpoint %s at %s")
+ WSFException couldNotFetchWSDLContract(String endpoint, String wsdlLocation);
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-04-15 21:45:09 UTC (rev 19638)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-04-15 21:46:07 UTC (rev 19639)
@@ -45,6 +45,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.HttpEndpoint;
+import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.spi.metadata.config.SOAPAddressRewriteMetadata;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
@@ -86,8 +87,9 @@
ddep.setInvoker(JBossWSInvoker.class.getName());
}
processWSDDContribution(ddep, (ArchiveDeployment)dep);
- processAddressRewrite(ddep, (ArchiveDeployment)dep, sarm, soapAddressWsdlParsers);
-
+ URL wsdlLocation = getWsdlLocationURL(ddep, ((ArchiveDeployment)dep).getResourceResolver());
+ processAddressRewrite(ddep, wsdlLocation, sarm, soapAddressWsdlParsers);
+
METADATA_LOGGER.addingServiceEndpointMetadata(METADATA_LOGGER.isDebugEnabled() ? ddep.toStringExtended() : ddep.toString());
dd.addEndpoint(ddep);
serviceNameAddressMap.put(ddep.getServiceName(), ddep.getAddress());
@@ -203,7 +205,6 @@
Class<?> seiClass = null;
String seiName;
- boolean missingServicePortAttr = false;
String name = (anWebService != null) ? anWebService.name() : "";
if (name.length() == 0)
@@ -211,7 +212,6 @@
String serviceName = (anWebService != null) ? anWebService.serviceName() : anWebServiceProvider.serviceName();
if (serviceName.length() == 0) {
- missingServicePortAttr = true;
serviceName = JavaUtils.getJustClassName(sepClass) + "Service";
}
@@ -221,7 +221,6 @@
String portName = (anWebService != null) ? anWebService.portName() : anWebServiceProvider.portName();
if (portName.length() == 0) {
- missingServicePortAttr = true;
portName = name + "Port";
}
@@ -273,36 +272,44 @@
}
}
result.setProperties(props);
- if (!missingServicePortAttr && annWsdlLocation.length() > 0) {
+ if (annWsdlLocation.length() > 0) {
result.setAnnotationWsdlLocation(annWsdlLocation);
}
return result;
}
- protected void processAddressRewrite(DDEndpoint ddep, ArchiveDeployment dep, SOAPAddressRewriteMetadata sarm, Map<String, SOAPAddressWSDLParser> soapAddressWsdlParsers)
- {
+ protected URL getWsdlLocationURL(DDEndpoint ddep, ResourceResolver resolver) {
String wsdlLocation = ddep.getWsdlLocation();
if (wsdlLocation == null) {
wsdlLocation = ddep.getAnnotationWsdlLocation();
}
if (wsdlLocation != null) {
- URL wsdlUrl = dep.getResourceResolver().resolveFailSafe(wsdlLocation);
- if (wsdlUrl != null) {
- SOAPAddressWSDLParser parser = getCurrentSOAPAddressWSDLParser(wsdlUrl, soapAddressWsdlParsers);
- //do not try rewriting addresses for not-http binding
- String wsdlAddress = parser.filterSoapAddress(ddep.getServiceName(), ddep.getPortName(), SOAPAddressWSDLParser.SOAP_HTTP_NS);
-
- String rewrittenWsdlAddress = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sarm);
- //If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF does not force host/port values for
- //wsdl imports and auto-rewrite them too; otherwise set the new address into "publishedEndpointUrl",
- //which causes CXF to override any address in the published wsdl.
- if (!SoapAddressRewriteHelper.isAutoRewriteOn(sarm)) {
- ddep.setPublishedEndpointUrl(rewrittenWsdlAddress);
- }
+ URL wsdlURL = resolver.resolveFailSafe(wsdlLocation);
+ if (wsdlURL != null) {
+ return wsdlURL;
} else {
- METADATA_LOGGER.abortSoapAddressRewrite(wsdlLocation, null);
+ throw MESSAGES.couldNotFetchWSDLContract(ddep.getImplementor(), wsdlLocation);
}
} else {
+ return null;
+ }
+ }
+
+ protected void processAddressRewrite(DDEndpoint ddep, URL wsdlUrl, SOAPAddressRewriteMetadata sarm, Map<String, SOAPAddressWSDLParser> soapAddressWsdlParsers)
+ {
+ if (wsdlUrl != null) {
+ SOAPAddressWSDLParser parser = getCurrentSOAPAddressWSDLParser(wsdlUrl, soapAddressWsdlParsers);
+ //do not try rewriting addresses for not-http binding
+ String wsdlAddress = parser.filterSoapAddress(ddep.getServiceName(), ddep.getPortName(), SOAPAddressWSDLParser.SOAP_HTTP_NS);
+
+ String rewrittenWsdlAddress = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sarm);
+ //If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF does not force host/port values for
+ //wsdl imports and auto-rewrite them too; otherwise set the new address into "publishedEndpointUrl",
+ //which causes CXF to override any address in the published wsdl.
+ if (!SoapAddressRewriteHelper.isAutoRewriteOn(sarm)) {
+ ddep.setPublishedEndpointUrl(rewrittenWsdlAddress);
+ }
+ } else {
//same comment as above regarding auto rewrite...
if (!SoapAddressRewriteHelper.isAutoRewriteOn(sarm)) {
//force computed address for code first endpoints
9 years
JBossWS SVN: r19638 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-15 17:45:09 -0400 (Wed, 15 Apr 2015)
New Revision: 19638
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/ResourceResolverImpl.java
Log:
[JBWS-3904] Fix fail-safe resolver method, the same that was done at https://source.jboss.org/changelog/JBossWS?cs=17756 for [JBWS-3655]
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/ResourceResolverImpl.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/ResourceResolverImpl.java 2015-04-15 21:17:06 UTC (rev 19637)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/ResourceResolverImpl.java 2015-04-15 21:45:09 UTC (rev 19638)
@@ -201,6 +201,10 @@
resourceURL = vfResource.toURL();
}
}
+ if (resourceURL == null && deployment.getClassLoader() != null)
+ {
+ resourceURL = deployment.getClassLoader().getResource(resourcePath);
+ }
}
return resourceURL;
}
9 years
JBossWS SVN: r19637 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/metadata and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-15 17:17:06 -0400 (Wed, 15 Apr 2015)
New Revision: 19637
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
Log:
[JBWS-3899] Reverting previous commit
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2015-04-15 15:05:30 UTC (rev 19636)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2015-04-15 21:17:06 UTC (rev 19637)
@@ -244,8 +244,4 @@
@LogMessage(level = WARN)
@Message(id = 24107, value = "JBossWS-CXF integration with Spring is deprecated and will be dropped in a future release. See https://issues.jboss.org/browse/JBWS-3884 for details.")
void deprecatedSpringIntegration();
-
- @LogMessage(level = WARN)
- @Message(id = 24109, value = "Service or port names not specified for endpoint %s; both have to be specified if the endpoint is really meant to be a contract-first one.")
- void contractFirstEndpointWithoutServiceOrPortName(String endpointImplementor);
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-04-15 15:05:30 UTC (rev 19636)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-04-15 21:17:06 UTC (rev 19637)
@@ -87,8 +87,7 @@
}
processWSDDContribution(ddep, (ArchiveDeployment)dep);
processAddressRewrite(ddep, (ArchiveDeployment)dep, sarm, soapAddressWsdlParsers);
- checkContractFirstEndpoint(ddep);
-
+
METADATA_LOGGER.addingServiceEndpointMetadata(METADATA_LOGGER.isDebugEnabled() ? ddep.toStringExtended() : ddep.toString());
dd.addEndpoint(ddep);
serviceNameAddressMap.put(ddep.getServiceName(), ddep.getAddress());
@@ -97,12 +96,6 @@
return dd;
}
- private void checkContractFirstEndpoint(DDEndpoint ddep) {
- if (ddep.isContractFirstRequired() && (ddep.isDefaultPortName() || ddep.isDefaultServiceName())) {
- METADATA_LOGGER.contractFirstEndpointWithoutServiceOrPortName(ddep.getImplementor());
- }
- }
-
protected boolean isMtomEnabled(Class<?> beanClass)
{
BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
@@ -135,13 +128,11 @@
if (portComp.getWsdlPort() != null) {
METADATA_LOGGER.overridePortName(id, endpoint.getPortName(), portComp.getWsdlPort());
endpoint.setPortName(portComp.getWsdlPort());
- endpoint.setDefaultPortName(false);
}
// ServiceQName overrides
if (portComp.getWsdlService() != null) {
METADATA_LOGGER.overrideServiceName(id, endpoint.getServiceName(), portComp.getWsdlService());
endpoint.setServiceName(portComp.getWsdlService());
- endpoint.setDefaultServiceName(false);
}
// HandlerChain contributions
@@ -174,7 +165,6 @@
if (wsdlFile != null) {
METADATA_LOGGER.overridingWsdlFileLocation(id, wsdlFile);
endpoint.setWsdlLocation(wsdlFile);
- endpoint.setContractFirstRequired(true);
}
}
}
@@ -213,8 +203,7 @@
Class<?> seiClass = null;
String seiName;
- boolean missingServiceAttr = false;
- boolean missingPortAttr = false;
+ boolean missingServicePortAttr = false;
String name = (anWebService != null) ? anWebService.name() : "";
if (name.length() == 0)
@@ -222,7 +211,7 @@
String serviceName = (anWebService != null) ? anWebService.serviceName() : anWebServiceProvider.serviceName();
if (serviceName.length() == 0) {
- missingServiceAttr = true;
+ missingServicePortAttr = true;
serviceName = JavaUtils.getJustClassName(sepClass) + "Service";
}
@@ -232,7 +221,7 @@
String portName = (anWebService != null) ? anWebService.portName() : anWebServiceProvider.portName();
if (portName.length() == 0) {
- missingPortAttr = true;
+ missingServicePortAttr = true;
portName = name + "Port";
}
@@ -284,13 +273,8 @@
}
}
result.setProperties(props);
- result.setDefaultPortName(missingPortAttr);
- result.setDefaultServiceName(missingServiceAttr);
- if (annWsdlLocation.length() > 0) {
- result.setContractFirstRequired(true);
- if (!missingServiceAttr && !missingPortAttr) {
- result.setAnnotationWsdlLocation(annWsdlLocation);
- }
+ if (!missingServicePortAttr && annWsdlLocation.length() > 0) {
+ result.setAnnotationWsdlLocation(annWsdlLocation);
}
return result;
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2015-04-15 15:05:30 UTC (rev 19636)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2015-04-15 21:17:06 UTC (rev 19637)
@@ -76,12 +76,6 @@
private String annotationWsdlLocation;
- private boolean defaultServiceName;
-
- private boolean defaultPortName;
-
- private boolean contractFirstRequired;
-
private int counter = 0;
public QName getPortName()
@@ -257,36 +251,6 @@
this.properties = properties;
}
- public boolean isDefaultServiceName()
- {
- return defaultServiceName;
- }
-
- public void setDefaultServiceName(boolean defaultServiceName)
- {
- this.defaultServiceName = defaultServiceName;
- }
-
- public boolean isDefaultPortName()
- {
- return defaultPortName;
- }
-
- public void setDefaultPortName(boolean defaultPortName)
- {
- this.defaultPortName = defaultPortName;
- }
-
- public boolean isContractFirstRequired()
- {
- return contractFirstRequired;
- }
-
- public void setContractFirstRequired(boolean contractFirstRequired)
- {
- this.contractFirstRequired = contractFirstRequired;
- }
-
public void writeTo(Writer writer) throws IOException
{
writer.write("<jaxws:endpoint id='" + this.id + "'");
9 years
JBossWS SVN: r19636 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/metadata and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-15 11:05:30 -0400 (Wed, 15 Apr 2015)
New Revision: 19636
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
Log:
[JBWS-3899] Add check on service and port name being specified when a contract-first endpoint is required
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2015-04-14 22:28:48 UTC (rev 19635)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Loggers.java 2015-04-15 15:05:30 UTC (rev 19636)
@@ -244,4 +244,8 @@
@LogMessage(level = WARN)
@Message(id = 24107, value = "JBossWS-CXF integration with Spring is deprecated and will be dropped in a future release. See https://issues.jboss.org/browse/JBWS-3884 for details.")
void deprecatedSpringIntegration();
+
+ @LogMessage(level = WARN)
+ @Message(id = 24109, value = "Service or port names not specified for endpoint %s; both have to be specified if the endpoint is really meant to be a contract-first one.")
+ void contractFirstEndpointWithoutServiceOrPortName(String endpointImplementor);
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-04-14 22:28:48 UTC (rev 19635)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-04-15 15:05:30 UTC (rev 19636)
@@ -87,7 +87,8 @@
}
processWSDDContribution(ddep, (ArchiveDeployment)dep);
processAddressRewrite(ddep, (ArchiveDeployment)dep, sarm, soapAddressWsdlParsers);
-
+ checkContractFirstEndpoint(ddep);
+
METADATA_LOGGER.addingServiceEndpointMetadata(METADATA_LOGGER.isDebugEnabled() ? ddep.toStringExtended() : ddep.toString());
dd.addEndpoint(ddep);
serviceNameAddressMap.put(ddep.getServiceName(), ddep.getAddress());
@@ -96,6 +97,12 @@
return dd;
}
+ private void checkContractFirstEndpoint(DDEndpoint ddep) {
+ if (ddep.isContractFirstRequired() && (ddep.isDefaultPortName() || ddep.isDefaultServiceName())) {
+ METADATA_LOGGER.contractFirstEndpointWithoutServiceOrPortName(ddep.getImplementor());
+ }
+ }
+
protected boolean isMtomEnabled(Class<?> beanClass)
{
BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
@@ -128,11 +135,13 @@
if (portComp.getWsdlPort() != null) {
METADATA_LOGGER.overridePortName(id, endpoint.getPortName(), portComp.getWsdlPort());
endpoint.setPortName(portComp.getWsdlPort());
+ endpoint.setDefaultPortName(false);
}
// ServiceQName overrides
if (portComp.getWsdlService() != null) {
METADATA_LOGGER.overrideServiceName(id, endpoint.getServiceName(), portComp.getWsdlService());
endpoint.setServiceName(portComp.getWsdlService());
+ endpoint.setDefaultServiceName(false);
}
// HandlerChain contributions
@@ -165,6 +174,7 @@
if (wsdlFile != null) {
METADATA_LOGGER.overridingWsdlFileLocation(id, wsdlFile);
endpoint.setWsdlLocation(wsdlFile);
+ endpoint.setContractFirstRequired(true);
}
}
}
@@ -203,7 +213,8 @@
Class<?> seiClass = null;
String seiName;
- boolean missingServicePortAttr = false;
+ boolean missingServiceAttr = false;
+ boolean missingPortAttr = false;
String name = (anWebService != null) ? anWebService.name() : "";
if (name.length() == 0)
@@ -211,7 +222,7 @@
String serviceName = (anWebService != null) ? anWebService.serviceName() : anWebServiceProvider.serviceName();
if (serviceName.length() == 0) {
- missingServicePortAttr = true;
+ missingServiceAttr = true;
serviceName = JavaUtils.getJustClassName(sepClass) + "Service";
}
@@ -221,7 +232,7 @@
String portName = (anWebService != null) ? anWebService.portName() : anWebServiceProvider.portName();
if (portName.length() == 0) {
- missingServicePortAttr = true;
+ missingPortAttr = true;
portName = name + "Port";
}
@@ -273,8 +284,13 @@
}
}
result.setProperties(props);
- if (!missingServicePortAttr && annWsdlLocation.length() > 0) {
- result.setAnnotationWsdlLocation(annWsdlLocation);
+ result.setDefaultPortName(missingPortAttr);
+ result.setDefaultServiceName(missingServiceAttr);
+ if (annWsdlLocation.length() > 0) {
+ result.setContractFirstRequired(true);
+ if (!missingServiceAttr && !missingPortAttr) {
+ result.setAnnotationWsdlLocation(annWsdlLocation);
+ }
}
return result;
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2015-04-14 22:28:48 UTC (rev 19635)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2015-04-15 15:05:30 UTC (rev 19636)
@@ -76,6 +76,12 @@
private String annotationWsdlLocation;
+ private boolean defaultServiceName;
+
+ private boolean defaultPortName;
+
+ private boolean contractFirstRequired;
+
private int counter = 0;
public QName getPortName()
@@ -251,6 +257,36 @@
this.properties = properties;
}
+ public boolean isDefaultServiceName()
+ {
+ return defaultServiceName;
+ }
+
+ public void setDefaultServiceName(boolean defaultServiceName)
+ {
+ this.defaultServiceName = defaultServiceName;
+ }
+
+ public boolean isDefaultPortName()
+ {
+ return defaultPortName;
+ }
+
+ public void setDefaultPortName(boolean defaultPortName)
+ {
+ this.defaultPortName = defaultPortName;
+ }
+
+ public boolean isContractFirstRequired()
+ {
+ return contractFirstRequired;
+ }
+
+ public void setContractFirstRequired(boolean contractFirstRequired)
+ {
+ this.contractFirstRequired = contractFirstRequired;
+ }
+
public void writeTo(Writer writer) throws IOException
{
writer.write("<jaxws:endpoint id='" + this.id + "'");
9 years
JBossWS SVN: r19635 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-14 18:28:48 -0400 (Tue, 14 Apr 2015)
New Revision: 19635
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
Log:
Fix comment
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2015-04-14 12:09:45 UTC (rev 19634)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2015-04-14 22:28:48 UTC (rev 19635)
@@ -70,7 +70,7 @@
public static JavaArchive createDeployment() {
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "management-recording-as7.jar");
archive.setManifest(new StringAsset("Manifest-Version: 1.0\n"
- + "Dependencies: org.jboss.logging,org.jboss.ws.common\n")) //TODO!! temp fix
+ + "Dependencies: org.jboss.logging,org.jboss.ws.common\n")) //see https://docs.jboss.org/author/display/JBWS/Predefined+client+and+endpoint...
.addClass(org.jboss.test.ws.management.recording.Endpoint.class)
.addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class);
return archive;
9 years
JBossWS SVN: r19634 - stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-14 08:09:45 -0400 (Tue, 14 Apr 2015)
New Revision: 19634
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
Log:
Fixing regression with security manager on, thanks Jan Bliznak for the patch
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2015-04-14 10:50:48 UTC (rev 19633)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2015-04-14 12:09:45 UTC (rev 19634)
@@ -449,6 +449,11 @@
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/sts/STSCallbackHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.class"/>
</classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/META-INF"
+ prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
<include name="wsdl/ws-trust*"/>
<include name="jboss-web.xml"/>
@@ -553,6 +558,11 @@
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/STSBearerCallbackHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.class"/>
</classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/META-INF"
+ prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
<include name="wsdl/bearer-ws-trust*"/>
<include name="jboss-web.xml"/>
@@ -596,6 +606,11 @@
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsholderofkey/STSHolderOfKeyCallbackHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.class"/>
</classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/META-INF"
+ prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
<include name="wsdl/holderofkey-ws-trust*"/>
<include name="jboss-web.xml"/>
9 years
JBossWS SVN: r19633 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-14 06:50:48 -0400 (Tue, 14 Apr 2015)
New Revision: 19633
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java
Log:
[JBWS-3889] Improve check on ipv6 address...
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2015-04-14 09:18:17 UTC (rev 19632)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2015-04-14 10:50:48 UTC (rev 19633)
@@ -66,7 +66,7 @@
endpoint1 = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, new EndpointBean());
hostName = System.getProperty("jboss.bind.address", "localhost");
- hostName = hostName.indexOf(":") != -1 ? "[" + hostName + "]" : hostName;
+ hostName = (!hostName.startsWith("[") && hostName.indexOf(":") != -1) ? "[" + hostName + "]" : hostName;
endpoint1.publish("http://" + hostName + ":8081/jaxws-endpoint");
endpoint2 = Endpoint.publish("http://" + hostName + ":8081/jaxws-endpoint2/endpoint/long/path", new EndpointBean());
}
9 years
JBossWS SVN: r19632 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/asyncclient.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-14 05:18:17 -0400 (Tue, 14 Apr 2015)
New Revision: 19632
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/asyncclient/AsyncClientTestCase.java
Log:
[CXF-6350] Excluding a test when IPv6 is used
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/asyncclient/AsyncClientTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/asyncclient/AsyncClientTestCase.java 2015-04-13 23:44:31 UTC (rev 19631)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/asyncclient/AsyncClientTestCase.java 2015-04-14 09:18:17 UTC (rev 19632)
@@ -67,7 +67,10 @@
@RunAsClient
public void testAsycClienWithHCAddress() throws Exception
{
-
+ if (baseURL.getHost().startsWith("[")) {
+ System.out.println("FIXME: [CXF-6350] Can't turn on async transport by specifying endpoint address in JAX-WS client when using IPv6");
+ return;
+ }
Endpoint proxy = initPort();
BindingProvider provider = (BindingProvider)proxy;
Map<String, Object> requestContext = provider.getRequestContext();
9 years
JBossWS SVN: r19631 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-13 19:44:31 -0400 (Mon, 13 Apr 2015)
New Revision: 19631
Modified:
stack/cxf/trunk/pom.xml
Log:
Use recent jboss-logging to avoid failures w/ wfly900
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2015-04-13 20:38:55 UTC (rev 19630)
+++ stack/cxf/trunk/pom.xml 2015-04-13 23:44:31 UTC (rev 19631)
@@ -76,9 +76,9 @@
<cxf.version>3.0.4</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>3.0.3</cxf.xjcplugins.version>
- <jboss-logging.version>3.1.2.GA</jboss-logging.version>
+ <jboss-logging.version>3.2.1.Final</jboss-logging.version>
<jboss-logging-annotations.version>1.2.0.Final</jboss-logging-annotations.version>
- <jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version>
+ <jboss-logging-processor.version>1.2.0.Final</jboss-logging-processor.version>
<jboss.jandex.version>1.0.3.Final</jboss.jandex.version>
<jboss.xb.version>2.0.3.GA</jboss.xb.version>
<picketbox.version>4.0.19.Final</picketbox.version>
9 years
JBossWS SVN: r19630 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-04-13 16:38:55 -0400 (Mon, 13 Apr 2015)
New Revision: 19630
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
Log:
[JBWS-3889] Fix regression when running with security manager on
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2015-04-13 10:11:22 UTC (rev 19629)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2015-04-13 20:38:55 UTC (rev 19630)
@@ -88,6 +88,7 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"), "wsdl/ws-trust-1.4-service.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsKeystore.properties"), "classes/stsKeystore.properties")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml"), "permissions.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml"));
return archive;
}
@@ -178,6 +179,7 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl"), "wsdl/holderofkey-ws-trust-1.4-service.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsKeystore.properties"), "classes/stsKeystore.properties")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml"), "permissions.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/holderofkey/web.xml"));
return archive;
}
@@ -229,6 +231,7 @@
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl"), "wsdl/bearer-ws-trust-1.4-service.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsstore.jks"), "classes/stsstore.jks")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/stsKeystore.properties"), "classes/stsKeystore.properties")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/META-INF/permissions.xml"), "permissions.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/bearer/web.xml"));
return archive;
}
9 years