continuum-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Emmanuel Venisse" <emmanuel.veni...@gmail.com>
Subject Re: svn commit: r652404 - in /continuum/trunk/continuum-core/src: main/java/org/apache/maven/continuum/execution/ main/java/org/apache/maven/continuum/execution/maven/m1/ main/resources/META-INF/ main/resources/META-INF/plexus/ test/java/org/apache/m
Date Thu, 01 May 2008 14:16:24 GMT
Carlos,

Would it be better to configure Spring components with Spring annotations
instead of to use the xml file for our components?

Emmanuel

On Thu, May 1, 2008 at 12:48 AM, <carlos@apache.org> wrote:

> Author: carlos
> Date: Wed Apr 30 15:48:32 2008
> New Revision: 652404
>
> URL: http://svn.apache.org/viewvc?rev=652404&view=rev
> Log:
> Configure build executors in Spring
>
> Added:
>
>  continuum/trunk/continuum-core/src/main/resources/META-INF/spring-context.xml
>   (with props)
>
>  continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java
>   (with props)
> Modified:
>
>  continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
>
>  continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
>
>  continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
>
> Modified:
> continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=652404&r1=652403&r2=652404&view=diff
>
> ==============================================================================
> ---
> continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
> (original)
> +++
> continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
> Wed Apr 30 15:48:32 2008
> @@ -128,6 +128,11 @@
>         return workingDirectoryService;
>     }
>
> +    public void setDefaultExecutable( String defaultExecutable )
> +    {
> +        this.defaultExecutable = defaultExecutable;
> +    }
> +
>     //
> ----------------------------------------------------------------------
>     // Component Lifecycle
>     //
> ----------------------------------------------------------------------
>
> Modified:
> continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java?rev=652404&r1=652403&r2=652404&view=diff
>
> ==============================================================================
> ---
> continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
> (original)
> +++
> continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
> Wed Apr 30 15:48:32 2008
> @@ -64,6 +64,11 @@
>         super( ID, true );
>     }
>
> +    public void setMetadataHelper( MavenOneMetadataHelper metadataHelper
> )
> +    {
> +        this.metadataHelper = metadataHelper;
> +    }
> +
>     //
> ----------------------------------------------------------------------
>     // Builder Implementation
>     //
> ----------------------------------------------------------------------
>
> Modified:
> continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=652404&r1=652403&r2=652404&view=diff
>
> ==============================================================================
> ---
> continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
> (original)
> +++
> continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
> Wed Apr 30 15:48:32 2008
> @@ -69,118 +69,6 @@
>       </requirements>
>     </component>
>
> -
> -    <!--
> -     |
> -     | Executors
> -     |
> -     | not using plexus-maven-plugin because configuraton can't be
> configured with default-value
> -     | todo refactor the defaultExecutable local maybe?
> -     |-->
> -    <component>
> -
>  <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
> -      <role-hint>maven2</role-hint>
> -
>  <implementation>org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor</implementation>
> -      <configuration>
> -        <default-executable>mvn</default-executable>
> -      </configuration>
> -      <requirements>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.utils.shell.ShellCommandHelper</role>
> -        </requirement>
> -        <requirement>
> -          <role>org.codehaus.plexus.commandline.ExecutableResolver</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
> -        </requirement>
> -        <requirement>
> -          <role>org.apache.maven.project.MavenProjectHelper</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.installation.InstallationService</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.configuration.ConfigurationService</role>
> -        </requirement>
> -      </requirements>
> -    </component>
> -
> -
> -    <component>
> -
>  <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
> -      <role-hint>maven-1</role-hint>
> -
>  <implementation>org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor</implementation>
> -      <configuration>
> -        <default-executable>maven</default-executable>
> -      </configuration>
> -      <requirements>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.utils.shell.ShellCommandHelper</role>
> -        </requirement>
> -        <requirement>
> -          <role>org.codehaus.plexus.commandline.ExecutableResolver</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.installation.InstallationService</role>
> -        </requirement>
> -      </requirements>
> -    </component>
> -
> -
> -    <component>
> -
>  <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
> -      <role-hint>ant</role-hint>
> -
>  <implementation>org.apache.maven.continuum.execution.ant.AntBuildExecutor</implementation>
> -      <requirements>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.utils.shell.ShellCommandHelper</role>
> -        </requirement>
> -        <requirement>
> -          <role>org.codehaus.plexus.commandline.ExecutableResolver</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.installation.InstallationService</role>
> -        </requirement>
> -      </requirements>
> -      <configuration>
> -        <default-executable>ant</default-executable>
> -      </configuration>
> -    </component>
> -
> -    <component>
> -
>  <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
> -      <role-hint>shell</role-hint>
> -
>  <implementation>org.apache.maven.continuum.execution.shell.ShellBuildExecutor</implementation>
> -      <requirements>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.utils.shell.ShellCommandHelper</role>
> -        </requirement>
> -        <requirement>
> -          <role>org.codehaus.plexus.commandline.ExecutableResolver</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.utils.WorkingDirectoryService</role>
> -        </requirement>
> -        <requirement>
> -
>  <role>org.apache.maven.continuum.installation.InstallationService</role>
> -        </requirement>
> -      </requirements>
> -    </component>
> -
> -
>     <!--
>      |
>      | Build Project Task Queue
>
> Added:
> continuum/trunk/continuum-core/src/main/resources/META-INF/spring-context.xml
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/resources/META-INF/spring-context.xml?rev=652404&view=auto
>
> ==============================================================================
> ---
> continuum/trunk/continuum-core/src/main/resources/META-INF/spring-context.xml
> (added)
> +++
> continuum/trunk/continuum-core/src/main/resources/META-INF/spring-context.xml
> Wed Apr 30 15:48:32 2008
> @@ -0,0 +1,29 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<beans xmlns="http://www.springframework.org/schema/beans"
> +       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> +       xmlns:aop="http://www.springframework.org/schema/aop"
> +       xmlns:util="http://www.springframework.org/schema/util"
> +       xsi:schemaLocation="http://www.springframework.org/schema/beans
> http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
> +               http://www.springframework.org/schema/aop
> http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
> +               http://www.springframework.org/schema/util
> http://www.springframework.org/schema/util/spring-util-2.5.xsd">
> +
> +  <bean name="continuumBuildExecutor#maven2"
> +
> class="org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor"
> autowire="byName">
> +    <property name="defaultExecutable" value="mvn"/>
> +  </bean>
> +  <bean name="continuumBuildExecutor#maven-1"
> +
> class="org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor"
> autowire="byName">
> +    <property name="defaultExecutable" value="maven"/>
> +    <property name="metadataHelper" ref="mavenOneMetadataHelper"/>
> +  </bean>
> +  <bean name="continuumBuildExecutor#ant"
> +
> class="org.apache.maven.continuum.execution.ant.AntBuildExecutor"
> autowire="byName">
> +    <property name="defaultExecutable" value="ant"/>
> +  </bean>
> +  <bean name="continuumBuildExecutor#shell"
> +
> class="org.apache.maven.continuum.execution.shell.ShellBuildExecutor"
> autowire="byName">
> +  </bean>
> +
> +  <bean id="workingDirectoryService"
> class="org.apache.maven.continuum.utils.DefaultWorkingDirectoryService"
> autowire="byName"/>
> +
> +</beans>
>
> Propchange:
> continuum/trunk/continuum-core/src/main/resources/META-INF/spring-context.xml
>
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Propchange:
> continuum/trunk/continuum-core/src/main/resources/META-INF/spring-context.xml
>
> ------------------------------------------------------------------------------
>    svn:keywords = "Author Date Id Revision"
>
> Added:
> continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java?rev=652404&view=auto
>
> ==============================================================================
> ---
> continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java
> (added)
> +++
> continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java
> Wed Apr 30 15:48:32 2008
> @@ -0,0 +1,12 @@
> +package org.apache.maven.continuum.execution.shell;
> +
> +import
> org.apache.maven.continuum.execution.AbstractContinuumBuildExecutorTest;
> +
> +public class ShellBuildExecutorTest
> +    extends AbstractContinuumBuildExecutorTest
> +{
> +    public ShellBuildExecutorTest()
> +    {
> +        executor = new ShellBuildExecutor();
> +    }
> +}
>
> Propchange:
> continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java
>
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Propchange:
> continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutorTest.java
>
> ------------------------------------------------------------------------------
>    svn:keywords = "Author Date Id Revision"
>
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message