JBossWS SVN: r13319 - stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-11-24 04:40:24 -0500 (Wed, 24 Nov 2010)
New Revision: 13319
Modified:
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
Log:
[JBWS-3140][JBWS-3141]:Added the wsa responses and mtom threshold configuration in cxf spring configuration xml
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2010-11-23 17:10:25 UTC (rev 13318)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2010-11-24 09:40:24 UTC (rev 13319)
@@ -119,6 +119,8 @@
"http://www.springframework.org/schema/beans/spring-beans.xsd " +
"http://cxf.apache.org/transports/jms " +
"http://cxf.apache.org/schemas/configuration/jms.xsd " +
+ "http://cxf.apache.org/bindings/soap " +
+ "http://cxf.apache.org/schemas/configuration/soap.xsd " +
"http://cxf.apache.org/jaxws " +
"http://cxf.apache.org/schemas/jaxws.xsd'>");
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-11-23 17:10:25 UTC (rev 13318)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-11-24 09:40:24 UTC (rev 13319)
@@ -232,8 +232,13 @@
writer.write(">");
if (this.addressingEnabled) {
+ String responses = "";
+ if (this.addressingResponses != null)
+ {
+ responses = " responses='" + addressingResponses + "'";
+ }
writer.write("<jaxws:features>");
- writer.write("<wsa:addressing addressingRequired='" + this.addressingRequired + "'/>");
+ writer.write("<wsa:addressing addressingRequired='" + this.addressingRequired + "'" + responses + "/>");
writer.write("</jaxws:features>");
}
@@ -243,7 +248,19 @@
writer.write("<soap:soapBinding mtomEnabled='" + this.mtomEnabled + "'/>");
writer.write("</jaxws:binding>");
}
-
+
+ //So far we only support standard JAXBDataBinding mtom threshold configuration
+
+ if (this.mtomEnabled)
+ {
+ writer.write("<jaxws:dataBinding>");
+ writer.write("<bean class='org.apache.cxf.jaxb.JAXBDataBinding'>");
+ writer.write("<property name='mtomEnabled' value='true'/>");
+ writer.write("<property name='mtomThreshold' value='" + this.mtomThreshold + "'/>");
+ writer.write("</bean>");
+ writer.write("</jaxws:dataBinding>");
+ }
+
if (this.invoker != null)
{
writer.write("<jaxws:invoker><bean class='" + this.invoker + "'/></jaxws:invoker>");
13 years, 5 months
JBossWS SVN: r13318 - in thirdparty/cxf/branches/cxf-2.2.6: distribution/bundle/jaxrs and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-11-23 12:10:25 -0500 (Tue, 23 Nov 2010)
New Revision: 13318
Modified:
thirdparty/cxf/branches/cxf-2.2.6/distribution/bundle/all/
thirdparty/cxf/branches/cxf-2.2.6/distribution/bundle/jaxrs/
thirdparty/cxf/branches/cxf-2.2.6/distribution/bundle/minimal/
thirdparty/cxf/branches/cxf-2.2.6/distribution/manifest/
thirdparty/cxf/branches/cxf-2.2.6/integration/jca/
thirdparty/cxf/branches/cxf-2.2.6/maven-plugins/archetypes/cxf-jaxws-javafirst/
thirdparty/cxf/branches/cxf-2.2.6/maven-plugins/corba/
thirdparty/cxf/branches/cxf-2.2.6/maven-plugins/java2ws-plugin/
thirdparty/cxf/branches/cxf-2.2.6/systests/wsdl_maven/
thirdparty/cxf/branches/cxf-2.2.6/systests/wsdl_maven/java2ws/
thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/
thirdparty/cxf/branches/cxf-2.2.6/tools/validator/
thirdparty/cxf/branches/cxf-2.2.6/tools/wsdlto/frontend/jaxws/
Log:
Update svn:ignore for Eclipse generated .project and .settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/distribution/bundle/all
___________________________________________________________________
Name: svn:ignore
+ .project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/distribution/bundle/jaxrs
___________________________________________________________________
Name: svn:ignore
+ .project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/distribution/bundle/minimal
___________________________________________________________________
Name: svn:ignore
+ .project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/distribution/manifest
___________________________________________________________________
Name: svn:ignore
+ .project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/integration/jca
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/maven-plugins/archetypes/cxf-jaxws-javafirst
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/maven-plugins/corba
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/maven-plugins/java2ws-plugin
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/systests/wsdl_maven
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/systests/wsdl_maven/java2ws
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/tools/validator
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.6/tools/wsdlto/frontend/jaxws
___________________________________________________________________
Name: svn:ignore
- target
+ target
.project
.settings
13 years, 5 months
JBossWS SVN: r13317 - thirdparty/cxf/branches/cxf-2.2.6/common/common/src/main/java/org/apache/cxf/staxutils.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-11-23 11:38:59 -0500 (Tue, 23 Nov 2010)
New Revision: 13317
Modified:
thirdparty/cxf/branches/cxf-2.2.6/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
Log:
[JBPAPP-5458] JBossWS CXF - IllegalArgumentException: Local part not allowed to be null when using OpenSAML with CXF [CXF-2725]
Modified: thirdparty/cxf/branches/cxf-2.2.6/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.6/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java 2010-11-23 13:04:16 UTC (rev 13316)
+++ thirdparty/cxf/branches/cxf-2.2.6/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java 2010-11-23 16:38:59 UTC (rev 13317)
@@ -97,7 +97,7 @@
}
public void writeStartElement(String local) throws XMLStreamException {
- newChild(document.createElement(local));
+ newChild(document.createElementNS(null, local));
}
protected void newChild(Element element) {
@@ -169,7 +169,12 @@
}
public void writeAttribute(String local, String value) throws XMLStreamException {
- Attr a = document.createAttribute(local);
+ Attr a;
+ if (local.startsWith("xmlns") && (local.length() == 5 || local.charAt(5) == ':')) {
+ a = document.createAttributeNS(XML_NS, local);
+ } else {
+ a = document.createAttributeNS(null, local);
+ }
a.setValue(value);
((Element)currentNode).setAttributeNode(a);
}
13 years, 5 months
JBossWS SVN: r13316 - thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-11-23 08:04:16 -0500 (Tue, 23 Nov 2010)
New Revision: 13316
Removed:
thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
Log:
[JBPAPP-5454] Remove empty files mistakenly added to CXF maintenance branch.
Deleted: thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java
===================================================================
Deleted: thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
===================================================================
13 years, 5 months
JBossWS SVN: r13315 - in framework/trunk/hudson/hudson-home/jobs: SWITCH-BINDIST-AS-6.0.1 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-11-22 13:15:40 -0500 (Mon, 22 Nov 2010)
New Revision: 13315
Modified:
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml
Log:
Excluding netty from stack switch changes, as it's currently being included (by Native stack) in a version newer then the AS6 CR1 one (and CXF does not change that)
Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-11-22 12:16:19 UTC (rev 13314)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.0/config.xml 2010-11-22 18:15:40 UTC (rev 13315)
@@ -55,7 +55,7 @@
STACK_ID=cxf
setupEnv
redeployBinaryDistribution
-diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar > $WORKSPACE/cxf_vs_cxfOverNative.diff
+diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar -x netty.jar > $WORKSPACE/cxf_vs_cxfOverNative.diff
rm -rf $JBOSS_HOME
Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml 2010-11-22 12:16:19 UTC (rev 13314)
+++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml 2010-11-22 18:15:40 UTC (rev 13315)
@@ -55,7 +55,7 @@
STACK_ID=cxf
setupEnv
redeployBinaryDistribution
-diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar > $WORKSPACE/cxf_vs_cxfOverNative.diff
+diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar -x netty.jar > $WORKSPACE/cxf_vs_cxfOverNative.diff
rm -rf $JBOSS_HOME
13 years, 5 months
JBossWS SVN: r13314 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: jaxws/binding and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-11-22 07:16:19 -0500 (Mon, 22 Nov 2010)
New Revision: 13314
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/SSLContextFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
Log:
[JBWS-2896] Fixing some log statements
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/SSLContextFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/SSLContextFactory.java 2010-11-22 07:43:10 UTC (rev 13313)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ssl/SSLContextFactory.java 2010-11-22 12:16:19 UTC (rev 13314)
@@ -919,7 +919,7 @@
if (isServerSocketUseClientMode())
{
keyManagers = null;
- log.debug("Could not find keytore url. " + e.getMessage());
+ log.debugf("Could not find keytore url. %s", e.getMessage());
}
else
{
@@ -938,7 +938,7 @@
catch (NullStoreURLException e)
{
trustManagers = null;
- log.debug("Could not find truststore url. " + e.getMessage());
+ log.debugf("Could not find truststore url. %s", e.getMessage());
}
secureRandom = getSecureRandom();
@@ -982,7 +982,7 @@
{
// this is allowable since would be the normal scenario
keyManagers = null;
- log.debug("Could not find keystore url. " + e.getMessage());
+ log.debugf("Could not find keystore url. %s ", e.getMessage());
}
try
@@ -998,7 +998,7 @@
if(keyManagers != null)
{
trustManagers = null;
- log.debug("Could not find truststore url. " + e.getMessage());
+ log.debugf("Could not find truststore url. %s", e.getMessage());
}
else
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2010-11-22 07:43:10 UTC (rev 13313)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2010-11-22 12:16:19 UTC (rev 13314)
@@ -67,7 +67,7 @@
/** On the server side, extract the IN parameters from the payload and populate an Invocation object */
public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction reqMessage) throws BindingException
{
- log.debug("unbindRequestMessage: " + opMetaData.getQName());
+ log.debugf("unbindRequestMessage: %s", opMetaData.getQName());
try
{
// Construct the endpoint invocation object
@@ -93,7 +93,7 @@
/** On the server side, generate the payload from OUT parameters. */
public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException
{
- log.debug("bindResponseMessage: " + opMetaData.getQName());
+ log.debugf("bindResponseMessage: %s", opMetaData.getQName());
try
{
SOAPMessageContextJAXWS msgContext = (SOAPMessageContextJAXWS)MessageContextAssociation.peekMessageContext();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2010-11-22 07:43:10 UTC (rev 13313)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2010-11-22 12:16:19 UTC (rev 13314)
@@ -78,7 +78,7 @@
/** On the server side, extract the IN parameters from the payload and populate an Invocation object */
public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction payload) throws BindingException
{
- log.debug("unbindRequestMessage: " + opMetaData.getQName());
+ log.debugf("unbindRequestMessage: %s", opMetaData.getQName());
try
{
// Construct the endpoint invocation object
@@ -119,7 +119,7 @@
/** On the server side, generate the payload from OUT parameters. */
public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException
{
- log.debug("bindResponseMessage: " + opMetaData.getQName());
+ log.debugf("bindResponseMessage: %s", opMetaData.getQName());
try
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2010-11-22 07:43:10 UTC (rev 13313)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2010-11-22 12:16:19 UTC (rev 13314)
@@ -145,7 +145,8 @@
if (context == null)
throw new IllegalArgumentException("Null context");
- log.debug("publishing endpoint " + this + " to " + context);
+ if (log.isDebugEnabled())
+ log.debug("publishing endpoint " + this + " to " + context);
if (isDestroyed)
throw new IllegalStateException("Endpoint already destroyed");
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-11-22 07:43:10 UTC (rev 13313)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2010-11-22 12:16:19 UTC (rev 13314)
@@ -435,7 +435,7 @@
if (usRef == null)
{
- log.debug("No port configuration for: " + portName);
+ log.debugf("No port configuration for: %s", portName);
return;
}
@@ -454,14 +454,14 @@
Map<String, Object> reqCtx = bp.getRequestContext();
for (UnifiedStubPropertyMetaData prop : pcref.getStubProperties())
{
- log.debug("Set stub property: " + prop);
+ log.debugf("Set stub property: %s", prop);
reqCtx.put(prop.getPropName(), prop.getPropValue());
}
}
if (configName != null || configFile != null)
{
- log.debug("Configure Stub: [configName=" + configName + ",configFile=" + configFile + "]");
+ log.debugf("Configure Stub: [configName=%s,configFile=%s]", configName, configFile);
stub.setConfigName(configName, configFile);
}
}
13 years, 5 months
JBossWS SVN: r13313 - in stack/cxf/branches/jbossws-cxf-3.4.0/modules: client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-11-22 02:43:10 -0500 (Mon, 22 Nov 2010)
New Revision: 13313
Modified:
stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
Log:
[JBWS-2896] rollback changes on 3.4.0 branch as the jboss-logging available on AS 5.0.1 does not support them (svn merge -r 13310:13309 .)
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2010-11-22 07:19:59 UTC (rev 13312)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2010-11-22 07:43:10 UTC (rev 13313)
@@ -81,7 +81,6 @@
{
private static final Logger log = Logger.getLogger(CXFHandlerResolverImpl.class);
- @SuppressWarnings("rawtypes")
private final Map<PortInfo, List<Handler>> handlerMap = new HashMap<PortInfo, List<Handler>>();
private final String handlerFile;
private static JAXBContext context;
@@ -98,7 +97,6 @@
this.bus = bus;
}
- @SuppressWarnings("rawtypes")
public List<Handler> getHandlerChain(PortInfo portInfo)
{
List<Handler> handlerChain = handlerMap.get(portInfo);
@@ -124,7 +122,7 @@
* the case where no injections were requested, the runtime MUST invoke the
* method carrying a javax.annotation .PostConstruct annotation, if present.
*/
- private void configHandler(@SuppressWarnings("rawtypes") Handler handler) {
+ private void configHandler(Handler handler) {
if (handler != null) {
ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
List<ResourceResolver> resolvers = resourceManager.getResourceResolvers();
@@ -140,7 +138,6 @@
return this.getInputStream(this.handlerFile, this.clazz);
}
- @SuppressWarnings("rawtypes")
public List<Handler> createHandlerChain(PortInfo portInfo, QName portQName, QName serviceQName, String bindingID) {
List<Handler> chain = new ArrayList<Handler>();
InputStream is = getInputStream();
@@ -155,6 +152,7 @@
if (!"http://java.sun.com/xml/ns/javaee".equals(el.getNamespaceURI())
|| !"handler-chains".equals(el.getLocalName())) {
+ String xml = XMLUtils.toString(el);
throw new WebServiceException("{http://java.sun.com/xml/ns/javaee}handler-chains element expected");
}
chain = new ArrayList<Handler>();
@@ -165,6 +163,7 @@
if (!el.getNamespaceURI().equals("http://java.sun.com/xml/ns/javaee")
|| !el.getLocalName().equals("handler-chain")) {
+ String xml = XMLUtils.toString(el);
throw new WebServiceException("{http://java.sun.com/xml/ns/javaee}handler-chain element expected");
}
processHandlerChainElement(el, chain, portQName, serviceQName, bindingID);
@@ -187,7 +186,7 @@
return sortHandlers(chain);
}
- private void processHandlerChainElement(Element el, @SuppressWarnings("rawtypes") List<Handler> chain,
+ private void processHandlerChainElement(Element el, List<Handler> chain,
QName portQName, QName serviceQName, String bindingID) {
Node node = el.getFirstChild();
while (node != null) {
@@ -270,7 +269,6 @@
return true;
}
- @SuppressWarnings("rawtypes")
public List<Handler> sortHandlers(List<Handler> handlers) {
List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
@@ -293,8 +291,7 @@
private InputStream getInputStream(String filename, Class<?> wsClass)
{
URL fileURL = null;
- if (log.isDebugEnabled())
- log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName());
+ log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName());
// Try the filename as URL
try
@@ -324,11 +321,8 @@
// Try the filename as Resource
if (fileURL == null)
{
- if (log.isDebugEnabled())
- {
- log.debug(wsClass.getProtectionDomain().getCodeSource());
- log.debug(wsClass.getClassLoader());
- }
+ log.debug(wsClass.getProtectionDomain().getCodeSource());
+ log.debug(wsClass.getClassLoader());
fileURL = wsClass.getClassLoader().getResource(filename);
}
@@ -360,7 +354,7 @@
}
}
- private void processHandlerElement(Element el, @SuppressWarnings("rawtypes") List<Handler> chain) {
+ private void processHandlerElement(Element el, List<Handler> chain) {
try {
JAXBContext ctx = getContextForPortComponentHandlerType();
PortComponentHandlerType pt = ctx.createUnmarshaller()
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java 2010-11-22 07:19:59 UTC (rev 13312)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java 2010-11-22 07:43:10 UTC (rev 13313)
@@ -32,6 +32,7 @@
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.addressing.RelatesToType;
+import org.jboss.logging.Logger;
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAPEndpoint;
@@ -50,6 +51,8 @@
*/
public class CXFMAP implements MAP
{
+ private static final Logger log = Logger.getLogger(CXFMAP.class);
+
/**
* the wrapped instance which this class delegates to
*/
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-11-22 07:19:59 UTC (rev 13312)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-11-22 07:43:10 UTC (rev 13313)
@@ -73,7 +73,7 @@
@Override
public void stop(Deployment dep)
{
- log.debugf("Undeploying jms endpoints in %s", dep.getSimpleName());
+ log.debug("Undeploying jms endpoints in " + dep.getSimpleName());
if (dep.getAttachment(Bus.class) != null)
{
Bus bus = dep.getAttachment(Bus.class);
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2010-11-22 07:19:59 UTC (rev 13312)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2010-11-22 07:43:10 UTC (rev 13313)
@@ -186,12 +186,12 @@
}
}
String urlStr = uriScheme + "://" + host + port + path;
- log.debugf("Rewritten new candidate service endpoint address '%s' to '%s'", s, urlStr);
+ log.debug("Rewritten new candidate service endpoint address '" + s + "' to '" + urlStr + "'");
return urlStr;
}
catch (Exception e)
{
- log.debugf("Invalid url provided, using it without rewriting: %s", s);
+ log.debug("Invalid url provided, using it without rewriting: " + s);
return s;
}
}
13 years, 5 months
JBossWS SVN: r13312 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-11-22 02:19:59 -0500 (Mon, 22 Nov 2010)
New Revision: 13312
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/request.xml
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/util/xml/BufferedStreamSource.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java
Log:
[JBWS-3164]:Enhancement:NPE exception when the StreamSource with null inputstream in XMLFragment is wrote to OutputStream
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/util/xml/BufferedStreamSource.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/util/xml/BufferedStreamSource.java 2010-11-22 05:48:32 UTC (rev 13311)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/util/xml/BufferedStreamSource.java 2010-11-22 07:19:59 UTC (rev 13312)
@@ -29,9 +29,11 @@
import java.io.InputStream;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
+import java.net.URL;
import javax.xml.transform.stream.StreamSource;
+import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.wsf.common.IOUtils;
@@ -43,6 +45,7 @@
*/
public final class BufferedStreamSource extends StreamSource
{
+ private static final Logger log = Logger.getLogger(BufferedStreamSource.class);
private byte[] bytes;
private char[] chars;
@@ -71,6 +74,22 @@
}
chars = charArrayWriter.toCharArray();
}
+ //JBWS-3164:try to create InputStream from systemId
+ String systemId = source.getSystemId();
+ if (sourceInputStream == null && sourceReader == null && systemId != null)
+ {
+ try
+ {
+ URL url = new URL(systemId);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+ IOUtils.copyStream(baos, url.openStream());
+ bytes = baos.toByteArray();
+ }
+ catch (Exception e)
+ {
+ log.warn("Failed to create inputstream from systemId of StreamSource");
+ }
+ }
}
catch (IOException ex)
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2010-11-22 05:48:32 UTC (rev 13311)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2010-11-22 07:19:59 UTC (rev 13312)
@@ -28,7 +28,10 @@
import org.w3c.dom.Element;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.PrintWriter;
/**
@@ -95,4 +98,15 @@
assertFalse("Should not contain processing instruction", s.startsWith("<?xml"));
assertEquals(XML_STRING, s);
}
+
+ //JBWS-3164
+ public void testStreamSourceConstructedWithFile() throws Exception {
+ //File file = new File(this.getClass().getResource("request.xml").toString()) will break this test
+ File file = new File(this.getClass().getResource("request.xml").getFile());
+ StreamSource requestSource = new StreamSource(file);
+ XMLFragment xmlFragment = new XMLFragment(requestSource);
+ java.io.ByteArrayOutputStream bout = new java.io.ByteArrayOutputStream();
+ xmlFragment.writeTo(bout);
+ assertTrue(new String(bout.toByteArray()).indexOf("Hello") > -1);
+ }
}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/request.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/request.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/request.xml 2010-11-22 07:19:59 UTC (rev 13312)
@@ -0,0 +1,4 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<ns1:Request xmlns="http://ws.jboss.org" xmlns:ns1="http://ws.jboss.org/jbws3164">
+ <ns1:Arg>Hello</ns1:Arg>
+</ns1:Request>
\ No newline at end of file
13 years, 5 months
JBossWS SVN: r13311 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-11-22 00:48:32 -0500 (Mon, 22 Nov 2010)
New Revision: 13311
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/request.xml
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/util/xml/BufferedStreamSource.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java
Log:
[JBPAPP-5404]:JBossWS problem when using ws-security with Dispatch/Payload mode client
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/util/xml/BufferedStreamSource.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/util/xml/BufferedStreamSource.java 2010-11-19 16:45:10 UTC (rev 13310)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/util/xml/BufferedStreamSource.java 2010-11-22 05:48:32 UTC (rev 13311)
@@ -29,9 +29,11 @@
import java.io.InputStream;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
+import java.net.URL;
import javax.xml.transform.stream.StreamSource;
+import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.wsf.common.IOUtils;
@@ -43,6 +45,7 @@
*/
public final class BufferedStreamSource extends StreamSource
{
+ private static final Logger log = Logger.getLogger(BufferedStreamSource.class);
private byte[] bytes;
private char[] chars;
@@ -71,6 +74,23 @@
}
chars = charArrayWriter.toCharArray();
}
+
+ //JBWS-3164:try to create InputStream from systemId
+ String systemId = source.getSystemId();
+ if (sourceInputStream == null && sourceReader == null && systemId != null)
+ {
+ try
+ {
+ URL url = new URL(systemId);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+ IOUtils.copyStream(baos, url.openStream());
+ bytes = baos.toByteArray();
+ }
+ catch (Exception e)
+ {
+ log.warn("Failed to create inputstream from systemId of StreamSource");
+ }
+ }
}
catch (IOException ex)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2010-11-19 16:45:10 UTC (rev 13310)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/XMLFragmentTestCase.java 2010-11-22 05:48:32 UTC (rev 13311)
@@ -28,7 +28,10 @@
import org.w3c.dom.Element;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.PrintWriter;
/**
@@ -95,4 +98,15 @@
assertFalse("Should not contain processing instruction", s.startsWith("<?xml"));
assertEquals(XML_STRING, s);
}
+
+ //JBWS-3164
+ public void testStreamSourceConstructedWithFile() throws Exception {
+ //File file = new File(this.getClass().getResource("request.xml").toString()) will break this test
+ File file = new File(this.getClass().getResource("request.xml").getFile());
+ StreamSource requestSource = new StreamSource(file);
+ XMLFragment xmlFragment = new XMLFragment(requestSource);
+ java.io.ByteArrayOutputStream bout = new java.io.ByteArrayOutputStream();
+ xmlFragment.writeTo(bout);
+ assertTrue(new String(bout.toByteArray()).indexOf("Hello") > -1);
+ }
}
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/request.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/request.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/request.xml 2010-11-22 05:48:32 UTC (rev 13311)
@@ -0,0 +1,4 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<ns1:Request xmlns="http://ws.jboss.org" xmlns:ns1="http://ws.jboss.org/jbws3164">
+ <ns1:Arg>Hello</ns1:Arg>
+</ns1:Request>
\ No newline at end of file
13 years, 5 months
JBossWS SVN: r13310 - in stack/cxf/branches/jbossws-cxf-3.4.0/modules: client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-11-19 11:45:10 -0500 (Fri, 19 Nov 2010)
New Revision: 13310
Modified:
stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java
stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
Log:
[JBWS-2896] svn merge -r 13308:13309 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2010-11-19 16:41:21 UTC (rev 13309)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2010-11-19 16:45:10 UTC (rev 13310)
@@ -81,6 +81,7 @@
{
private static final Logger log = Logger.getLogger(CXFHandlerResolverImpl.class);
+ @SuppressWarnings("rawtypes")
private final Map<PortInfo, List<Handler>> handlerMap = new HashMap<PortInfo, List<Handler>>();
private final String handlerFile;
private static JAXBContext context;
@@ -97,6 +98,7 @@
this.bus = bus;
}
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlerChain(PortInfo portInfo)
{
List<Handler> handlerChain = handlerMap.get(portInfo);
@@ -122,7 +124,7 @@
* the case where no injections were requested, the runtime MUST invoke the
* method carrying a javax.annotation .PostConstruct annotation, if present.
*/
- private void configHandler(Handler handler) {
+ private void configHandler(@SuppressWarnings("rawtypes") Handler handler) {
if (handler != null) {
ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
List<ResourceResolver> resolvers = resourceManager.getResourceResolvers();
@@ -138,6 +140,7 @@
return this.getInputStream(this.handlerFile, this.clazz);
}
+ @SuppressWarnings("rawtypes")
public List<Handler> createHandlerChain(PortInfo portInfo, QName portQName, QName serviceQName, String bindingID) {
List<Handler> chain = new ArrayList<Handler>();
InputStream is = getInputStream();
@@ -152,7 +155,6 @@
if (!"http://java.sun.com/xml/ns/javaee".equals(el.getNamespaceURI())
|| !"handler-chains".equals(el.getLocalName())) {
- String xml = XMLUtils.toString(el);
throw new WebServiceException("{http://java.sun.com/xml/ns/javaee}handler-chains element expected");
}
chain = new ArrayList<Handler>();
@@ -163,7 +165,6 @@
if (!el.getNamespaceURI().equals("http://java.sun.com/xml/ns/javaee")
|| !el.getLocalName().equals("handler-chain")) {
- String xml = XMLUtils.toString(el);
throw new WebServiceException("{http://java.sun.com/xml/ns/javaee}handler-chain element expected");
}
processHandlerChainElement(el, chain, portQName, serviceQName, bindingID);
@@ -186,7 +187,7 @@
return sortHandlers(chain);
}
- private void processHandlerChainElement(Element el, List<Handler> chain,
+ private void processHandlerChainElement(Element el, @SuppressWarnings("rawtypes") List<Handler> chain,
QName portQName, QName serviceQName, String bindingID) {
Node node = el.getFirstChild();
while (node != null) {
@@ -269,6 +270,7 @@
return true;
}
+ @SuppressWarnings("rawtypes")
public List<Handler> sortHandlers(List<Handler> handlers) {
List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
@@ -291,7 +293,8 @@
private InputStream getInputStream(String filename, Class<?> wsClass)
{
URL fileURL = null;
- log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName());
+ if (log.isDebugEnabled())
+ log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName());
// Try the filename as URL
try
@@ -321,8 +324,11 @@
// Try the filename as Resource
if (fileURL == null)
{
- log.debug(wsClass.getProtectionDomain().getCodeSource());
- log.debug(wsClass.getClassLoader());
+ if (log.isDebugEnabled())
+ {
+ log.debug(wsClass.getProtectionDomain().getCodeSource());
+ log.debug(wsClass.getClassLoader());
+ }
fileURL = wsClass.getClassLoader().getResource(filename);
}
@@ -354,7 +360,7 @@
}
}
- private void processHandlerElement(Element el, List<Handler> chain) {
+ private void processHandlerElement(Element el, @SuppressWarnings("rawtypes") List<Handler> chain) {
try {
JAXBContext ctx = getContextForPortComponentHandlerType();
PortComponentHandlerType pt = ctx.createUnmarshaller()
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java 2010-11-19 16:41:21 UTC (rev 13309)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java 2010-11-19 16:45:10 UTC (rev 13310)
@@ -32,7 +32,6 @@
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.addressing.RelatesToType;
-import org.jboss.logging.Logger;
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAPEndpoint;
@@ -51,8 +50,6 @@
*/
public class CXFMAP implements MAP
{
- private static final Logger log = Logger.getLogger(CXFMAP.class);
-
/**
* the wrapped instance which this class delegates to
*/
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-11-19 16:41:21 UTC (rev 13309)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-11-19 16:45:10 UTC (rev 13310)
@@ -73,7 +73,7 @@
@Override
public void stop(Deployment dep)
{
- log.debug("Undeploying jms endpoints in " + dep.getSimpleName());
+ log.debugf("Undeploying jms endpoints in %s", dep.getSimpleName());
if (dep.getAttachment(Bus.class) != null)
{
Bus bus = dep.getAttachment(Bus.class);
Modified: stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2010-11-19 16:41:21 UTC (rev 13309)
+++ stack/cxf/branches/jbossws-cxf-3.4.0/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2010-11-19 16:45:10 UTC (rev 13310)
@@ -186,12 +186,12 @@
}
}
String urlStr = uriScheme + "://" + host + port + path;
- log.debug("Rewritten new candidate service endpoint address '" + s + "' to '" + urlStr + "'");
+ log.debugf("Rewritten new candidate service endpoint address '%s' to '%s'", s, urlStr);
return urlStr;
}
catch (Exception e)
{
- log.debug("Invalid url provided, using it without rewriting: " + s);
+ log.debugf("Invalid url provided, using it without rewriting: %s", s);
return s;
}
}
13 years, 5 months