Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java (original) +++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java Sat Jan 27 14:40:15 2007 @@ -25,10 +25,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; -import java.util.List; import java.util.SimpleTimeZone; import java.util.TimeZone; import java.util.concurrent.Executor; @@ -44,7 +42,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.configuration.ConfigurationProvider; +import org.apache.cxf.configuration.Configurable; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.io.AbstractCachedOutputStream; import org.apache.cxf.message.Message; @@ -64,7 +62,7 @@ -public class JMSDestination extends JMSTransportBase implements Destination { +public class JMSDestination extends JMSTransportBase implements Destination, Configurable { static final Logger LOG = LogUtils.getL7dLogger(JMSDestination.class); final EndpointReferenceType reference; final ConduitInitiator conduitInitiator; @@ -84,8 +82,7 @@ address.setValue(endpointInfo.getAddress()); reference.setAddress(address); } - - @Override + public String getBeanName() { return endpointInfo.getName().toString() + ".jms-destination-base"; } @@ -261,41 +258,24 @@ private void initConfig() { - final class JMSDestinationConfiguration extends JMSDestinationConfigBean { + final class JMSDestinationConfiguration extends JMSDestinationConfigBean implements Configurable { - @Override public String getBeanName() { return endpointInfo.getName().toString() + ".jms-destination"; } } + JMSDestinationConfigBean bean = new JMSDestinationConfiguration(); + + bean.setServer(endpointInfo.getTraversedExtensor(new JMSServerBehaviorPolicyType(), + JMSServerBehaviorPolicyType.class)); + bean.setServerConfig(endpointInfo.getTraversedExtensor(new JMSServerConfig(), JMSServerConfig.class)); + Configurer configurer = bus.getExtension(Configurer.class); if (null != configurer) { configurer.configureBean(bean); } - if (!bean.isSetServer()) { - bean.setServer(new JMSServerBehaviorPolicyType()); - } - if (!bean.isSetServerConfig()) { - bean.setServerConfig(new JMSServerConfig()); - } - - ConfigurationProvider p = new ServiceModelJMSConfigurationProvider(endpointInfo); - List<ConfigurationProvider> providers = getOverwriteProviders(); - if (null == providers) { - providers = new ArrayList<ConfigurationProvider>(); - } - providers.add(p); - setOverwriteProviders(providers); - - providers = bean.getOverwriteProviders(); - if (null == providers) { - providers = new ArrayList<ConfigurationProvider>(); - } - providers.add(p); - bean.setOverwriteProviders(providers); - jmsDestinationConfigBean = bean; }
Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java (original) +++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java Sat Jan 27 14:40:15 2007 @@ -54,17 +54,15 @@ public JMSTransportBase(Bus b, EndpointInfo endpoint, boolean isServer) { bus = b; endpointInfo = endpoint; - + + setAddressPolicy(endpointInfo.getTraversedExtensor(new JMSAddressPolicyType(), + JMSAddressPolicyType.class)); + setSessionPoolConfig(endpointInfo.getTraversedExtensor(new JMSSessionPoolConfigPolicy(), + JMSSessionPoolConfigPolicy.class)); + Configurer configurer = bus.getExtension(Configurer.class); if (null != configurer) { configurer.configureBean(this); - } - - if (!isSetSessionPoolConfig()) { - setSessionPoolConfig(new JMSSessionPoolConfigPolicy()); - } - if (!isSetAddressPolicy()) { - setAddressPolicy(new JMSAddressPolicyType()); } } Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-conduit.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-conduit.xsd?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-conduit.xsd (original) +++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-conduit.xsd Sat Jan 27 14:40:15 2007 @@ -24,10 +24,8 @@ xmlns:jms="http://cxf.apache.org/transports/jms"; xmlns:jms-conf="http://cxf.apache.org/transports/jms/jms-conf"; xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; - xmlns:cfg="http://cxf.apache.org/configuration/cfg"; elementFormDefault="qualified" attributeFormDefault="unqualified" - jaxb:extensionBindingPrefixes="cfg" jaxb:version="2.0"> <xs:import namespace="http://cxf.apache.org/transports/jms"; schemaLocation="../wsdl/jms.xsd"/> @@ -36,12 +34,7 @@ <xs:element name="clientConfig" type="jms-conf:JMSClientConfig"/> <xs:element name="client" type="jms:JMSClientBehaviorPolicyType"/> - <xs:complexType name="JMSConduitConfigBean"> - <xs:annotation> - <xs:appinfo> - <cfg:configurable/> - </xs:appinfo> - </xs:annotation> + <xs:complexType name="JMSConduitConfigBean"> <xs:sequence> <xs:element ref="tns:clientConfig" minOccurs="0"/> <xs:element ref="tns:client" minOccurs="0"/> Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-destination.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-destination.xsd?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-destination.xsd (original) +++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-destination.xsd Sat Jan 27 14:40:15 2007 @@ -24,10 +24,8 @@ xmlns:jms="http://cxf.apache.org/transports/jms"; xmlns:jms-conf="http://cxf.apache.org/transports/jms/jms-conf"; xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; - xmlns:cfg="http://cxf.apache.org/configuration/cfg"; elementFormDefault="qualified" attributeFormDefault="unqualified" - jaxb:extensionBindingPrefixes="cfg" jaxb:version="2.0"> <xs:import namespace="http://cxf.apache.org/transports/jms"; schemaLocation="../wsdl/jms.xsd"/> @@ -36,12 +34,7 @@ <xs:element name="serverConfig" type="jms-conf:JMSServerConfig"/> <xs:element name="server" type="jms:JMSServerBehaviorPolicyType"/> - <xs:complexType name="JMSDestinationConfigBean"> - <xs:annotation> - <xs:appinfo> - <cfg:configurable/> - </xs:appinfo> - </xs:annotation> + <xs:complexType name="JMSDestinationConfigBean"> <xs:sequence> <xs:element ref="tns:serverConfig" minOccurs="0"/> <xs:element ref="tns:server" minOccurs="0"/> Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-transport-base.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-transport-base.xsd?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-transport-base.xsd (original) +++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/jms-transport-base.xsd Sat Jan 27 14:40:15 2007 @@ -24,10 +24,8 @@ xmlns:jms="http://cxf.apache.org/transports/jms"; xmlns:jms-conf="http://cxf.apache.org/transports/jms/jms-conf"; xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; - xmlns:cfg="http://cxf.apache.org/configuration/cfg"; elementFormDefault="qualified" attributeFormDefault="unqualified" - jaxb:extensionBindingPrefixes="cfg" jaxb:version="2.0"> <xs:import namespace="http://cxf.apache.org/transports/jms"; schemaLocation="../wsdl/jms.xsd"/> @@ -36,12 +34,7 @@ <xs:element name="sessionPoolConfig" type="jms-conf:JMSSessionPoolConfigPolicy"/> <xs:element name="addressPolicy" type="jms:JMSAddressPolicyType"/> - <xs:complexType name="JMSTransportBaseConfigBean"> - <xs:annotation> - <xs:appinfo> - <cfg:configurable/> - </xs:appinfo> - </xs:annotation> + <xs:complexType name="JMSTransportBaseConfigBean"> <xs:sequence> <xs:element ref="tns:sessionPoolConfig" minOccurs="0"/> <xs:element ref="tns:addressPolicy" minOccurs="0"/> Modified: incubator/cxf/trunk/rt/ws/rm/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/pom.xml?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/rt/ws/rm/pom.xml (original) +++ incubator/cxf/trunk/rt/ws/rm/pom.xml Sat Jan 27 14:40:15 2007 @@ -139,7 +139,6 @@ <extension>true</extension> <extensionArgs> <extensionArg>-Xdv</extensionArg> - <extensionArg>-Xcfg</extensionArg> </extensionArgs>` </xsdOption> </xsdOptions> @@ -150,11 +149,6 @@ </execution> </executions> <dependencies> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-tools-xjc-cfg</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-tools-xjc-dv</artifactId> Modified: incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd (original) +++ incubator/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd Sat Jan 27 14:40:15 2007 @@ -23,10 +23,8 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; - xmlns:cfg="http://cxf.apache.org/configuration/cfg"; elementFormDefault="qualified" attributeFormDefault="unqualified" - jaxb:extensionBindingPrefixes="cfg" jaxb:version="2.0"> <xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"; schemaLocation="wsrm-policy.xsd"/> @@ -191,12 +189,7 @@ <xs:element name="sourcePolicy" type="tns:SourcePolicyType"/> <xs:element name="destinationPolicy" type="tns:DestinationPolicyType"/> - <xs:complexType name="RMManagerConfigBean"> - <xs:annotation> - <xs:appinfo> - <cfg:configurable/> - </xs:appinfo> - </xs:annotation> + <xs:complexType name="RMManagerConfigBean"> <xs:sequence> <xs:element ref="wsrmp:RMAssertion" minOccurs="0"/> <xs:element ref="tns:deliveryAssurance" minOccurs="0"/> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java Sat Jan 27 14:40:15 2007 @@ -45,7 +45,7 @@ private final QName portName = new QName("http://apache.org/hello_world_doc_lit_bare";, "SoapPort"); public void setUp() { - System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.cxf.CXFBusFactory"); + System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.CXFBusFactory"); } public static Test suite() throws Exception { @@ -63,7 +63,7 @@ assertNotNull("WSDL is null", wsdl); SOAPService service = new SOAPService(wsdl, serviceName); - assertNotNull("Service is ull ", service); + assertNotNull("Service is null", service); PutLastTradedPricePortType putLastTradedPrice = service.getPort(portName, PutLastTradedPricePortType.class); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java Sat Jan 27 14:40:15 2007 @@ -33,7 +33,7 @@ protected void run() { - System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.cxf.CXFBusFactory"); + System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.CXFBusFactory"); Object implementor = new PutLastTradedPriceImpl(); String address = "http://localhost:9107/SOAPDocLitBareService/SoapPort";; Endpoint ep = Endpoint.create(implementor); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java Sat Jan 27 14:40:15 2007 @@ -25,7 +25,7 @@ import junit.framework.TestCase; import org.apache.cxf.Bus; -import org.apache.cxf.bus.cxf.CXFBusFactory; +import org.apache.cxf.bus.CXFBusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.management.InstrumentationManager; Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/wsa_interceptors.xml Sat Jan 27 14:40:15 2007 @@ -28,7 +28,7 @@ <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. --> - <bean id="cxf" class="org.apache.cxf.bus.spring.SpringBusImpl"> + <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"> <property name="inInterceptors"> <list> <ref bean="mapAggregator"/> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml Sat Jan 27 14:40:15 2007 @@ -38,7 +38,7 @@ <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. --> - <bean id="cxf" class="org.apache.cxf.bus.spring.SpringBusImpl"> + <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"> <property name="inInterceptors"> <list> <ref bean="mapAggregator"/> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml Sat Jan 27 14:40:15 2007 @@ -38,7 +38,7 @@ <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. --> - <bean id="cxf" class="org.apache.cxf.bus.spring.SpringBusImpl"> + <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"> <property name="inInterceptors"> <list> <ref bean="mapAggregator"/> Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/rminterceptors.xml Sat Jan 27 14:40:15 2007 @@ -36,7 +36,7 @@ <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. --> - <bean id="cxf" class="org.apache.cxf.bus.spring.SpringBusImpl"> + <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"> <property name="inInterceptors"> <list> <ref bean="mapAggregator"/> Modified: incubator/cxf/trunk/tools/xjc/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/pom.xml?view=diff&rev=500649&r1=500648&r2=500649 ============================================================================== --- incubator/cxf/trunk/tools/xjc/pom.xml (original) +++ incubator/cxf/trunk/tools/xjc/pom.xml Sat Jan 27 14:40:15 2007 @@ -37,8 +37,6 @@ <modules> <module>dv</module> - <module>cfg</module> - <module>cfg-test</module> <module>dv-test</module> </modules> </project>
