Author: evenisse
Date: Tue Mar 13 07:57:11 2007
New Revision: 517716
URL: http://svn.apache.org/viewvc?view=rev&rev=517716
Log:
Remove system property from API
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java?view=diff&rev=517716&r1=517715&r2=517716
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
Tue Mar 13 07:57:11 2007
@@ -59,6 +59,9 @@
public final static CommandParameter OUTPUT_FILE = new CommandParameter(
"outputFile" );
+ public final static CommandParameter RUN_CHANGELOG_WITH_UPDATE =
+ new CommandParameter( "run_changelog_with_update" );
+
private String name;
public CommandParameter( String name )
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java?view=diff&rev=517716&r1=517715&r2=517716
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
Tue Mar 13 07:57:11 2007
@@ -55,11 +55,14 @@
{
String tag = parameters.getString( CommandParameter.TAG, null );
+ boolean runChangelog = Boolean.valueOf(
+ parameters.getString( CommandParameter.RUN_CHANGELOG_WITH_UPDATE,
"true" ) ).booleanValue();
+
UpdateScmResult updateScmResult = executeUpdateCommand( repository,
fileSet, tag );
List filesList = updateScmResult.getUpdatedFiles();
- if ( "true".equals( System.getProperty(
"maven.scm.update.skipChangelog" ) ) )
+ if ( !runChangelog )
{
return updateScmResult;
}
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?view=diff&rev=517716&r1=517715&r2=517716
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
Tue Mar 13 07:57:11 2007
@@ -122,7 +122,7 @@
/**
- * @see
org.apache.maven.scm.provider.ScmProvider#add(org.apache.maven.scm.repository.ScmRepository,org.apache.maven.scm.ScmFileSet,String
message)
+ * @see
org.apache.maven.scm.provider.ScmProvider#add(org.apache.maven.scm.repository.ScmRepository,org.apache.maven.scm.ScmFileSet,String)
*/
public AddScmResult add( ScmRepository repository, ScmFileSet fileSet,
String message )
throws ScmException
@@ -374,7 +374,16 @@
public UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag )
throws ScmException
{
- return update( repository, fileSet, tag, "" );
+ return update( repository, fileSet, tag, true );
+ }
+
+ /**
+ * @see
org.apache.maven.scm.provider.ScmProvider#update(org.apache.maven.scm.repository.ScmRepository,org.apache.maven.scm.ScmFileSet,java.lang.String,boolean)
+ */
+ public UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag, boolean runChangelog )
+ throws ScmException
+ {
+ return update( repository, fileSet, tag, "", runChangelog );
}
/**
@@ -383,6 +392,13 @@
public UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag, String datePattern )
throws ScmException
{
+ return update( repository, fileSet, tag, datePattern, true );
+ }
+
+ private UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag,
+ String datePattern, boolean runChangelog )
+ throws ScmException
+ {
login( repository, fileSet );
CommandParameters parameters = new CommandParameters();
@@ -391,6 +407,8 @@
parameters.setString( CommandParameter.CHANGELOG_DATE_PATTERN,
datePattern );
+ parameters.setString( CommandParameter.RUN_CHANGELOG_WITH_UPDATE,
String.valueOf( runChangelog ) );
+
return update( repository, fileSet, parameters );
}
@@ -410,6 +428,16 @@
String datePattern )
throws ScmException
{
+ return update( repository, fileSet, tag, lastUpdate, datePattern, true
);
+ }
+
+ /**
+ * @see
org.apache.maven.scm.provider.ScmProvider#update(org.apache.maven.scm.repository.ScmRepository,org.apache.maven.scm.ScmFileSet,java.lang.String,java.util.Date,java.lang.String,boolean)
+ */
+ public UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag, Date lastUpdate,
+ String datePattern, boolean runChangelog )
+ throws ScmException
+ {
login( repository, fileSet );
CommandParameters parameters = new CommandParameters();
@@ -422,6 +450,8 @@
}
parameters.setString( CommandParameter.CHANGELOG_DATE_PATTERN,
datePattern );
+
+ parameters.setString( CommandParameter.RUN_CHANGELOG_WITH_UPDATE,
String.valueOf( runChangelog ) );
return update( repository, fileSet, parameters );
}
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java?view=diff&rev=517716&r1=517715&r2=517716
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
Tue Mar 13 07:57:11 2007
@@ -183,7 +183,7 @@
/**
* Save the changes you have done into the repository. This will create a
new version of the file or
* directory in the repository.
- * <p>
+ * <p/>
* When the fileSet has no entries, the fileSet.getBaseDir() is
recursively committed.
* When the fileSet has entries, the commit is non-recursive and only the
elements in the fileSet
* are committed.
@@ -215,8 +215,8 @@
*
* @param scmRepository the source control system
* @param scmFileSet the files are copied to the [EMAIL PROTECTED]
org.apache.maven.scm.ScmFileSet#getBasedir()} location
- * @param tag tag or revision
- * @param recursive whether to check out recursively
+ * @param tag tag or revision
+ * @param recursive whether to check out recursively
* @return
* @throws ScmException
*/
@@ -279,6 +279,19 @@
/**
* Updates the copy on the local machine with the changes in the repository
*
+ * @param repository the source control system
+ * @param fileSet location of your local copy
+ * @param tag use the version defined by the tag
+ * @param runChangelog Run the changelog command after the update
+ * @return
+ * @throws ScmException
+ */
+ UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet,
String tag, boolean runChangelog )
+ throws ScmException;
+
+ /**
+ * Updates the copy on the local machine with the changes in the repository
+ *
* @param repository the source control system
* @param fileSet location of your local copy
* @param tag use the version defined by the tag
@@ -315,6 +328,22 @@
*/
UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet,
String tag, Date lastUpdate,
String datePattern )
+ throws ScmException;
+
+ /**
+ * Updates the copy on the local machine with the changes in the repository
+ *
+ * @param repository the source control system
+ * @param fileSet location of your local copy
+ * @param tag use the version defined by the tag
+ * @param lastUpdate Date of last update
+ * @param datePattern the date pattern use in changelog output returned
by scm tool
+ * @param runChangelog Run the changelog command after the update
+ * @return
+ * @throws ScmException
+ */
+ UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet,
String tag, Date lastUpdate,
+ String datePattern, boolean runChangelog )
throws ScmException;
/**
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java?view=diff&rev=517716&r1=517715&r2=517716
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java
Tue Mar 13 07:57:11 2007
@@ -70,6 +70,13 @@
*/
private MavenProject project;
+ /**
+ * Run Changelog after update.
+ *
+ * @parameter expression="${runChangelog}" default-value="false"
+ */
+ private boolean runChangelog = false;
+
public void execute()
throws MojoExecutionException
{
@@ -89,8 +96,10 @@
currentTag = tag;
}
- UpdateScmResult result =
- getScmManager().getProviderByRepository( repository ).update(
repository, getFileSet(), currentTag );
+ UpdateScmResult result = getScmManager().getProviderByRepository(
repository ).update( repository,
+
getFileSet(),
+
currentTag,
+
runChangelog );
checkResult( result );
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java?view=diff&rev=517716&r1=517715&r2=517716
==============================================================================
---
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
(original)
+++
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java
Tue Mar 13 07:57:11 2007
@@ -421,6 +421,15 @@
/**
* @return getUpdateScmResult() always
*/
+ public UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag, boolean runChangelog )
+ throws ScmException
+ {
+ return getUpdateScmResult();
+ }
+
+ /**
+ * @return getUpdateScmResult() always
+ */
public UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag, String datePattern )
throws ScmException
{
@@ -441,6 +450,15 @@
*/
public UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag, Date lastUpdate,
String datePattern )
+ throws ScmException
+ {
+ return getUpdateScmResult();
+ }
+
+ /**
+ * @return getUpdateScmResult() always
+ */
+ public UpdateScmResult update( ScmRepository repository, ScmFileSet
fileSet, String tag, Date lastUpdate, String datePattern, boolean runChangelog )
throws ScmException
{
return getUpdateScmResult();
