Author: dkulp
Date: Thu Dec 13 11:30:18 2007
New Revision: 603996
URL: http://svn.apache.org/viewvc?rev=603996&view=rev
Log:
Merged revisions 603149 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r603149 | ningjiang | 2007-12-11 00:58:39 -0500 (Tue, 11 Dec 2007) | 1 line
CXF-1282 support setExecutor in jaxws front end EndpointImpl
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=603996&r1=603995&r2=603996&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Thu Dec 13 11:30:18 2007
@@ -283,6 +283,10 @@
serverFactory.setServiceClass(implementorClass);
}
+ if (executor != null) {
+ serverFactory.getServiceFactory().setExecutor(executor);
+ }
+
configureObject(serverFactory);
server = serverFactory.create();
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?rev=603996&r1=603995&r2=603996&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Thu Dec 13 11:30:18 2007
@@ -100,7 +100,7 @@
Node n = children.item(i);
if (n.getNodeType() == Node.ELEMENT_NODE) {
String name = n.getLocalName();
- if ("properties".equals(n.getLocalName())) {
+ if ("properties".equals(name)) {
Map map = ctx.getDelegate().parseMapElement((Element) n,
bean.getBeanDefinition());
bean.addPropertyValue("properties", map);
} else if ("binding".equals(name)) {
