Author: ffang Date: Mon Jul 22 09:09:03 2013 New Revision: 1505635 URL: http://svn.apache.org/r1505635 Log: Merged revisions 1505634 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1505634 | ffang | 2013-07-22 17:02:58 +0800 (一, 22 7 2013) | 16 lines Merged revisions 1505633 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1505633 | ffang | 2013-07-22 16:57:45 +0800 (一, 22 7 2013) | 9 lines Merged revisions 1505626 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1505626 | ffang | 2013-07-22 16:33:35 +0800 (一, 22 7 2013) | 1 line [CXF-5143]http-conf:server blueprint configuration doesn't work ........ ................ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1505633 Merged /cxf/trunk:r1505626 Merged /cxf/branches/2.6.x-fixes:r1505634 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java?rev=1505635&r1=1505634&r2=1505635&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java Mon Jul 22 09:09:03 2013 @@ -27,6 +27,7 @@ import org.apache.aries.blueprint.Parser import org.apache.aries.blueprint.mutable.MutableBeanMetadata; import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser; import org.apache.cxf.transport.http.AbstractHTTPDestination; +import org.apache.cxf.transports.http.configuration.HTTPServerPolicy; import org.osgi.service.blueprint.reflect.Metadata; public class HttpDestinationBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser { @@ -39,11 +40,11 @@ public class HttpDestinationBPBeanDefini bean.setRuntimeClass(AbstractHTTPDestination.class); mapElementToJaxbProperty(context, bean, element, - new QName(HTTP_NS, "server"), "server", null); + new QName(HTTP_NS, "server"), "server", HTTPServerPolicy.class); mapElementToJaxbProperty(context, bean, element, - new QName(HTTP_NS, "fixedParameterOrder"), "fixedParameterOrder", null); + new QName(HTTP_NS, "fixedParameterOrder"), "fixedParameterOrder", Boolean.class); mapElementToJaxbProperty(context, bean, element, - new QName(HTTP_NS, "contextMatchStrategy"), "contextMatchStrategy", null); + new QName(HTTP_NS, "contextMatchStrategy"), "contextMatchStrategy", String.class); parseAttributes(element, context, bean); parseChildElements(element, context, bean);
