From commits-return-3992-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Mon May 19 05:19:18 2008 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 5324 invoked from network); 19 May 2008 05:19:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 May 2008 05:19:17 -0000 Received: (qmail 56479 invoked by uid 500); 19 May 2008 05:19:18 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 56458 invoked by uid 500); 19 May 2008 05:19:18 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 56447 invoked by uid 99); 19 May 2008 05:19:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 May 2008 22:19:18 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 May 2008 05:18:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6D63323889FA; Sun, 18 May 2008 22:18:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r657723 - in /continuum/trunk: continuum-base/continuum-scm/ continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ continuum-base/con... Date: Mon, 19 May 2008 05:18:53 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080519051853.6D63323889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun May 18 22:18:52 2008 New Revision: 657723 URL: http://svn.apache.org/viewvc?rev=657723&view=rev Log: merge -r653953:657722 from builder branch Added: continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ - copied from r657722, continuum/branches/builder/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ continuum/trunk/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ScmProviderFactoryBean.java - copied unchanged from r657722, continuum/branches/builder/continuum-base/continuum-scm/src/main/java/org/apache/continuum/scm/manager/spring/ScmProviderFactoryBean.java Modified: continuum/trunk/continuum-base/continuum-scm/pom.xml continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java continuum/trunk/continuum-base/continuum-scm/src/test/resources/org/apache/continuum/scm/manager/ScmManagerTest.xml continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml Modified: continuum/trunk/continuum-base/continuum-scm/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/pom.xml?rev=657723&r1=657722&r2=657723&view=diff ============================================================================== --- continuum/trunk/continuum-base/continuum-scm/pom.xml (original) +++ continuum/trunk/continuum-base/continuum-scm/pom.xml Sun May 18 22:18:52 2008 @@ -26,9 +26,13 @@ org.springframework spring-context ${spring.version} - test + org.codehaus.plexus + plexus-spring + test + + org.slf4j slf4j-simple 1.5.0 Modified: continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java?rev=657723&r1=657722&r2=657723&view=diff ============================================================================== --- continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java (original) +++ continuum/trunk/continuum-base/continuum-scm/src/test/java/org/apache/continuum/scm/manager/ScmManagerTest.java Sun May 18 22:18:52 2008 @@ -19,11 +19,11 @@ * under the License. */ +import junit.framework.TestCase; + import org.apache.maven.scm.manager.NoSuchScmProviderException; +import org.codehaus.plexus.spring.PlexusClassPathXmlApplicationContext; import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import junit.framework.TestCase; /** * @todo replace with a spring integration test @@ -38,7 +38,8 @@ public void setUp() { context = - new ClassPathXmlApplicationContext( new String[] { "classpath*:META-INF/spring-context.xml", + new PlexusClassPathXmlApplicationContext( new String[] { "classpath*:META-INF/spring-context.xml", + "classpath*:META-INF/plexus/components.xml", "classpath*:" + getClass().getName().replace( '.', '/' ) + ".xml" } ); manager = (ScmManager) context.getBean( "scmManager" ); } @@ -47,6 +48,6 @@ throws NoSuchScmProviderException { manager.getScmLogger().info( "Hello, World" ); - assertNotNull( manager.getProviderByType( "svnexe" ) ); + assertNotNull( manager.getProviderByType( "svn" ) ); } } Modified: continuum/trunk/continuum-base/continuum-scm/src/test/resources/org/apache/continuum/scm/manager/ScmManagerTest.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-scm/src/test/resources/org/apache/continuum/scm/manager/ScmManagerTest.xml?rev=657723&r1=657722&r2=657723&view=diff ============================================================================== --- continuum/trunk/continuum-base/continuum-scm/src/test/resources/org/apache/continuum/scm/manager/ScmManagerTest.xml (original) +++ continuum/trunk/continuum-base/continuum-scm/src/test/resources/org/apache/continuum/scm/manager/ScmManagerTest.xml Sun May 18 22:18:52 2008 @@ -6,15 +6,9 @@ - - - - - - + Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=657723&r1=657722&r2=657723&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original) +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml Sun May 18 22:18:52 2008 @@ -33,51 +33,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +