Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 39934 invoked from network); 3 Jun 2007 18:21:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jun 2007 18:21:07 -0000 Received: (qmail 73504 invoked by uid 500); 3 Jun 2007 18:21:11 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 73391 invoked by uid 500); 3 Jun 2007 18:21:11 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 73382 invoked by uid 99); 3 Jun 2007 18:21:11 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2007 11:21:10 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2007 11:21:05 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6201A1A981A; Sun, 3 Jun 2007 11:20:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r543953 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/configuration/spring/ rt/core/src/main/java/org/apache/cxf/configuration/spring/ rt/core/src/test/java/org/apache/cxf/configuration/spring/ rt/transports/http-jet... Date: Sun, 03 Jun 2007 18:20:44 -0000 To: cxf-commits@incubator.apache.org From: andreasmyth@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070603182045.6201A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andreasmyth Date: Sun Jun 3 11:20:43 2007 New Revision: 543953 URL: http://svn.apache.org/viewvc?view=rev&rev=543953 Log: [JIRA CXF-674] for conduit and destination in http://cxf.apacge.org/transports/http/configuration namespace: bean types extends beans:identifiedType. As JAXB mappings of these classes were never used prevented code from being generated by splitting http-conf.xsd into two files (both with same target namespace) - only one to be processed by xjc. Modified bean wildcarding mechanisms to use qualified class name as key in wildcard definitions map so it can be used for custom beans also. Increased BaseRetransmissionInterval for client in ServerPersistenceTest to avoid early resend form client - this was causing intermittent failures of the test. Added: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml (with props) incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd (with props) Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java (original) +++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java Sun Jun 3 11:20:43 2007 @@ -60,7 +60,7 @@ String names = elem.getAttribute(BeanConstants.NAME_ATTR); if (null != names) { StringTokenizer st = - new StringTokenizer(BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS, names); + new StringTokenizer(names, BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS); if (st.countTokens() > 0) { id = st.nextToken(); } @@ -263,8 +263,6 @@ } protected final void doParseCommon(Element elem, ParserContext ctx, BeanDefinitionBuilder builder) { - System.out.println("Using AbstractBeanDefinitionParser to parse element " - + new QName(elem.getNamespaceURI(), elem.getLocalName())); NamedNodeMap atts = elem.getAttributes(); for (int i = 0; i < atts.getLength(); i++) { Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java (original) +++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java Sun Jun 3 11:20:43 2007 @@ -149,7 +149,7 @@ private void configureWithWildCard(String bn, Object beanInstance) { if (!wildCardBeanDefinitions.isEmpty() && !isWildcardBeanName(bn)) { - String className = beanInstance.getClass().getSimpleName(); + String className = beanInstance.getClass().getName(); if (wildCardBeanDefinitions.containsKey(className)) { String wildCardBeanId = wildCardBeanDefinitions.get(className); if (bn.endsWith(stripStar(wildCardBeanId))) { Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml (original) +++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml Sun Jun 3 11:20:43 2007 @@ -22,7 +22,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java Sun Jun 3 11:20:43 2007 @@ -20,6 +20,8 @@ import javax.xml.namespace.QName; +import org.xml.sax.SAXParseException; + import org.apache.cxf.Bus; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.configuration.spring.ConfigurerImpl; @@ -33,19 +35,41 @@ import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transport.http_jetty.JettyHTTPDestination; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; +import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException; + public class ApplicationContextTest extends Assert { + + private static final String S1 = + ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString(); + private static final String S2 = + ApplicationContextTest.class.getResource("/META-INF/cxf/cxf-extension-http.xml").toString(); + private static final String S3 = + ApplicationContextTest.class.getResource("/META-INF/cxf/cxf-extension-http-jetty.xml").toString(); + + @Ignore + @Test + public void testInvalid() throws Exception { + String s4 = getClass() + .getResource("/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml").toString(); + + try { + new TestApplicationContext(new String[] {S1, S2, S3, s4}); + fail("Expected XmlBeanDefinitionStoreException not thrown."); + } catch (XmlBeanDefinitionStoreException ex) { + assertTrue(ex.getCause() instanceof SAXParseException); + } + } + @Test public void testContext() throws Exception { - String s1 = getClass().getResource("/META-INF/cxf/cxf.xml").toString(); - String s2 = getClass().getResource("/META-INF/cxf/cxf-extension-http.xml").toString(); - String s3 = getClass().getResource("/META-INF/cxf/cxf-extension-http-jetty.xml").toString(); String s4 = getClass() .getResource("/org/apache/cxf/transport/http_jetty/spring/beans.xml").toString(); TestApplicationContext ctx = new TestApplicationContext( - new String[] {s1, s2, s3, s4}); + new String[] {S1, S2, S3, s4}); ctx.refresh(); @@ -64,13 +88,17 @@ Destination d = dfm.getDestinationFactory("http://schemas.xmlsoap.org/soap/http").getDestination(info); assertTrue(d instanceof JettyHTTPDestination); - JettyHTTPDestination jd = (JettyHTTPDestination) d; + JettyHTTPDestination jd = (JettyHTTPDestination) d; assertEquals("foobar", jd.getServer().getContentEncoding()); ConduitInitiatorManager cim = bus.getExtension(ConduitInitiatorManager.class); ConduitInitiator ci = cim.getConduitInitiator("http://schemas.xmlsoap.org/soap/http"); HTTPConduit conduit = (HTTPConduit) ci.getConduit(info); assertEquals(97, conduit.getClient().getConnectionTimeout()); + + info.setName(new QName("urn:test:ns", "Bar")); + conduit = (HTTPConduit) ci.getConduit(info); + assertEquals(79, conduit.getClient().getConnectionTimeout()); } } Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml Sun Jun 3 11:20:43 2007 @@ -21,16 +21,23 @@ xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:h="http://cxf.apache.org/transports/http/configuration" + xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/wsdl/http-conf.xsd" +http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd +http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd" > - + - + + + + + + Added: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml?view=auto&rev=543953 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml (added) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml Sun Jun 3 11:20:43 2007 @@ -0,0 +1,36 @@ + + + + + + + + + + + + Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/invalid-beans.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java Sun Jun 3 11:20:43 2007 @@ -30,6 +30,9 @@ import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.configuration.jsse.TLSClientParameters; import org.apache.cxf.configuration.jsse.spring.TLSClientParametersConfig; +import org.apache.cxf.configuration.security.AuthorizationPolicy; +import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy; +import org.apache.cxf.configuration.security.SSLClientPolicy; import org.apache.cxf.configuration.security.TLSClientParametersType; import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser; import org.apache.cxf.transport.http.HTTPConduit; @@ -37,6 +40,7 @@ import org.apache.cxf.transport.http.MessageTrustDecider; import org.springframework.beans.factory.support.BeanDefinitionBuilder; + public class HttpConduitBeanDefinitionParser extends AbstractBeanDefinitionParser { @@ -49,13 +53,16 @@ mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "client"), "client"); mapElementToJaxbProperty(element, bean, - new QName(HTTP_NS, "proxyAuthorization"), "proxyAuthorization"); + new QName(HTTP_NS, "proxyAuthorization"), "proxyAuthorization", + ProxyAuthorizationPolicy.class, ProxyAuthorizationPolicy.class.getPackage().getName()); mapElementToJaxbProperty(element, bean, - new QName(HTTP_NS, "authorization"), "authorization"); + new QName(HTTP_NS, "authorization"), "authorization", + AuthorizationPolicy.class, AuthorizationPolicy.class.getPackage().getName()); // DEPRECATED: This element is deprecated in favor of tlsClientParameters mapElementToJaxbProperty(element, bean, - new QName(HTTP_NS, "sslClient"), "sslClient"); + new QName(HTTP_NS, "sslClient"), "sslClient", + SSLClientPolicy.class, SSLClientPolicy.class.getPackage().getName()); mapSpecificElements(element, bean); } @@ -74,23 +81,17 @@ NodeList nl = parent.getChildNodes(); for (int i = 0; i < nl.getLength(); i++) { Node n = nl.item(i); + if (Node.ELEMENT_NODE != n.getNodeType() + || !HTTP_NS.equals(n.getNamespaceURI())) { + continue; + } + String elementName = n.getLocalName(); // Schema should require that no more than one each of these exist. - if (n.getNodeType() == Node.ELEMENT_NODE - && n.getLocalName().equals("trustDecider") - && n.getNamespaceURI().equals(HTTP_NS)) { - + if ("trustDecider".equals(elementName)) { mapBeanOrClassElement((Element)n, bean, MessageTrustDecider.class); - } - if (n.getNodeType() == Node.ELEMENT_NODE - && n.getLocalName().equals("basicAuthSupplier") - && n.getNamespaceURI().equals(HTTP_NS)) { - + } else if ("basicAuthSupplier".equals(elementName)) { mapBeanOrClassElement((Element)n, bean, HttpBasicAuthSupplier.class); - } - if (n.getNodeType() == Node.ELEMENT_NODE - && n.getLocalName().equals("tlsClientParameters") - && n.getNamespaceURI().equals(HTTP_NS)) { - + } else if ("tlsClientParameters".equals(elementName)) { mapTLSClientParameters(n, bean); } } Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java Sun Jun 3 11:20:43 2007 @@ -18,6 +18,7 @@ */ package org.apache.cxf.transport.http.spring; +import javax.xml.bind.DatatypeConverter; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Unmarshaller; @@ -29,6 +30,8 @@ import org.apache.cxf.configuration.jsse.TLSServerParameters; import org.apache.cxf.configuration.jsse.spring.TLSServerParametersConfig; +import org.apache.cxf.configuration.security.AuthorizationPolicy; +import org.apache.cxf.configuration.security.SSLServerPolicy; import org.apache.cxf.configuration.security.TLSServerParametersType; import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser; import org.apache.cxf.transport.http.AbstractHTTPDestination; @@ -44,13 +47,11 @@ mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "server"), "server"); // DEPRECATED: This element is deprecated in favor of tlsServerParameters. - mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "sslServer"), "sslServer"); + mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "sslServer"), "sslServer", + SSLServerPolicy.class, SSLServerPolicy.class.getPackage().getName()); - mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "authorization"), "authorization"); - mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "fixedParameterOrder"), - "fixedParameterOrder"); - mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "contextMatchStrategy"), - "contextMatchStrategy"); + mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "authorization"), "authorization", + AuthorizationPolicy.class, AuthorizationPolicy.class.getPackage().getName()); mapSpecificElements(element, bean); } @@ -69,11 +70,18 @@ NodeList nl = parent.getChildNodes(); for (int i = 0; i < nl.getLength(); i++) { Node n = nl.item(i); - if (n.getNodeType() == Node.ELEMENT_NODE - && n.getLocalName().equals("tlsServerParameters") - && n.getNamespaceURI().equals(HTTP_NS)) { - + if (Node.ELEMENT_NODE != n.getNodeType() + || !HTTP_NS.equals(n.getNamespaceURI())) { + continue; + } + Element elem = (Element)n; + String elementName = n.getLocalName(); + if ("tlsServerParameters".equals(elementName)) { this.mapTLSServerParameters(n, bean); + } else if ("contextMatchStrategy".equals(elementName)) { + bean.addPropertyValue(elementName, DatatypeConverter.parseString(elem.getTextContent())); + } else if ("fixedParameterOrder".equals(elementName)) { + bean.addPropertyValue(elementName, DatatypeConverter.parseBoolean(elem.getTextContent())); } } } @@ -89,7 +97,7 @@ // the configured TLSClientParameters into the HTTPDestination. JAXBContext context = null; try { - context = JAXBContext.newInstance(getJaxbPackage(), + context = JAXBContext.newInstance(TLSServerParametersType.class.getPackage().getName(), getClass().getClassLoader()); Unmarshaller u = context.createUnmarshaller(); JAXBElement jaxb = Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas Sun Jun 3 11:20:43 2007 @@ -1 +1,2 @@ http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd +http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd Added: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?view=auto&rev=543953 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd (added) +++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd Sun Jun 3 11:20:43 2007 @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd Sun Jun 3 11:20:43 2007 @@ -19,72 +19,21 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - HTTP Server configuration properties. @@ -434,7 +383,6 @@ - @@ -477,4 +425,9 @@ + + + + + Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml Sun Jun 3 11:20:43 2007 @@ -26,7 +26,7 @@ - + Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?view=diff&rev=543953&r1=543952&r2=543953 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Sun Jun 3 11:20:43 2007 @@ -19,6 +19,7 @@ package org.apache.cxf.systest.ws.rm; +import java.math.BigInteger; import java.util.logging.Logger; import javax.xml.ws.Response; @@ -41,6 +42,7 @@ import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; import org.apache.cxf.ws.rm.RMConstants; +import org.apache.cxf.ws.rm.RMManager; import org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore; import org.junit.BeforeClass; import org.junit.Test; @@ -92,8 +94,12 @@ LOG.fine("Started greeter server."); Bus greeterBus = new SpringBusFactory().createBus(CFG); - LOG.fine("Created bus " + greeterBus + " with cfg : " + CFG); + LOG.fine("Created bus " + greeterBus + " with cfg : " + CFG); BusFactory.setDefaultBus(greeterBus); + + // avoid soon cliejt resends + greeterBus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval() + .setMilliseconds(new BigInteger("60000")); GreeterService gs = new GreeterService(); Greeter greeter = gs.getGreeterPort();