Author: dkulp
Date: Tue Jan 24 14:37:42 2012
New Revision: 1235270
URL: http://svn.apache.org/viewvc?rev=1235270&view=rev
Log:
Resolve binding split package issue
Added:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java
(contents, props changed)
- copied, changed from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
(contents, props changed)
- copied, changed from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingConfiguration.java
(contents, props changed)
- copied, changed from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingConfiguration.java
cxf/trunk/api/src/main/java/org/apache/cxf/binding/Messages.properties
(contents, props changed)
- copied, changed from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/Messages.properties
cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java
(contents, props changed)
- copied, changed from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLBindingFactory.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
(contents, props changed)
- copied, changed from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java
Removed:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingConfiguration.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/Messages.properties
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLBindingFactory.java
Modified:
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Copied:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java
(from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java&r1=1235269&r2=1235270&rev=1235270&view=diff
==============================================================================
(empty)
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBaseBindingFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
(from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java&r1=1235269&r2=1235270&rev=1235270&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
(original)
+++
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
Tue Jan 24 14:37:42 2012
@@ -35,7 +35,6 @@ import org.apache.cxf.service.model.Abst
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.wsdl11.WSDLBindingFactory;
import static org.apache.cxf.helpers.CastUtils.cast;
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingConfiguration.java
(from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingConfiguration.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingConfiguration.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingConfiguration.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingConfiguration.java&r1=1235269&r2=1235270&rev=1235270&view=diff
==============================================================================
(empty)
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/api/src/main/java/org/apache/cxf/binding/Messages.properties
(from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/Messages.properties)
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/binding/Messages.properties?p2=cxf/trunk/api/src/main/java/org/apache/cxf/binding/Messages.properties&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/Messages.properties&r1=1235269&r2=1235270&rev=1235270&view=diff
==============================================================================
(empty)
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/Messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/Messages.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java
(from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLBindingFactory.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLBindingFactory.java&r1=1235269&r2=1235270&rev=1235270&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLBindingFactory.java
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java
Tue Jan 24 14:37:42 2012
@@ -17,11 +17,10 @@
* under the License.
*/
-package org.apache.cxf.wsdl11;
+package org.apache.cxf.binding;
import javax.wsdl.Binding;
-import org.apache.cxf.binding.BindingFactory;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.ServiceInfo;
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/api/src/main/java/org/apache/cxf/binding/WSDLBindingFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java?rev=1235270&r1=1235269&r2=1235270&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
(original)
+++
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
Tue Jan 24 14:37:42 2012
@@ -32,10 +32,10 @@ import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.binding.BindingFactoryManagerImpl;
import org.apache.cxf.binding.soap.model.SoapBindingInfo;
import org.apache.cxf.binding.soap.model.SoapBodyInfo;
import org.apache.cxf.binding.soap.model.SoapOperationInfo;
+import org.apache.cxf.bus.managers.BindingFactoryManagerImpl;
import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.service.model.BindingInfo;
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=1235270&r1=1235269&r2=1235270&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 14:37:42 2012
@@ -23,9 +23,9 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.binding.BindingFactoryManagerImpl;
import org.apache.cxf.bus.BusState;
import org.apache.cxf.bus.CXFBusImpl;
+import org.apache.cxf.bus.managers.BindingFactoryManagerImpl;
import org.apache.cxf.bus.managers.ConduitInitiatorManagerImpl;
import org.apache.cxf.bus.managers.DestinationFactoryManagerImpl;
import org.apache.cxf.common.util.SystemPropertyAction;
Copied:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
(from r1235269,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java&r1=1235269&r2=1235270&rev=1235270&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
Tue Jan 24 14:37:42 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.binding;
+package org.apache.cxf.bus.managers;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -32,6 +32,9 @@ import javax.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
+import org.apache.cxf.binding.AbstractBindingFactory;
+import org.apache.cxf.binding.BindingFactory;
+import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.injection.NoJSR250Annotations;
Propchange:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1235270&r1=1235269&r2=1235270&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Tue Jan 24 14:37:42 2012
@@ -57,6 +57,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactory;
+import org.apache.cxf.binding.WSDLBindingFactory;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.helpers.CastUtils;
