You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by an...@apache.org on 2007/06/05 16:29:31 UTC
svn commit: r544502 - in /incubator/cxf/trunk:
common/common/src/main/java/org/apache/cxf/configuration/spring/
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/
rt/transports/http/src/main/java/org/apache/cxf/transport...
Author: andreasmyth
Date: Tue Jun 5 07:29:30 2007
New Revision: 544502
URL: http://svn.apache.org/viewvc?view=rev&rev=544502
Log:
[JIRA CXF-674] for conduit and destination in http://cxf.apache.org/transport/jms namespace: bean type extends beans:identifiedType. Split jms.xsd into two files, one to contain element and type definitions from which no code needs to be generated.
Added:
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd (with props)
incubator/cxf/trunk/rt/transports/jms/src/test/resources/
incubator/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml (with props)
Removed:
incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test_config.xml
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/ListenerBeanDefinitionParser.java
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/jms/pom.xml
incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java
incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java
incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.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=544502&r1=544501&r2=544502
==============================================================================
--- 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 Tue Jun 5 07:29:30 2007
@@ -146,22 +146,12 @@
String propertyName) {
mapElementToJaxbProperty(parent, bean, name, propertyName, null);
}
-
- protected void mapElementToJaxbProperty(Element parent,
- BeanDefinitionBuilder bean,
- QName name,
- String propertyName,
- Class<?> c) {
- mapElementToJaxbProperty(parent, bean, name, propertyName, c, getJaxbPackage());
- }
-
-
+
protected void mapElementToJaxbProperty(Element parent,
BeanDefinitionBuilder bean,
QName name,
String propertyName,
- Class<?> c,
- String packageName) {
+ Class<?> c) {
Node data = null;
NodeList nl = parent.getChildNodes();
for (int i = 0; i < nl.getLength(); i++) {
@@ -180,7 +170,11 @@
JAXBContext context = null;
Object obj = null;
try {
- context = JAXBContext.newInstance(packageName, getClass().getClassLoader());
+ String pkg = getJaxbPackage();
+ if (null != c) {
+ pkg = c.getPackage().getName();
+ }
+ context = JAXBContext.newInstance(pkg, getClass().getClassLoader());
Unmarshaller u = context.createUnmarshaller();
if (c != null) {
obj = u.unmarshal(data, c);
Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/ListenerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/ListenerBeanDefinitionParser.java?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/ListenerBeanDefinitionParser.java (original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/ListenerBeanDefinitionParser.java Tue Jun 5 07:29:30 2007
@@ -42,20 +42,13 @@
public void doParse(Element element, BeanDefinitionBuilder bean) {
bean.setAbstract(true);
mapElementToJaxbProperty(element, bean, new QName(LISTENER_NS, "listener"), "listener",
- HTTPListenerPolicy.class, HTTPListenerPolicy.class.getPackage().getName());
- // TODO: what about the other two properties?
+ HTTPListenerPolicy.class);
mapElementToJaxbProperty(element, bean, new QName(LISTENER_NS, "sslServer"), "sslServer",
- SSLServerPolicy.class, SSLServerPolicy.class.getPackage().getName());
+ SSLServerPolicy.class);
mapElementToJaxbProperty(element, bean, new QName(LISTENER_NS, "tlsServerParameters"),
"tlsServerParameters",
- TLSServerParametersType.class, TLSServerParametersType.class.getPackage().getName());
+ TLSServerParametersType.class);
- }
-
- @Override
- protected String getJaxbPackage() {
- // not needed - return null?
- return "org.apache.cxf.transport.http.listener";
}
}
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=544502&r1=544501&r2=544502
==============================================================================
--- 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 Tue Jun 5 07:29:30 2007
@@ -38,6 +38,7 @@
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.http.HttpBasicAuthSupplier;
import org.apache.cxf.transport.http.MessageTrustDecider;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -51,18 +52,19 @@
public void doParse(Element element, BeanDefinitionBuilder bean) {
bean.setAbstract(true);
mapElementToJaxbProperty(element, bean,
- new QName(HTTP_NS, "client"), "client");
+ new QName(HTTP_NS, "client"), "client",
+ HTTPClientPolicy.class);
mapElementToJaxbProperty(element, bean,
- new QName(HTTP_NS, "proxyAuthorization"), "proxyAuthorization",
- ProxyAuthorizationPolicy.class, ProxyAuthorizationPolicy.class.getPackage().getName());
+ new QName(HTTP_NS, "proxyAuthorization"), "proxyAuthorization",
+ ProxyAuthorizationPolicy.class);
mapElementToJaxbProperty(element, bean,
- new QName(HTTP_NS, "authorization"), "authorization",
- AuthorizationPolicy.class, AuthorizationPolicy.class.getPackage().getName());
+ new QName(HTTP_NS, "authorization"), "authorization",
+ AuthorizationPolicy.class);
// DEPRECATED: This element is deprecated in favor of tlsClientParameters
mapElementToJaxbProperty(element, bean,
- new QName(HTTP_NS, "sslClient"), "sslClient",
- SSLClientPolicy.class, SSLClientPolicy.class.getPackage().getName());
+ new QName(HTTP_NS, "sslClient"), "sslClient",
+ SSLClientPolicy.class);
mapSpecificElements(element, bean);
}
@@ -109,7 +111,7 @@
// the configured TLSClientParameters into the HTTPConduit.
JAXBContext context = null;
try {
- context = JAXBContext.newInstance(getJaxbPackage(),
+ context = JAXBContext.newInstance(TLSClientParametersType.class.getPackage().getName(),
getClass().getClassLoader());
Unmarshaller u = context.createUnmarshaller();
JAXBElement<TLSClientParametersType> jaxb =
@@ -185,11 +187,6 @@
+ "' requires at least one of the "
+ "\"bean\" or \"class\" attributes.");
}
- }
-
- @Override
- protected String getJaxbPackage() {
- return "org.apache.cxf.transports.http.configuration";
}
@Override
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=544502&r1=544501&r2=544502
==============================================================================
--- 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 Tue Jun 5 07:29:30 2007
@@ -35,6 +35,7 @@
import org.apache.cxf.configuration.security.TLSServerParametersType;
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
+import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
public class HttpDestinationBeanDefinitionParser extends AbstractBeanDefinitionParser {
@@ -44,14 +45,15 @@
@Override
public void doParse(Element element, BeanDefinitionBuilder bean) {
bean.setAbstract(true);
- mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "server"), "server");
+ mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "server"), "server",
+ HTTPServerPolicy.class);
// DEPRECATED: This element is deprecated in favor of tlsServerParameters.
- mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "sslServer"), "sslServer",
- SSLServerPolicy.class, SSLServerPolicy.class.getPackage().getName());
+ mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "sslServer"), "sslServer",
+ SSLServerPolicy.class);
- mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "authorization"), "authorization",
- AuthorizationPolicy.class, AuthorizationPolicy.class.getPackage().getName());
+ mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "authorization"), "authorization",
+ AuthorizationPolicy.class);
mapSpecificElements(element, bean);
}
@@ -108,11 +110,6 @@
} catch (Exception e) {
throw new RuntimeException("Could not process configuration.", e);
}
- }
-
- @Override
- protected String getJaxbPackage() {
- return "org.apache.cxf.transports.http.configuration";
}
@Override
Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Tue Jun 5 07:29:30 2007
@@ -32,10 +32,6 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <properties>
- <spring.validation.mode>VALIDATION_NONE</spring.validation.mode>
- </properties>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java Tue Jun 5 07:29:30 2007
@@ -46,11 +46,6 @@
mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "sessionPool"), "sessionPool",
SessionPoolType.class);
}
-
- @Override
- protected String getJaxbPackage() {
- return "org.apache.cxf.transport.jms";
- }
@Override
protected Class getBeanClass(Element arg0) {
Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java Tue Jun 5 07:29:30 2007
@@ -46,11 +46,6 @@
mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "sessionPool"), "sessionPool",
SessionPoolType.class);
}
-
- @Override
- protected String getJaxbPackage() {
- return "org.apache.cxf.transport.jms";
- }
@Override
protected Class getBeanClass(Element arg0) {
Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas Tue Jun 5 07:29:30 2007
@@ -1 +1,2 @@
http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd
+http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd
Added: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd?view=auto&rev=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd Tue Jun 5 07:29:30 2007
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jms="http://cxf.apache.org/transports/jms"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+ targetNamespace="http://cxf.apache.org/transports/jms"
+ elementFormDefault="qualified" jaxb:version="2.0">
+
+ <xs:include schemaLocation="http://cxf.apache.org/schemas/wsdl/jms.xsd"/>
+ <!--
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
+ -->
+ <xs:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+ <xs:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+
+ <xs:element name="destination">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="beans:identifiedType">
+ <xs:sequence>
+ <xs:element name="serverConfig" type="jms:ServerConfig" minOccurs="0"/>
+ <xs:element name="runtimePolicy" type="jms:ServerBehaviorPolicyType" minOccurs="0"/>
+ <xs:element name="sessionPool" type="jms:SessionPoolType" minOccurs="0"/>
+ <xs:element name="address" type="jms:AddressType" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="conduit">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="beans:identifiedType">
+ <xs:sequence>
+ <xs:element name="clientConfig" type="jms:ClientConfig" minOccurs="0"/>
+ <xs:element name="runtimePolicy" type="jms:ClientBehaviorPolicyType" minOccurs="0"/>
+ <xs:element name="sessionPool" type="jms:SessionPoolType" minOccurs="0"/>
+ <xs:element name="address" type="jms:AddressType" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
Propchange: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd Tue Jun 5 07:29:30 2007
@@ -26,10 +26,6 @@
<xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
- <!-- Spring elements -->
- <xs:element name="conduit" type="jms:ConduitType"/>
- <xs:element name="destination" type="jms:DestinationType"/>
-
<!-- Valid wsdl elements -->
<xs:element name="client" type="jms:ClientBehaviorPolicyType"/>
<xs:element name="server" type="jms:ServerBehaviorPolicyType"/>
@@ -37,27 +33,6 @@
<xs:element name="serverConfig" type="jms:ServerConfig"/>
<xs:element name="address" type="jms:AddressType"/>
- <!-- Abstract Types -->
- <xs:complexType name="DestinationType">
- <xs:sequence>
- <xs:element name="serverConfig" type="jms:ServerConfig" minOccurs="0"/>
- <xs:element name="runtimePolicy" type="jms:ServerBehaviorPolicyType" minOccurs="0"/>
- <xs:element name="sessionPool" type="jms:SessionPoolType" minOccurs="0"/>
- <xs:element name="address" type="jms:AddressType" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="ConduitType">
- <xs:sequence>
- <xs:element name="clientConfig" type="jms:ClientConfig" minOccurs="0"/>
- <xs:element name="runtimePolicy" type="jms:ClientBehaviorPolicyType" minOccurs="0"/>
- <xs:element name="sessionPool" type="jms:SessionPoolType" minOccurs="0"/>
- <xs:element name="address" type="jms:AddressType" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:string"/>
- </xs:complexType>
-
<xs:complexType name="SessionPoolType">
<xs:annotation>
<xs:documentation>JMS Session pool configuration policy</xs:documentation>
Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Tue Jun 5 07:29:30 2007
@@ -46,7 +46,7 @@
// setup the new bus to get the configuration file
SpringBusFactory bf = new SpringBusFactory();
BusFactory.setDefaultBus(null);
- bus = bf.createBus("/wsdl/jms_test_config.xml");
+ bus = bf.createBus("/jms_test_config.xml");
BusFactory.setDefaultBus(bus);
setupServiceInfo("http://cxf.apache.org/jms_conf_test",
"/wsdl/jms_test_no_addr.wsdl",
Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Tue Jun 5 07:29:30 2007
@@ -95,7 +95,7 @@
public void testGetConfigurationFromSpring() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
BusFactory.setDefaultBus(null);
- bus = bf.createBus("/wsdl/jms_test_config.xml");
+ bus = bf.createBus("/jms_test_config.xml");
BusFactory.setDefaultBus(bus);
setupServiceInfo("http://cxf.apache.org/jms_conf_test",
"/wsdl/jms_test_no_addr.wsdl",
Added: incubator/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml?view=auto&rev=544502
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml Tue Jun 5 07:29:30 2007
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ct="http://cxf.apache.org/configuration/types"
+ xmlns:jms="http://cxf.apache.org/transports/jms"
+ xsi:schemaLocation="
+http://cxf.apache.org/transports/jms http://cxf.apache.org/schemas/configuration/jms.xsd
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <jms:conduit name="{http://cxf.apache.org/jms_conf_test}HelloWorldQueueBinMsgPort.jms-conduit">
+ <jms:clientConfig clientReceiveTimeout="500" messageTimeToLive="500"/>
+ <jms:runtimePolicy messageType="binary"/>
+ <jms:sessionPool lowWaterMark="10" highWaterMark="5000"/>
+ <jms:address
+ destinationStyle="queue"
+ jndiConnectionFactoryName="MockConnectionFactory"
+ jndiDestinationName="myOwnDestination"
+ jndiReplyDestinationName="myOwnReplyDestination"
+ connectionUserName="testUser"
+ connectionPassword="testPassword">
+ <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.cxf.transport.jms.MockInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61616"/>
+ </jms:address>
+ </jms:conduit>
+
+ <jms:destination name="{http://cxf.apache.org/jms_conf_test}HelloWorldQueueBinMsgPort.jms-destination">
+ <jms:serverConfig
+ messageTimeToLive="500"
+ durableSubscriptionClientId="test-server-id"/>
+ <jms:runtimePolicy
+ messageSelector="cxf_message_selector"
+ useMessageIDAsCorrelationID="true"
+ transactional="true"
+ durableSubscriberName="cxf_subscriber"/>
+ <jms:sessionPool
+ lowWaterMark="10"
+ highWaterMark="5000"/>
+ <jms:address
+ destinationStyle="queue"
+ jndiConnectionFactoryName="MockConnectionFactory"
+ jndiDestinationName="myOwnDestination"
+ jndiReplyDestinationName="myOwnReplyDestination"
+ connectionUserName="testUser"
+ connectionPassword="testPassword">
+ <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.cxf.transport.jms.MockInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61616"/>
+ </jms:address>
+ </jms:destination>
+
+ <jms:destination name="{http://cxf.apache.org/hello_world_jms}HelloWorldPubSubPort.jms-destination">
+ <jms:serverConfig
+ messageTimeToLive="500"
+ durableSubscriptionClientId="test-server-id"/>
+ <jms:runtimePolicy
+ durableSubscriberName="cxf_subscriber"/>
+ <jms:sessionPool
+ lowWaterMark="10"
+ highWaterMark="5000"/>
+ </jms:destination>
+
+</beans>
Propchange: incubator/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java Tue Jun 5 07:29:30 2007
@@ -44,8 +44,7 @@
mapElementToJaxbProperty(element, bean,
new QName("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", "RMAssertion"),
"RMAssertion",
- null,
- RMAssertion.class.getPackage().getName());
+ RMAssertion.class);
ctx.getDelegate().parsePropertyElements(element, bean.getBeanDefinition());
Modified: incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java?view=diff&rev=544502&r1=544501&r2=544502
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java (original)
+++ incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java Tue Jun 5 07:29:30 2007
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.ws.rm;
-import java.io.IOException;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
@@ -621,7 +620,7 @@
}
@Test
- public void testScheduleSequenceTermination() throws SequenceFault, IOException {
+ public void testScheduleSequenceTermination() throws SequenceFault {
Timer timer = new Timer();
setUpDestination(timer);