You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/24 01:49:16 UTC
svn commit: r1235082 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/transport/
rt/core/src/main/java/org/apache/cxf/bus/extension/
rt/core/src/main/java/org/apache/cxf/bus/managers/
rt/core/src/main/java/org/apache/cxf/transport/
Author: dkulp
Date: Tue Jan 24 00:49:15 2012
New Revision: 1235082
URL: http://svn.apache.org/viewvc?rev=1235082&view=rev
Log:
Resolve transport split package between api and core
Added:
cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractConduit.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/HttpUriMapper.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportFinder.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/Messages.properties (contents, props changed)
- copied, changed from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/Messages.properties
Removed:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/Messages.properties
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractConduit.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractConduit.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractConduit.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractConduit.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractConduit.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractObservable.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java Tue Jan 24 00:49:15 2012
@@ -42,7 +42,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseChainCache;
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.model.EndpointInfo;
public class ChainInitiationObserver implements MessageObserver {
@@ -159,7 +158,7 @@ public class ChainInitiationObserver imp
if (exchange.getDestination() == null) {
exchange.setDestination(m.getDestination());
}
- if (endpoint != null && (endpoint.getService() instanceof ServiceImpl)) {
+ if (endpoint != null && endpoint.getService() != null) {
EndpointInfo endpointInfo = endpoint.getEndpointInfo();
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/HttpUriMapper.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/HttpUriMapper.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/HttpUriMapper.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportFinder.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportFinder.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportFinder.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/TransportFinder.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportFinder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportFinder.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java?rev=1235082&r1=1235081&r2=1235082&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java Tue Jan 24 00:49:15 2012
@@ -26,6 +26,8 @@ import org.apache.cxf.binding.BindingFac
import org.apache.cxf.binding.BindingFactoryManagerImpl;
import org.apache.cxf.bus.BusState;
import org.apache.cxf.bus.CXFBusImpl;
+import org.apache.cxf.bus.managers.ConduitInitiatorManagerImpl;
+import org.apache.cxf.bus.managers.DestinationFactoryManagerImpl;
import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.configuration.ConfiguredBeanLocator;
import org.apache.cxf.configuration.Configurer;
@@ -37,9 +39,7 @@ import org.apache.cxf.resource.ResourceM
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.resource.SinglePropertyResolver;
import org.apache.cxf.transport.ConduitInitiatorManager;
-import org.apache.cxf.transport.ConduitInitiatorManagerImpl;
import org.apache.cxf.transport.DestinationFactoryManager;
-import org.apache.cxf.transport.DestinationFactoryManagerImpl;
/**
* This bus uses CXF's built in extension manager to load components
Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManagerImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManagerImpl.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java Tue Jan 24 00:49:15 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.transport;
+package org.apache.cxf.bus.managers;
import java.util.Map;
@@ -35,6 +35,9 @@ import org.apache.cxf.common.i18n.Bundle
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.configuration.spring.MapProvider;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.TransportFinder;
@NoJSR250Annotations(unlessNull = "bus")
public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManager {
Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManagerImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManagerImpl.java&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java Tue Jan 24 00:49:15 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.transport;
+package org.apache.cxf.bus.managers;
import java.util.Map;
import java.util.Properties;
@@ -34,6 +34,9 @@ import org.apache.cxf.common.i18n.Bundle
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.configuration.spring.MapProvider;
+import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.transport.TransportFinder;
@NoJSR250Annotations(unlessNull = "bus")
public final class DestinationFactoryManagerImpl implements DestinationFactoryManager {
Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/Messages.properties (from r1234954, cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/Messages.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/Messages.properties?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/Messages.properties&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/Messages.properties&r1=1234954&r2=1235082&rev=1235082&view=diff
==============================================================================
(empty)
Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/Messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/Messages.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain