Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 25272 invoked from network); 31 Oct 2007 12:45:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Oct 2007 12:45:39 -0000 Received: (qmail 97919 invoked by uid 500); 31 Oct 2007 12:45:27 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 97804 invoked by uid 500); 31 Oct 2007 12:45:26 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 97795 invoked by uid 99); 31 Oct 2007 12:45:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Oct 2007 05:45:26 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Oct 2007 12:45:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F5671A9832; Wed, 31 Oct 2007 05:45:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r590652 - in /incubator/cxf/branches/2.0.x-fixes: rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ tools/common/ Date: Wed, 31 Oct 2007 12:45:13 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071031124514.4F5671A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ cxf-api ${project.version} + + org.apache.cxf + cxf-rt-core + ${project.version} + org.apache.cxf