Repository: cxf Updated Branches: refs/heads/3.0.x-fixes f00e824ac -> 47f8d206c
[CXF-6481] Reverting the direct parsing of engine simple elements Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/47f8d206 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/47f8d206 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/47f8d206 Branch: refs/heads/3.0.x-fixes Commit: 47f8d206c92cbc06a5033497f97c99e1ec0c4009 Parents: f00e824 Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Thu Jul 9 11:29:17 2015 +0100 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Thu Jul 9 11:33:08 2015 +0100 ---------------------------------------------------------------------- .../JettyHTTPServerEngineFactoryHolder.java | 30 ++++---------------- .../JettyServerEngineFactoryParser.java | 23 +-------------- 2 files changed, 7 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/47f8d206/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java index 636835e..4f0d415 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java @@ -63,9 +63,6 @@ public class JettyHTTPServerEngineFactoryHolder { private Map<String, List<Handler>> handlersMap; - private Map<String, Boolean> sessionSupportMap; - private Map<String, Boolean> reuseAddressMap; - private JAXBContext jaxbContext; private Set<Class<?>> jaxbClasses; @@ -142,18 +139,6 @@ public class JettyHTTPServerEngineFactoryHolder { + engine.getPort().toString()); } } - if (sessionSupportMap != null) { - Boolean sessionSupport = sessionSupportMap.get(engine.getPort().toString()); - if (sessionSupport != null) { - eng.setSessionSupport(sessionSupport); - } - } - if (reuseAddressMap != null) { - Boolean reuseAddress = reuseAddressMap.get(engine.getPort().toString()); - if (reuseAddress != null) { - eng.setReuseAddress(reuseAddress); - } - } if (engine.isContinuationsEnabled() != null) { eng.setContinuationsEnabled(engine.isContinuationsEnabled()); @@ -168,7 +153,12 @@ public class JettyHTTPServerEngineFactoryHolder { if (engine.getPort() != null) { eng.setPort(engine.getPort()); } - + if (engine.isReuseAddress() != null) { + eng.setReuseAddress(engine.isReuseAddress()); + } + if (engine.isSessionSupport() != null) { + eng.setSessionSupport(engine.isSessionSupport()); + } if (engine.getThreadingParameters() != null) { ThreadingParametersType threads = engine.getThreadingParameters(); ThreadingParameters rThreads = new ThreadingParameters(); @@ -221,14 +211,6 @@ public class JettyHTTPServerEngineFactoryHolder { this.connectorMap = connectorMap; } - public void setSessionSupportMap(Map<String, Boolean> sessionMap) { - this.sessionSupportMap = sessionMap; - } - - public void setReuseAddressMap(Map<String, Boolean> reuseMap) { - this.reuseAddressMap = reuseMap; - } - public void setHandlersMap(Map<String, List<Handler>> handlersMap) { this.handlersMap = handlersMap; } http://git-wip-us.apache.org/repos/asf/cxf/blob/47f8d206/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java index 5af9f77..fe4eac6 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java @@ -85,8 +85,6 @@ public class JettyServerEngineFactoryParser extends AbstractBPBeanDefinitionPars .getChildrenWithName(element, HTTPJettyTransportNamespaceHandler.JETTY_TRANSPORT, "engine"); ef.addProperty("connectorMap", parseEngineConnector(engines, ef, context)); ef.addProperty("handlersMap", parseEngineHandlers(engines, ef, context)); - ef.addProperty("sessionSupportMap", parseEngineBooleanProperty(engines, ef, context, "sessionSupport")); - ef.addProperty("reuseAddressMap", parseEngineBooleanProperty(engines, ef, context, "reuseAddress")); return ef; } catch (Exception e) { throw new RuntimeException("Could not process configuration.", e); @@ -129,24 +127,5 @@ public class JettyServerEngineFactoryParser extends AbstractBPBeanDefinitionPars return new MapMetadataImpl("java.lang.String", "java.util.List", entries); } - protected Metadata parseEngineBooleanProperty(List<Element> engines, - ComponentMetadata enclosingComponent, - ParserContext context, - String propertyName) { - List<MapEntry> entries = new ArrayList<MapEntry>(); - for (Element engine : engines) { - String port = engine.getAttribute("port"); - ValueMetadata keyValue = createValue(context, port); - Element simpleElement = DOMUtils - .getFirstChildWithName(engine, HTTPJettyTransportNamespaceHandler.JETTY_TRANSPORT, - propertyName); - if (simpleElement != null) { - String text = DOMUtils.getContent(simpleElement); - ValueMetadata valValue = createValue(context, text); - entries.add(new MapEntryImpl(keyValue, valValue)); - } - } - - return new MapMetadataImpl("java.lang.String", "java.lang.Boolean", entries); - } + }
