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 +
"'");