Author: dkulp
Date: Wed Oct 31 05:45:12 2007
New Revision: 590652
URL: http://svn.apache.org/viewvc?rev=590652&view=rev
Log:
Fix build failures from latest set of merges
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
incubator/cxf/branches/2.0.x-fixes/tools/common/pom.xml
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java?rev=590652&r1=590651&r2=590652&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
Wed Oct 31 05:45:12 2007
@@ -77,6 +77,13 @@
private EndpointReferenceType endpointReference;
private ConduitSelector conduitSelector;
+ protected AbstractEndpointFactory() {
+ }
+
+ protected AbstractEndpointFactory(ReflectionServiceFactoryBean bean) {
+ serviceFactory = bean;
+ }
+
protected Endpoint createEndpoint() throws BusException, EndpointException
{
if (serviceName != null) {
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=590652&r1=590651&r2=590652&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Wed Oct 31 05:45:12 2007
@@ -20,7 +20,6 @@
package org.apache.cxf.service.factory;
import java.io.StringReader;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
@@ -297,9 +296,6 @@
}
ServiceInfo serviceInfo = new ServiceInfo();
- XmlSchemaCollection col = serviceInfo.getXmlSchemaCollection();
- col.getExtReg().registerSerializer(MimeAttribute.class, new
MimeSerializer());
-
ServiceImpl service = new ServiceImpl(serviceInfo);
setService(service);
Modified: incubator/cxf/branches/2.0.x-fixes/tools/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/common/pom.xml?rev=590652&r1=590651&r2=590652&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/common/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/common/pom.xml Wed Oct 31 05:45:12
2007
@@ -76,6 +76,11 @@
<artifactId>cxf-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
