Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 80655 invoked from network); 20 Aug 2007 22:07:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Aug 2007 22:07:36 -0000 Received: (qmail 56841 invoked by uid 500); 20 Aug 2007 22:07:33 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 56831 invoked by uid 500); 20 Aug 2007 22:07:33 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 56822 invoked by uid 99); 20 Aug 2007 22:07:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Aug 2007 15:07:33 -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; Mon, 20 Aug 2007 22:07:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 872E61A981A; Mon, 20 Aug 2007 15:07:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r567850 - in /incubator/abdera/java/trunk/spring/src: main/java/org/apache/abdera/spring/ test/java/org/apache/abdera/spring/ Date: Mon, 20 Aug 2007 22:07:14 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070820220715.872E61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Mon Aug 20 15:07:13 2007 New Revision: 567850 URL: http://svn.apache.org/viewvc?rev=567850&view=rev Log: Some cleanups Modified: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ServiceContextDefinitionParser.java incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestProvider.java Modified: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java?rev=567850&r1=567849&r2=567850&view=diff ============================================================================== --- incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java (original) +++ incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/AbstractSingleBeanDefinitionParser.java Mon Aug 20 15:07:13 2007 @@ -18,10 +18,8 @@ */ package org.apache.abdera.spring; -import org.apache.abdera.protocol.server.impl.SingletonProviderManager; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; -import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate; import org.springframework.beans.factory.xml.ParserContext; Modified: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ServiceContextDefinitionParser.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ServiceContextDefinitionParser.java?rev=567850&r1=567849&r2=567850&view=diff ============================================================================== --- incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ServiceContextDefinitionParser.java (original) +++ incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ServiceContextDefinitionParser.java Mon Aug 20 15:07:13 2007 @@ -18,23 +18,14 @@ */ package org.apache.abdera.spring; -import org.w3c.dom.Attr; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.apache.abdera.protocol.server.ServiceContext; import org.apache.abdera.protocol.server.impl.DefaultServiceContext; import org.apache.abdera.protocol.server.impl.SingletonProviderManager; import org.springframework.beans.factory.BeanDefinitionStoreException; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; -import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate; import org.springframework.beans.factory.xml.ParserContext; +import org.w3c.dom.Element; public class ServiceContextDefinitionParser extends org.apache.abdera.spring.AbstractSingleBeanDefinitionParser { Modified: incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java?rev=567850&r1=567849&r2=567850&view=diff ============================================================================== --- incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java (original) +++ incubator/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/SpringAbderaServlet.java Mon Aug 20 15:07:13 2007 @@ -18,6 +18,7 @@ package org.apache.abdera.spring; import org.apache.abdera.protocol.server.ServiceContext; +import org.apache.abdera.protocol.server.servlet.AbderaServlet; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -27,8 +28,11 @@ * This can be overridden by supplying the "serviceContextBeanName" initialization * parameter. */ -public class SpringAbderaServlet extends org.apache.abdera.protocol.server.servlet.AbderaServlet { +public class SpringAbderaServlet + extends AbderaServlet { + private static final long serialVersionUID = -7579564455804753809L; + protected ServiceContext createServiceContext() { String contextName = getInitParameter("serviceContextBeanName"); if (contextName == null) { Modified: incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestProvider.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestProvider.java?rev=567850&r1=567849&r2=567850&view=diff ============================================================================== --- incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestProvider.java (original) +++ incubator/abdera/java/trunk/spring/src/test/java/org/apache/abdera/spring/TestProvider.java Mon Aug 20 15:07:13 2007 @@ -1,6 +1,5 @@ package org.apache.abdera.spring; -import org.apache.abdera.protocol.server.Provider; import org.apache.abdera.protocol.server.RequestContext; import org.apache.abdera.protocol.server.ResponseContext; import org.apache.abdera.protocol.server.impl.AbstractProvider;