You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2008/05/19 07:18:53 UTC
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...
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 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.0</version>
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 @@
<bean id="scmManager"
class="org.apache.continuum.scm.manager.ScmManager">
- <!-- TODO: better way to add the providers without having to redeclare all this? -->
<property name="scmLogger" ref="scmLogger" />
<property name="scmProviders">
- <map>
- <entry key="svnexe">
- <bean
- class="org.apache.maven.scm.provider.svn.svnexe.SvnExeScmProvider" />
- </entry>
- </map>
+ <bean class="org.apache.continuum.scm.manager.spring.ScmProviderFactoryBean"/>
</property>
</bean>
</beans>
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 @@
<bean id="scmManager"
class="org.apache.continuum.scm.manager.ScmManager">
- <!-- TODO: better way to add the providers without having to redeclare all this? -->
<property name="scmLogger" ref="scmLogger" />
<property name="scmProviders">
- <map>
- <entry key="svn">
- <bean
- class="org.apache.maven.scm.provider.svn.svnexe.SvnExeScmProvider" />
- </entry>
- <entry key="bazaar">
- <bean
- class="org.apache.maven.scm.provider.bazaar.BazaarScmProvider" />
- </entry>
- <entry key="clearcase">
- <bean
- class="org.apache.maven.scm.provider.clearcase.ClearCaseScmProvider" />
- </entry>
- <entry key="cvs">
- <bean
- class="org.apache.maven.scm.provider.cvslib.cvsjava.CvsJavaScmProvider" />
- </entry>
- <entry key="cvs_native">
- <bean
- class="org.apache.maven.scm.provider.cvslib.cvsexe.CvsExeScmProvider" />
- </entry>
- <entry key="local">
- <bean
- class="org.apache.maven.scm.provider.local.LocalScmProvider" />
- </entry>
- <entry key="perforce">
- <bean
- class="org.apache.maven.scm.provider.perforce.PerforceScmProvider" />
- </entry>
- <entry key="starteam">
- <bean
- class="org.apache.maven.scm.provider.starteam.StarteamScmProvider" />
- </entry>
- <entry key="synergy">
- <bean
- class="org.apache.maven.scm.provider.synergy.SynergyScmProvider" />
- </entry>
- <entry key="vss">
- <bean
- class="org.apache.maven.scm.provider.vss.VssScmProvider" />
- </entry>
- </map>
+ <bean class="org.apache.continuum.scm.manager.spring.ScmProviderFactoryBean"/>
</property>
</bean>