svn commit: r591201 - in /incubator/cxf/branches/2.0.x-fixes/rt: core/src/main/java/org/apache/cxf/endpoint/ frontend/simple/src/main/java/org/apache/cxf/frontend/

[dkulp]

Author: dkulp
Date: Thu Nov  1 19:58:28 2007
New Revision: 591201

URL: http://svn.apache.org/viewvc?rev=591201&view=rev
Log:
Fix build issues from last svnmerge.py that didn't work very well.  :-(

Added:
    
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
      - copied unchanged from r591175, 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
Modified:
    
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
    
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
    
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java?rev=591201&r1=591200&r2=591201&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
 Thu Nov  1 19:58:28 2007
@@ -24,7 +24,8 @@
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.model.ServiceInfo;
 
-public abstract class AbstractServiceFactory extends AbstractEndpointFactory 
implements ServiceBuilder {
+public abstract class AbstractServiceFactory extends 
AbstractWSDLBasedEndpointFactory 
+    implements ServiceBuilder {
     
     protected AbstractServiceFactory() {
         super();

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?rev=591201&r1=591200&r2=591201&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
 Thu Nov  1 19:58:28 2007
@@ -31,7 +31,7 @@
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 
-public class ClientFactoryBean extends AbstractEndpointFactory {
+public class ClientFactoryBean extends AbstractWSDLBasedEndpointFactory {
     private Client client;
     
     public ClientFactoryBean() {

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=591201&r1=591200&r2=591201&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
 Thu Nov  1 19:58:28 2007
@@ -78,7 +78,7 @@
  * sf.create();
  * </pre>
  */
-public class ServerFactoryBean extends AbstractEndpointFactory {
+public class ServerFactoryBean extends AbstractWSDLBasedEndpointFactory {
     private static final Logger LOG = 
LogUtils.getL7dLogger(ServerFactoryBean.class);
 
     private Server server;