continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r743463 - in /continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/release/ continuum-release/src/main/java/org/apache/maven/continuum/release/ continuum-release/src/test/java/org/apache/maven/continuum/release/executors/...
Date Wed, 11 Feb 2009 19:35:34 GMT
Author: evenisse
Date: Wed Feb 11 19:35:33 2009
New Revision: 743463

URL: http://svn.apache.org/viewvc?rev=743463&view=rev
Log:
[CONTINUUM-1505] Add useReleaseProfile, arguments and addSchema parameters

Modified:
    continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
    continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
    continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
    continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_de.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_fr.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_pt_BR.properties
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp

Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
(original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/release/ContinuumReleaseManager.java
Wed Feb 11 19:35:33 2009
@@ -78,7 +78,7 @@
      * @param useReleaseProfile
      * @throws ContinuumReleaseException
      */
-    void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile,
+    void perform( String releaseId, File buildDirectory, String goals, String arguments,
boolean useReleaseProfile,
                   ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException;
 
@@ -93,7 +93,7 @@
      * @param listener
      * @throws ContinuumReleaseException
      */
-    void perform( String releaseId, String workingDirectory, File buildDirectory, String
goals,
+    void perform( String releaseId, String workingDirectory, File buildDirectory, String
goals, String arguments,
                   boolean useReleaseProfile, ContinuumReleaseManagerListener listener )
         throws ContinuumReleaseException;
 
@@ -114,7 +114,7 @@
 
     Map getListeners();
 
-    void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile,
+    void perform( String releaseId, File buildDirectory, String goals, String arguments,
boolean useReleaseProfile,
                   ContinuumReleaseManagerListener listener, LocalRepository repository )
         throws ContinuumReleaseException;
 

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
(original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultContinuumReleaseManager.java
Wed Feb 11 19:35:33 2009
@@ -85,7 +85,7 @@
      */
     private InstallationService installationService;
 
-    private Map listeners;
+    private Map<String, ContinuumReleaseManagerListener> listeners;
 
     /**
      * contains previous release:prepare descriptors; one per project
@@ -133,38 +133,44 @@
         return releaseId;
     }
 
-    public void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile,
-                         ContinuumReleaseManagerListener listener )
+    public void perform( String releaseId, File buildDirectory, String goals, String arguments,
+                         boolean useReleaseProfile, ContinuumReleaseManagerListener listener
)
         throws ContinuumReleaseException
     {
-        perform( releaseId, buildDirectory, goals, useReleaseProfile, listener, null );
+        perform( releaseId, buildDirectory, goals, arguments, useReleaseProfile, listener,
null );
     }
 
-    public void perform( String releaseId, File buildDirectory, String goals, boolean useReleaseProfile,
-                         ContinuumReleaseManagerListener listener, LocalRepository repository
)
+    public void perform( String releaseId, File buildDirectory, String goals, String arguments,
+                         boolean useReleaseProfile, ContinuumReleaseManagerListener listener,
+                         LocalRepository repository )
         throws ContinuumReleaseException
     {
         ReleaseDescriptor descriptor = (ReleaseDescriptor) getPreparedReleases().get( releaseId
);
         if ( descriptor != null )
         {
-            perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener,
repository );
+            perform( releaseId, descriptor, buildDirectory, goals, arguments, useReleaseProfile,
listener, repository );
         }
     }
 
-    public void perform( String releaseId, String workingDirectory, File buildDirectory,
String goals,
+    public void perform( String releaseId, String workingDirectory, File buildDirectory,
String goals, String arguments,
                          boolean useReleaseProfile, ContinuumReleaseManagerListener listener
)
         throws ContinuumReleaseException
     {
         ReleaseDescriptor descriptor = readReleaseDescriptor( workingDirectory );
 
-        perform( releaseId, descriptor, buildDirectory, goals, useReleaseProfile, listener,
null );
+        perform( releaseId, descriptor, buildDirectory, goals, arguments, useReleaseProfile,
listener, null );
     }
 
     private void perform( String releaseId, ReleaseDescriptor descriptor, File buildDirectory,
String goals,
-                          boolean useReleaseProfile, ContinuumReleaseManagerListener listener,
+                          String arguments, boolean useReleaseProfile, ContinuumReleaseManagerListener
listener,
                           LocalRepository repository )
         throws ContinuumReleaseException
     {
+        if ( descriptor != null )
+        {
+            descriptor.setAdditionalArguments( arguments );
+        }
+
         try
         {
             getListeners().put( releaseId, listener );
@@ -230,10 +236,6 @@
         }
 
         Map<String, String> envVars = new HashMap<String, String>();
-        if ( profile == null )
-        {
-            return envVars;
-        }
 
         String javaHome = getJavaHomeValue( profile );
         if ( !StringUtils.isEmpty( javaHome ) )
@@ -272,6 +274,8 @@
         descriptor.setReleaseVersions( relVersions );
         descriptor.setDevelopmentVersions( devVersions );
         descriptor.setPreparationGoals( releaseProperties.getProperty( "prepareGoals" ) );
+        descriptor.setAdditionalArguments( releaseProperties.getProperty( "arguments" ) );
+        descriptor.setAddSchema( Boolean.valueOf( releaseProperties.getProperty( "addSchema"
) ) );
 
         String useEditMode = releaseProperties.getProperty( "useEditMode" );
         if ( BooleanUtils.toBoolean( useEditMode ) )
@@ -299,6 +303,10 @@
         {
             descriptor.setScmCommentPrefix( releaseProperties.getProperty( "commentPrefix"
) );
         }
+        if ( releaseProperties.containsKey( "useReleaseProfile" ) )
+        {
+            descriptor.setUseReleaseProfile( Boolean.valueOf( releaseProperties.getProperty(
"useReleaseProfile" ) ) );
+        }
 
         //forced properties
         descriptor.setInteractive( false );
@@ -327,11 +335,11 @@
         return descriptor;
     }
 
-    public Map getListeners()
+    public Map<String, ContinuumReleaseManagerListener> getListeners()
     {
         if ( listeners == null )
         {
-            listeners = new Hashtable();
+            listeners = new Hashtable<String, ContinuumReleaseManagerListener>();
         }
 
         return listeners;

Modified: continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
(original)
+++ continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/DefaultReleaseManagerListener.java
Wed Feb 11 19:35:33 2009
@@ -34,7 +34,7 @@
 {
     private String goalName;
 
-    private List completedPhases;
+    private List<String> completedPhases;
 
     private String inProgress;
 
@@ -49,7 +49,7 @@
         state = LISTENING;
         goalName = name;
         this.phases = phases;
-        completedPhases = Collections.synchronizedList( new ArrayList() );
+        completedPhases = Collections.synchronizedList( new ArrayList<String>() );
         inProgress = null;
     }
 

Modified: continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
(original)
+++ continuum/trunk/continuum-release/src/test/java/org/apache/maven/continuum/release/executors/ReleaseTaskExecutorTest.java
Wed Feb 11 19:35:33 2009
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import java.io.File;
-
 import org.apache.continuum.release.config.ContinuumReleaseDescriptor;
 import org.apache.maven.continuum.release.ContinuumReleaseManager;
 import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask;
@@ -40,6 +38,8 @@
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
 import org.codehaus.plexus.util.FileUtils;
 
+import java.io.File;
+
 /**
  * @author Edwin Punzalan
  */
@@ -236,16 +236,12 @@
 
     private Task getPrepareTask( String releaseId, ReleaseDescriptor descriptor )
     {
-        Task task = new PrepareReleaseProjectTask( releaseId, descriptor, null );
-
-        return task;
+        return new PrepareReleaseProjectTask( releaseId, descriptor, null );
     }
 
     private Task getPerformTask( String releaseId, ReleaseDescriptor descriptor, File buildDir
)
     {
-        Task task = new PerformReleaseProjectTask( releaseId, descriptor, buildDir, "package",
true, null );
-
-        return task;
+        return new PerformReleaseProjectTask( releaseId, descriptor, buildDir, "package",
true, null );
     }
 
     private ScmRepository getScmRepositorty( String scmUrl )

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
Wed Feb 11 19:35:33 2009
@@ -28,10 +28,15 @@
 import org.apache.maven.continuum.release.ContinuumReleaseManagerListener;
 import org.apache.maven.continuum.release.DefaultReleaseManagerListener;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.shared.release.ReleaseResult;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
+import java.io.FileReader;
 import java.util.List;
 
 /**
@@ -56,9 +61,11 @@
 
     private String scmTagBase;
 
-    private String goals;
+    private String goals = "clean deploy";
 
-    private boolean useReleaseProfile;
+    private String arguments;
+
+    private boolean useReleaseProfile = true;
 
     private ContinuumReleaseManagerListener listener;
 
@@ -70,6 +77,16 @@
 
     private int profileId;
 
+    private void init()
+        throws Exception
+    {
+        Project project = getContinuum().getProject( projectId );
+
+        String workingDirectory = getContinuum().getWorkingDirectory( project.getId() ).getPath();
+
+        getReleasePluginParameters( workingDirectory, "pom.xml" );
+    }
+
     public String inputFromScm()
         throws Exception
     {
@@ -82,6 +99,8 @@
             return REQUIRES_AUTHORIZATION;
         }
 
+        init();
+
         populateFromProject();
 
         releaseId = "";
@@ -103,9 +122,58 @@
             return REQUIRES_AUTHORIZATION;
         }
 
+        init();
+
         return SUCCESS;
     }
 
+    private void getReleasePluginParameters( String workingDirectory, String pomFilename
)
+        throws Exception
+    {
+        //TODO: Use the model reader so we'll can get the plugin configuration from parent
too
+        MavenXpp3Reader pomReader = new MavenXpp3Reader();
+        Model model = pomReader.read( new FileReader( new File( workingDirectory, pomFilename
) ) );
+
+        if ( model.getBuild() != null && model.getBuild().getPlugins() != null )
+        {
+            for ( Plugin plugin : (List<Plugin>) model.getBuild().getPlugins() )
+            {
+                if ( plugin.getGroupId() != null && plugin.getGroupId().equals( "org.apache.maven.plugins"
) &&
+                    plugin.getArtifactId() != null && plugin.getArtifactId().equals(
"maven-release-plugin" ) )
+                {
+                    Xpp3Dom dom = (Xpp3Dom) plugin.getConfiguration();
+
+                    if ( dom != null )
+                    {
+                        Xpp3Dom configuration = dom.getChild( "useReleaseProfile" );
+                        if ( configuration != null )
+                        {
+                            useReleaseProfile = Boolean.valueOf( configuration.getValue()
);
+                        }
+
+                        configuration = dom.getChild( "goals" );
+                        if ( configuration != null )
+                        {
+                            goals = configuration.getValue();
+                            if ( model.getDistributionManagement() != null &&
+                                model.getDistributionManagement().getSite() != null )
+                            {
+                                goals += " site-deploy";
+                            }
+                        }
+
+                        configuration = dom.getChild( "arguments" );
+                        if ( configuration != null )
+                        {
+                            arguments = configuration.getValue();
+                        }
+
+                    }
+                }
+            }
+        }
+    }
+
     public String execute()
         throws Exception
     {
@@ -128,10 +196,11 @@
         File performDirectory = new File( getContinuum().getConfiguration().getWorkingDirectory(),
                                           "releases-" + System.currentTimeMillis() );
         performDirectory.mkdirs();
-        
+
         LocalRepository repository = project.getProjectGroup().getLocalRepository();
-        
-        releaseManager.perform( releaseId, performDirectory, goals, useReleaseProfile, listener,
repository );
+
+        releaseManager.perform( releaseId, performDirectory, goals, arguments, useReleaseProfile,
listener,
+                                repository );
 
         return SUCCESS;
     }
@@ -147,12 +216,10 @@
         descriptor.setScmPassword( scmPassword );
         descriptor.setScmReleaseLabel( scmTag );
         descriptor.setScmTagBase( scmTagBase );
-        
-        Profile profile = null;
-        
+
         if ( profileId != -1 )
         {
-            profile = getContinuum().getProfileService().getProfile( profileId );
+            Profile profile = getContinuum().getProfileService().getProfile( profileId );
             descriptor.setEnvironments( releaseManager.getEnvironments( profile ) );
         }
 
@@ -328,5 +395,14 @@
     {
         this.profileId = profileId;
     }
-    
+
+    public String getArguments()
+    {
+        return arguments;
+    }
+
+    public void setArguments( String arguments )
+    {
+        this.arguments = arguments;
+    }
 }

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
Wed Feb 11 19:35:33 2009
@@ -85,6 +85,8 @@
 
     private String prepareGoals;
 
+    private String arguments;
+
     private ReleaseResult result;
 
     private ContinuumReleaseManagerListener listener;
@@ -97,6 +99,8 @@
 
     private boolean autoVersionSubmodules = false;
 
+    private boolean addSchema = true;
+
     public String input()
         throws Exception
     {
@@ -158,6 +162,7 @@
     private void getReleasePluginParameters( String workingDirectory, String pomFilename
)
         throws Exception
     {
+        //TODO: Use the model reader so we'll can get the plugin configuration from parent
too
         MavenXpp3Reader pomReader = new MavenXpp3Reader();
         Model model = pomReader.read( new FileReader( new File( workingDirectory, pomFilename
) ) );
 
@@ -196,6 +201,12 @@
                             prepareGoals = configuration.getValue();
                         }
 
+                        configuration = dom.getChild( "arguments" );
+                        if ( configuration != null )
+                        {
+                            arguments = configuration.getValue();
+                        }
+
                         configuration = dom.getChild( "scmCommentPrefix" );
                         if ( configuration != null )
                         {
@@ -207,6 +218,12 @@
                         {
                             autoVersionSubmodules = Boolean.valueOf( configuration.getValue()
);
                         }
+
+                        configuration = dom.getChild( "addSchema" );
+                        if ( configuration != null )
+                        {
+                            addSchema = Boolean.valueOf( configuration.getValue() );
+                        }
                     }
                 }
             }
@@ -415,7 +432,9 @@
 
         p.setProperty( "tag", scmTag );
         p.setProperty( "prepareGoals", prepareGoals );
+        p.setProperty( "arguments", arguments );
         p.setProperty( "useEditMode", Boolean.toString( scmUseEditMode ) );
+        p.setProperty( "addSchema", Boolean.toString( addSchema ) );
 
         return p;
     }
@@ -560,6 +579,16 @@
         this.prepareGoals = prepareGoals;
     }
 
+    public String getArguments()
+    {
+        return arguments;
+    }
+
+    public void setArguments( String arguments )
+    {
+        this.arguments = arguments;
+    }
+
     public void validate()
     {
     }
@@ -624,4 +653,14 @@
     {
         this.autoVersionSubmodules = autoVersionSubmodules;
     }
+
+    public boolean isAddSchema()
+    {
+        return addSchema;
+    }
+
+    public void setAddSchema( boolean addSchema )
+    {
+        this.addSchema = addSchema;
+    }
 }

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Wed Feb 11 19:35:33 2009
@@ -657,7 +657,6 @@
 releaseProject.performReleaseOption=Perform project release
 releaseProject.provideReleaseParameters=Provide Release Parameters
 releasePrepare.section.title=Prepare Project for Release
-releasePrepare.parameters=Release Prepare Parameters
 releasePrepare.releaseVersion=Release Version*
 releasePrepare.nextDevelopmentVersion=Next Development Version*
 releasePerform.section.title=Perform Project Release
@@ -683,9 +682,11 @@
 releasePrepare.scmTagBase.label=SCM Tag Base
 releasePrepare.scmCommentPrefix.label=SCM Comment Prefix
 releasePrepare.prepareGoals.label=Preparation Goals
+releasePrepare.arguments.label=Arguments
 releasePrepare.buildEnvironment.label=Build Environment
 releasePrepare.useEditMode.label=Use edit mode
-releasePrepare.autoVersionSubmodules=autoVersionSubmodules (defined in the POM)
+releasePrepare.addSchema.label=Add a schema to the POM if it was previously missing on release
+releasePrepare.autoVersionSubmodules.label=autoVersionSubmodules (defined in the POM)
 releasePerformFromScm.scmUrl.label=SCM Connection URL
 releasePerformFromScm.scmUsername.label=SCM Username
 releasePerformFromScm.scmPassword.label=SCM Password

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_fr.properties
Wed Feb 11 19:35:33 2009
@@ -627,7 +627,6 @@
 releaseProject.performReleaseOption=Effectuer la "release" du projet
 releaseProject.provideReleaseParameters=Fournir les param\u00eatres de la "release"
 releasePrepare.section.title=Pr\u00e9parer le projet pour la "release"
-releasePrepare.parameters=Param\u00eatres de la pr\u00e9paration de la "release"
 releasePrepare.releaseVersion=Version de la "release"*
 releasePrepare.nextDevelopmentVersion=Prochaine version de d\u00e9veloppement*
 releasePerform.section.title=Effectuer la "release" du projet
@@ -653,7 +652,8 @@
 releasePrepare.prepareGoals.label=Preparation Goals
 releasePrepare.buildEnvironment.label=Environment de build
 releasePrepare.useEditMode.label=Utilisation du mode edit
-releasePrepare.autoVersionSubmodules=autoVersionSubmodules (d\u00e9fini dans le POM)
+releasePrepare.addSchema.label=Ajout d''un sch\u00e9ma au POM si il \u00e9tait manquant dans
la release pr\u00e9c\u00e9dente
+releasePrepare.autoVersionSubmodules.label=autoVersionSubmodules (d\u00e9fini dans le POM)
 
 # ----------------------------------------------------------------------
 # Page: User

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction-releasePrepare-validation.xml
Wed Feb 11 19:35:33 2009
@@ -22,16 +22,6 @@
     "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
 
 <validators>
-  <field name="scmUsername">
-    <field-validator type="requiredstring">
-      <message key="releasePrepareAction.scmUsername.required"/>
-    </field-validator>
-  </field>
-  <field name="scmPassword">
-    <field-validator type="requiredstring">
-      <message key="releasePrepareAction.scmPassword.required"/>
-    </field-validator>
-  </field>
   <field name="scmTag">
     <field-validator type="requiredstring">
       <message key="releasePrepareAction.scmTag.required"/>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction.properties
Wed Feb 11 19:35:33 2009
@@ -17,7 +17,5 @@
 # under the License.
 #
 
-releasePrepareAction.scmUsername.required=SCM username with commit rights is required for
release.
-releasePrepareAction.scmPassword.required=SCM password for the username above is required.
 releasePrepareAction.scmTag.required=SCM tag or release label to use for this release is
required.
 releasePrepareAction.prepareGoals.required=The maven release preparation goal(s) is required.

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_de.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_de.properties?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_de.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_de.properties
Wed Feb 11 19:35:33 2009
@@ -17,7 +17,5 @@
 # under the License.
 #
 
-releasePrepareAction.scmUsername.required=Es mu\u00DF ein SCM-Benutzer mit Schreibrechten
f\u00FCr die Ver\u00F6ffentlichung angegeben werden.
-releasePrepareAction.scmPassword.required=Es mu\u00DF ein Passwort f\u00FCr obigen SCM-Benutzer
angegeben werden.
 releasePrepareAction.scmTag.required=Es mu\u00DF eine SCM-Markierung oder ein Ver\u00F6ffentlichungs-Kennzeichen
f\u00FCr diese Ver\u00F6ffentlichung angegeben werden.
 releasePrepareAction.prepareGoals.required=Es m\u00FCssen die f\u00FCr die Ver\u00F6ffentlichung
auszuf\u00FChrenden Maven-Goals angegeben werden.

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_fr.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_fr.properties?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_fr.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_fr.properties
Wed Feb 11 19:35:33 2009
@@ -17,7 +17,5 @@
 # under the License.
 #
 
-releasePrepareAction.scmUsername.required=Le nom d''utilisateur du gestionnaire de sources
avec les droits de livraison est obligatoire pour effectuer la "release".
-releasePrepareAction.scmPassword.required=Le mot de passe du gestionnaire de sources pour
l''utilisateur fournit est obligatoire.
 releasePrepareAction.scmTag.required=Le tag du gestionnaire de sources ou le libell\u00e9
de "release" \u00e0 utiliser pour cette "release" est obligatoire.
 releasePrepareAction.prepareGoals.required=Le(s) goal(s) de pr\u00e9paration de la "release"
maven est obligatoire. 

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_pt_BR.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_pt_BR.properties?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_pt_BR.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ReleasePrepareAction_pt_BR.properties
Wed Feb 11 19:35:33 2009
@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-releasePrepareAction.prepareGoals.required=O(s) "goal(s)" de libera\u00E7\u00E3o do maven
\u00E9 obrigat\u00F3rio.
-releasePrepareAction.scmPassword.required=Senha SCM para o usu\u00E1rio acima \u00E9 obrigat\u00F3rio.
+
 releasePrepareAction.scmTag.required=Tag SCM or etiqueta de libera\u00E7\u00E3o para uso
nessa libera\u00E7\u00E3o \u00E9 obrigat\u00F3rio.
 releasePrepareAction.scmUsername.required=Usu\u00E1rio SCM com direitos de commit \u00E9
obrigat\u00F3rio para esta libera\u00E7\u00E3o.

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp Wed Feb
11 19:35:33 2009
@@ -31,8 +31,9 @@
         <s:hidden name="releaseId"/>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <s:textfield label="Maven Arguments" name="goals" value="clean deploy"/>
-            <s:checkbox label="Use Release Profile" name="useReleaseProfile" value="true"/>
+            <s:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals"/>
+            <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments"
required="true"/>
+            <s:checkbox label="%{getText('releasePerformFromScm.useReleaseProfile.label')}"
name="useReleaseProfile" fieldValue="false"/>
           </table>
         </div>
         <s:submit/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
Wed Feb 11 19:35:33 2009
@@ -38,8 +38,9 @@
             <c:if test="${!empty (scmTagBase)}">
               <s:textfield label="%{getText('releasePerformFromScm.scmTagBase.label')}"
name="scmTagBase"/>
             </c:if>
-            <s:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals"
value="clean deploy"/>
-            <s:checkbox label="%{getText('releasePerformFromScm.useReleaseProfile.label')}"
name="useReleaseProfile" value="true"/>
+            <s:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals"/>
+            <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments"
required="true"/>
+            <s:checkbox label="%{getText('releasePerformFromScm.useReleaseProfile.label')}"
name="useReleaseProfile"/>
             <s:select label="%{getText('releasePerformFromScm.buildEnvironment.label')}"
name="profileId" list="profiles" listValue="name"
                        listKey="id" headerKey="-1" headerValue=""/>
           </table>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=743463&r1=743462&r2=743463&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Wed Feb
11 19:35:33 2009
@@ -33,19 +33,21 @@
         <input type="hidden" name="autoVersionSubmodules" value="<s:property value="autoVersionSubmodules"/>"/>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <s:textfield label="%{getText('releasePrepare.scmUsername.label')}" name="scmUsername"
required="true"/>
-            <s:password label="%{getText('releasePrepare.scmPassword.label')}" name="scmPassword"
required="true"/>
+            <s:textfield label="%{getText('releasePrepare.scmUsername.label')}" name="scmUsername"/>
+            <s:password label="%{getText('releasePrepare.scmPassword.label')}" name="scmPassword"/>
             <s:textfield label="%{getText('releasePrepare.scmTag.label')}" name="scmTag"
required="true"/>
             <c:if test="${!empty (scmTagBase)}">
               <s:textfield label="%{getText('releasePrepare.scmTagBase.label')}" name="scmTagBase"/>
             </c:if>
             <s:textfield label="%{getText('releasePrepare.scmCommentPrefix.label')}" name="scmCommentPrefix"/>
             <s:textfield label="%{getText('releasePrepare.prepareGoals.label')}" name="prepareGoals"
required="true"/>
+            <s:textfield label="%{getText('releasePrepare.arguments.label')}" name="arguments"
required="true"/>
             <s:select label="%{getText('releasePrepare.buildEnvironment.label')}" name="profileId"
list="profiles" listValue="name"
                        listKey="id" headerKey="-1" headerValue=""/>
 			      <s:checkbox label="%{getText('releasePrepare.useEditMode.label')}" name="scmUseEditMode"
fieldValue="false"/>
+            <s:checkbox label="%{getText('releasePrepare.addSchema.label')}" name="addSchema"
fieldValue="false"/>
             <c:if test="${autoVersionSubmodules}">
-              <s:checkbox label="%{getText('releasePrepare.autoVersionSubmodules')}" name="autoVersionSubmodules"
disabled="true" fieldValue="false"/>
+              <s:checkbox label="%{getText('releasePrepare.autoVersionSubmodules.label')}"
name="autoVersionSubmodules" disabled="true" fieldValue="false"/>
             </c:if>
           </table>
         </div>



Mime
View raw message