You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ev...@apache.org on 2006/02/27 16:00:17 UTC
svn commit: r381352 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/
maven-scm-api/src/main/java/org/apache/maven/scm/command/add/
maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/
maven-scm-api/src/main/java/o...
Author: evenisse
Date: Mon Feb 27 07:00:06 2006
New Revision: 381352
URL: http://svn.apache.org/viewcvs?rev=381352&view=rev
Log:
code formatting
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.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/util/AbstractConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommandTest.java
maven/scm/trunk/maven-scm-site/pom.xml
maven/scm/trunk/maven-scm-site/src/site/resources/css/maven-theme.css
maven/scm/trunk/maven-scm-site/src/site/resources/css/site.css
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java Mon Feb 27 07:00:06 2006
@@ -18,7 +18,7 @@
/**
* Typesafe enum for file status
- *
+ * <p/>
* There are two types of status defined in this class: <br>
* 1) Status: Changes in the working tree, not yet committed to the repository eg. MODIFIED <br>
* 2) Transaction: The file is part of some transaction with the repository eg. CHECKED_IN <br>
@@ -28,7 +28,9 @@
*/
public final class ScmFileStatus
{
- /** File is added to the working tree and does not yet exist in the repository */
+ /**
+ * File is added to the working tree and does not yet exist in the repository
+ */
public final static ScmFileStatus ADDED = new ScmFileStatus( "added" );
/**
@@ -43,10 +45,14 @@
*/
public static final ScmFileStatus MODIFIED = new ScmFileStatus( "modified" );
- /** File from working tree is checked into the repository */
+ /**
+ * File from working tree is checked into the repository
+ */
public final static ScmFileStatus CHECKED_IN = new ScmFileStatus( "checked-in" );
- /** File is checked out from the repository and into the working tree */
+ /**
+ * File is checked out from the repository and into the working tree
+ */
public final static ScmFileStatus CHECKED_OUT = new ScmFileStatus( "checked-out" );
/**
@@ -66,7 +72,9 @@
*/
public final static ScmFileStatus UPDATED = new ScmFileStatus( "updated" );
- /** The file is part of a tag */
+ /**
+ * The file is part of a tag
+ */
public static final ScmFileStatus TAGGED = new ScmFileStatus( "tagged" );
public static final ScmFileStatus LOCKED = new ScmFileStatus( "locked" );
@@ -114,8 +122,7 @@
*/
public boolean isTransaction()
{
- return this == CHECKED_IN || this == CHECKED_OUT || this == LOCKED
- || this == TAGGED || isUpdate();
+ return this == CHECKED_IN || this == CHECKED_OUT || this == LOCKED || this == TAGGED || isUpdate();
}
/**
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java Mon Feb 27 07:00:06 2006
@@ -32,7 +32,7 @@
/**
* Copy constructor.
- *
+ * <p/>
* Typically used from derived classes when wrapping a ScmResult
* into a spesific type eg. AddAcmResult
*/
@@ -47,8 +47,7 @@
this.success = scmResult.success;
}
- public ScmResult( String commandLine, String providerMessage,
- String commandOutput, boolean success )
+ public ScmResult( String commandLine, String providerMessage, String commandOutput, boolean success )
{
this.commandLine = commandLine;
@@ -66,7 +65,7 @@
/**
* @return A message from the provider. On success this would typically be null or
- * an empty string. On failure it would be the error message from the provider
+ * an empty string. On failure it would be the error message from the provider
*/
public String getProviderMessage()
{
@@ -75,7 +74,7 @@
/**
* @return Output from Std.Out from the provider during execution
- * of the command that resulted in this
+ * of the command that resulted in this
*/
public String getCommandOutput()
{
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AddScmResult.java Mon Feb 27 07:00:06 2006
@@ -41,9 +41,9 @@
this.addedFiles = addedFiles;
}
- public AddScmResult(List addedFiles, ScmResult result)
+ public AddScmResult( List addedFiles, ScmResult result )
{
- super(result);
+ super( result );
this.addedFiles = addedFiles;
}
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java Mon Feb 27 07:00:06 2006
@@ -39,9 +39,9 @@
this.changeLog = changeLog;
}
- public ChangeLogScmResult(ChangeLogSet changeLog, ScmResult result)
+ public ChangeLogScmResult( ChangeLogSet changeLog, ScmResult result )
{
- super(result);
+ super( result );
this.changeLog = changeLog;
}
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java Mon Feb 27 07:00:06 2006
@@ -1,12 +1,5 @@
package org.apache.maven.scm.command.changelog;
-import org.apache.maven.scm.ChangeSet;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -22,6 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.scm.ChangeSet;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java Mon Feb 27 07:00:06 2006
@@ -42,11 +42,11 @@
this.checkedInFiles = checkedInFiles;
}
- public CheckInScmResult(List checkedInFiles, ScmResult result)
+ public CheckInScmResult( List checkedInFiles, ScmResult result )
{
- super(result);
+ super( result );
- this.checkedInFiles = checkedInFiles;
+ this.checkedInFiles = checkedInFiles;
}
public List getCheckedInFiles()
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java Mon Feb 27 07:00:06 2006
@@ -42,11 +42,11 @@
this.checkedOutFiles = checkedOutFiles;
}
- public CheckOutScmResult(List checkedOutFiles, ScmResult result)
+ public CheckOutScmResult( List checkedOutFiles, ScmResult result )
{
- super(result);
+ super( result );
- this.checkedOutFiles = checkedOutFiles;
+ this.checkedOutFiles = checkedOutFiles;
}
public List getCheckedOutFiles()
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java Mon Feb 27 07:00:06 2006
@@ -47,15 +47,15 @@
super( commandLine, providerMessage, commandOutput, success );
}
- public DiffScmResult(List changedFiles, Map differences, String patch, ScmResult result)
+ public DiffScmResult( List changedFiles, Map differences, String patch, ScmResult result )
{
- super(result);
+ super( result );
- this.changedFiles = changedFiles;
+ this.changedFiles = changedFiles;
- this.differences = differences;
+ this.differences = differences;
- this.patch = patch;
+ this.patch = patch;
}
public List getChangedFiles()
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java Mon Feb 27 07:00:06 2006
@@ -37,9 +37,9 @@
this.editFiles = editFiles;
}
- public EditScmResult(List editFiles, ScmResult result)
+ public EditScmResult( List editFiles, ScmResult result )
{
- super(result);
+ super( result );
this.editFiles = editFiles;
}
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/RemoveScmResult.java Mon Feb 27 07:00:06 2006
@@ -41,11 +41,11 @@
this.removedFiles = removedFiles;
}
- public RemoveScmResult(List removedFiles, ScmResult result)
+ public RemoveScmResult( List removedFiles, ScmResult result )
{
- super(result);
+ super( result );
- this.removedFiles = removedFiles;
+ this.removedFiles = removedFiles;
}
public List getRemovedFiles()
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/StatusScmResult.java Mon Feb 27 07:00:06 2006
@@ -41,11 +41,11 @@
this.changedFiles = changedFiles;
}
- public StatusScmResult(List changedFiles, ScmResult result)
+ public StatusScmResult( List changedFiles, ScmResult result )
{
- super(result);
+ super( result );
- this.changedFiles = changedFiles;
+ this.changedFiles = changedFiles;
}
public List getChangedFiles()
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java Mon Feb 27 07:00:06 2006
@@ -40,8 +40,7 @@
implements ScmManager
{
private final static String ILLEGAL_SCM_URL = "The scm url must be on the form " +
- "'scm:<scm provider><delimiter><provider specific part>' " +
- "where <delimiter> can be either ':' or '|'.";
+ "'scm:<scm provider><delimiter><provider specific part>' " + "where <delimiter> can be either ':' or '|'.";
private Map scmProviders = new HashMap();
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- 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 Mon Feb 27 07:00:06 2006
@@ -116,8 +116,9 @@
int numDays, String branch )
throws ScmException
{
- return changeLog( repository, fileSet, startDate, endDate, numDays, branch, null);
+ return changeLog( repository, fileSet, startDate, endDate, numDays, branch, null );
}
+
/**
* @see org.apache.maven.scm.provider.ScmProvider#changeLog(org.apache.maven.scm.repository.ScmRepository, org.apache.maven.scm.ScmFileSet, java.util.Date, java.util.Date, int, java.lang.String, java.lang.String)
*/
@@ -148,12 +149,14 @@
public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, String startTag, String endTag )
throws ScmException
{
- return changeLog( repository, fileSet, startTag, endTag, null);
+ return changeLog( repository, fileSet, startTag, endTag, null );
}
+
/**
* @see org.apache.maven.scm.provider.ScmProvider#changeLog(org.apache.maven.scm.repository.ScmRepository, org.apache.maven.scm.ScmFileSet, java.lang.String, java.lang.String, java.lang.String)
*/
- public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, String startTag, String endTag, String datePattern )
+ public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, String startTag, String endTag,
+ String datePattern )
throws ScmException
{
login( repository, fileSet );
@@ -326,8 +329,9 @@
public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, String tag )
throws ScmException
{
- return update( repository, fileSet, tag, "");
+ return update( repository, fileSet, tag, "" );
}
+
/**
* @see org.apache.maven.scm.provider.ScmProvider#update(org.apache.maven.scm.repository.ScmRepository, org.apache.maven.scm.ScmFileSet, java.lang.String, java.lang.String)
*/
@@ -351,13 +355,14 @@
public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, String tag, Date lastUpdate )
throws ScmException
{
- return update( repository, fileSet, tag, lastUpdate, null);
+ return update( repository, fileSet, tag, lastUpdate, null );
}
/**
* @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)
*/
- public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, String tag, Date lastUpdate, String datePattern )
+ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, String tag, Date lastUpdate,
+ String datePattern )
throws ScmException
{
login( repository, fileSet );
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/AbstractConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/AbstractConsumer.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/AbstractConsumer.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/AbstractConsumer.java Mon Feb 27 07:00:06 2006
@@ -14,7 +14,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
import org.apache.maven.scm.log.ScmLogger;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarUtils.java Mon Feb 27 07:00:06 2006
@@ -16,12 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
@@ -34,6 +28,12 @@
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* Common code for executing bazaar commands.
*
@@ -95,8 +95,8 @@
throw new ScmException( "Command could not be executed: " + cmd, ex );
}
- List exitCodes = exitCodeMap.containsKey( cmdAndArgs[0] ) ? (List) exitCodeMap.get( cmdAndArgs[0] )
- : defaultExitCodes;
+ List exitCodes =
+ exitCodeMap.containsKey( cmdAndArgs[0] ) ? (List) exitCodeMap.get( cmdAndArgs[0] ) : defaultExitCodes;
boolean success = exitCodes.contains( new Integer( exitCode ) );
String providerMsg = "Execution of bazaar command: " + ( success ? "succeded" : "failed" );
@@ -107,7 +107,7 @@
throws ScmException
{
ScmLogger logger = new DefaultLog();
- return execute( new BazaarConsumer(logger), logger, workingDir, cmdAndArgs );
+ return execute( new BazaarConsumer( logger ), logger, workingDir, cmdAndArgs );
}
public static String[] expandCommandLine( String[] cmdAndArgs, ScmFileSet additionalFiles )
@@ -132,7 +132,7 @@
throws ScmException
{
- String[] revCmd = new String[] { BazaarCommand.REVNO_CMD };
+ String[] revCmd = new String[]{BazaarCommand.REVNO_CMD};
BazaarRevNoConsumer consumer = new BazaarRevNoConsumer( logger );
BazaarUtils.execute( consumer, logger, workingDir, revCmd );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/BazaarConsumer.java Mon Feb 27 07:00:06 2006
@@ -16,16 +16,16 @@
* limitations under the License.
*/
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
+import org.apache.maven.scm.util.AbstractConsumer;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.maven.scm.ScmFileStatus;
-import org.apache.maven.scm.log.ScmLogger;
-import org.apache.maven.scm.util.AbstractConsumer;
-
/**
* Base consumer to do common parsing for all bazaar commands.
* <p/>
@@ -73,7 +73,7 @@
public BazaarConsumer( ScmLogger logger )
{
- super( logger);
+ super( logger );
}
public void doConsume( ScmFileStatus status, String trimmedLine )
@@ -115,9 +115,11 @@
*
* @return Return the last lines interpreted as an warning or an error
*/
- public String getStdErr() {
+ public String getStdErr()
+ {
String str = "";
- for (Iterator it = stderr.iterator(); it.hasNext();) {
+ for ( Iterator it = stderr.iterator(); it.hasNext(); )
+ {
str += it.next();
}
return str;
@@ -143,9 +145,10 @@
String prefix = (String) it.next();
if ( line.startsWith( prefix ) )
{
- stderr.add(line); //Add line
- if (stderr.size() > MAX_STDERR_SIZE) {
- stderr.remove(0); //Rotate list
+ stderr.add( line ); //Add line
+ if ( stderr.size() > MAX_STDERR_SIZE )
+ {
+ stderr.remove( 0 ); //Rotate list
}
String message = line.substring( prefix.length() );
if ( messages.get( prefix ).equals( "WARNING" ) )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java Mon Feb 27 07:00:06 2006
@@ -16,11 +16,6 @@
* limitations under the License.
*/
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -31,6 +26,11 @@
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.bazaar.BazaarUtils;
import org.apache.maven.scm.provider.bazaar.command.BazaarCommand;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
/**
* @author <a href="mailto:torbjorn@smorgrav.org">Torbjørn Eikli Smørgrav</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogConsumer.java Mon Feb 27 07:00:06 2006
@@ -122,7 +122,7 @@
else if ( currentStatus == ScmFileStatus.UNKNOWN )
{
currentComment.append( line );
- currentChange.setComment(currentComment.toString());
+ currentChange.setComment( currentComment.toString() );
currentComment.append( "\n" );
}
else if ( currentStatus != null )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java Mon Feb 27 07:00:06 2006
@@ -85,7 +85,8 @@
// Commit to local branch
String[] commitCmd = new String[]{BazaarCommand.COMMIT_CMD, BazaarCommand.MESSAGE_OPTION, message};
commitCmd = BazaarUtils.expandCommandLine( commitCmd, fileSet );
- ScmResult result = BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), commitCmd );
+ ScmResult result =
+ BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), fileSet.getBasedir(), commitCmd );
// Push to parent branch if any
BazaarScmProviderRepository repository = (BazaarScmProviderRepository) repo;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommand.java Mon Feb 27 07:00:06 2006
@@ -59,7 +59,6 @@
ScmResult result = BazaarUtils.execute( consumer, getLogger(), fileSet.getBasedir(), diffCmd );
- return new DiffScmResult( consumer.getChangedFiles(),
- consumer.getDifferences(), consumer.getPatch(), result );
+ return new DiffScmResult( consumer.getChangedFiles(), consumer.getDifferences(), consumer.getPatch(), result );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/update/BazaarUpdateCommand.java Mon Feb 27 07:00:06 2006
@@ -16,12 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -38,6 +32,12 @@
import org.apache.maven.scm.provider.bazaar.command.diff.BazaarDiffConsumer;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:torbjorn@smorgrav.org">Torbjørn Eikli Smørgrav</a>
*/
@@ -46,8 +46,7 @@
implements BazaarCommand
{
- protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repo,
- ScmFileSet fileSet, String tag )
+ protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag )
throws ScmException
{
@@ -61,8 +60,7 @@
// Update branch
String[] update_cmd = new String[]{BazaarCommand.PULL_CMD};
ScmResult updateResult =
- BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(),
- workingDir, update_cmd );
+ BazaarUtils.execute( new BazaarConsumer( getLogger() ), getLogger(), workingDir, update_cmd );
if ( !updateResult.isSuccess() )
{
@@ -83,7 +81,7 @@
for ( Iterator it = diffFiles.iterator(); it.hasNext(); )
{
ScmFile file = (ScmFile) it.next();
- changes.add(diffChanges.get(file));
+ changes.add( diffChanges.get( file ) );
if ( file.getStatus() == ScmFileStatus.MODIFIED )
{
updatedFiles.add( new ScmFile( file.getPath(), ScmFileStatus.PATCHED ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommandTckTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommandTckTest.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommandTckTest.java Mon Feb 27 07:00:06 2006
@@ -1,5 +1,21 @@
package org.apache.maven.scm.provider.bazaar.command.changelog;
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.maven.scm.provider.bazaar.BazaarTestUtils;
import org.apache.maven.scm.tck.command.changelog.ChangeLogCommandTckTest;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommandTest.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/test/java/org/apache/maven/scm/provider/bazaar/command/diff/BazaarDiffCommandTest.java Mon Feb 27 07:00:06 2006
@@ -1,5 +1,21 @@
package org.apache.maven.scm.provider.bazaar.command.diff;
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.maven.scm.provider.bazaar.BazaarTestUtils;
import org.apache.maven.scm.tck.command.diff.DiffCommandTckTest;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java Mon Feb 27 07:00:06 2006
@@ -25,16 +25,12 @@
import org.apache.maven.scm.provider.clearcase.repository.ClearCaseScmProviderRepository;
import org.apache.maven.scm.provider.clearcase.util.ClearCaseUtil;
import org.apache.maven.scm.providers.clearcase.settings.Settings;
-import org.apache.maven.scm.providers.clearcase.settings.io.xpp3.ClearcaseXpp3Reader;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -254,11 +250,12 @@
*/
protected static boolean isClearCaseLT()
{
- return settings.isClearcaseLT();
+ return settings.isClearcaseLT();
}
/**
* Only use for test case
+ *
* @param isClearCaseLT
* @deprecated
*/
@@ -272,11 +269,12 @@
*/
protected static boolean useVWS()
{
- return settings.isUseVWSParameter();
+ return settings.isUseVWSParameter();
}
/**
* Only use for test case
+ *
* @param useVWS
* @deprecated
*/
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java Mon Feb 27 07:00:06 2006
@@ -1,14 +1,5 @@
package org.apache.maven.scm.provider.clearcase.util;
-import org.apache.maven.scm.providers.clearcase.settings.Settings;
-import org.apache.maven.scm.providers.clearcase.settings.io.xpp3.ClearcaseXpp3Reader;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -24,6 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.scm.providers.clearcase.settings.Settings;
+import org.apache.maven.scm.providers.clearcase.settings.io.xpp3.ClearcaseXpp3Reader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusConsumerTest.java Mon Feb 27 07:00:06 2006
@@ -21,7 +21,11 @@
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.log.DefaultLog;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Collection;
/**
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagConsumerTest.java Mon Feb 27 07:00:06 2006
@@ -21,7 +21,10 @@
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.log.DefaultLog;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Collection;
/**
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/add/CvsAddCommand.java Mon Feb 27 07:00:06 2006
@@ -50,7 +50,7 @@
{
CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
- Commandline cl = CvsCommandUtils.getBaseCommand( "add", repository, fileSet);
+ Commandline cl = CvsCommandUtils.getBaseCommand( "add", repository, fileSet );
if ( binary )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java Mon Feb 27 07:00:06 2006
@@ -63,7 +63,7 @@
{
CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
- Commandline cl = CvsCommandUtils.getBaseCommand( "log", repository, fileSet);
+ Commandline cl = CvsCommandUtils.getBaseCommand( "log", repository, fileSet );
if ( startDate != null )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java Mon Feb 27 07:00:06 2006
@@ -18,9 +18,8 @@
import org.apache.maven.scm.ChangeFile;
import org.apache.maven.scm.ChangeSet;
-import org.apache.maven.scm.util.AbstractConsumer;
import org.apache.maven.scm.log.ScmLogger;
-import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.apache.maven.scm.util.AbstractConsumer;
import java.util.ArrayList;
import java.util.List;
@@ -103,7 +102,7 @@
public CvsChangeLogConsumer( ScmLogger logger, String userDatePattern )
{
- super( logger);
+ super( logger );
this.userDatePattern = userDatePattern;
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java Mon Feb 27 07:00:06 2006
@@ -48,7 +48,7 @@
{
CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
- Commandline cl = CvsCommandUtils.getBaseCommand( "commit", repository, fileSet);
+ Commandline cl = CvsCommandUtils.getBaseCommand( "commit", repository, fileSet );
if ( !StringUtils.isEmpty( tag ) )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java Mon Feb 27 07:00:06 2006
@@ -1,14 +1,5 @@
package org.apache.maven.scm.provider.cvslib.util;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.apache.maven.scm.providers.cvslib.settings.Settings;
-import org.apache.maven.scm.providers.cvslib.settings.io.xpp3.CvsXpp3Reader;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -24,6 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.scm.providers.cvslib.settings.Settings;
+import org.apache.maven.scm.providers.cvslib.settings.io.xpp3.CvsXpp3Reader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java Mon Feb 27 07:00:06 2006
@@ -72,7 +72,7 @@
cl.createArgument().setValue( relativeFileOrDir.getAbsolutePath().replace( '\\', '/' ) );
addCompressionOption( cl );
-
+
return cl;
}
}
@@ -112,7 +112,7 @@
cl.createArgument().setValue( absoluteWorkingDir.getAbsolutePath().replace( '\\', '/' ) );
addCompressionOption( cl );
-
+
return cl;
}
@@ -120,7 +120,7 @@
{
//hiden feature to turn on compress during file transfer
String compression = System.getProperty( "maven.scm.starteam.compression" );
-
+
if ( "true".equalsIgnoreCase( compression ) )
{
cl.createArgument().setValue( "-cmp" );
@@ -128,7 +128,7 @@
}
-
+
public static String toJavaPath( String path )
{
return path.replace( '\\', '/' );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/pom.xml Mon Feb 27 07:00:06 2006
@@ -1,9 +1,9 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven-scm-providers</artifactId>
- <groupId>org.apache.maven.scm</groupId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <artifactId>maven-scm-providers</artifactId>
+ <groupId>org.apache.maven.scm</groupId>
+ <version>1.0-beta-3-SNAPSHOT</version>
</parent>
<artifactId>maven-scm-provider-vss</artifactId>
<version>1.0-beta-3-SNAPSHOT</version>
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommandTest.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommandTest.java Mon Feb 27 07:00:06 2006
@@ -1,16 +1,5 @@
package org.apache.maven.scm.provider.vss.commands.changelog;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmTestCase;
-import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.provider.vss.repository.VssScmProviderRepository;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.util.cli.Commandline;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -26,6 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmTestCase;
+import org.apache.maven.scm.manager.ScmManager;
+import org.apache.maven.scm.provider.vss.repository.VssScmProviderRepository;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/scm/trunk/maven-scm-site/pom.xml
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/pom.xml?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-site/pom.xml (original)
+++ maven/scm/trunk/maven-scm-site/pom.xml Mon Feb 27 07:00:06 2006
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>maven-scm</artifactId>
<groupId>org.apache.maven.scm</groupId>
@@ -16,17 +16,17 @@
<url>scpexe://minotaur.apache.org/www/maven.apache.org/scm</url>
</site>
</distributionManagement>
-
+
<build>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-alpha-5</version>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-alpha-5</version>
</extension>
</extensions>
</build>
-
+
<reporting>
<excludeDefaults>true</excludeDefaults>
<!-- TODO: disable dependencies -->
Modified: maven/scm/trunk/maven-scm-site/src/site/resources/css/maven-theme.css
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/src/site/resources/css/maven-theme.css?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-site/src/site/resources/css/maven-theme.css (original)
+++ maven/scm/trunk/maven-scm-site/src/site/resources/css/maven-theme.css Mon Feb 27 07:00:06 2006
@@ -1,179 +1,207 @@
body {
- background-color: #fff;
- font-family: Verdana, Helvetica, Arial, sans-serif;
- margin-left: auto;
- margin-right: auto;
- background-repeat: repeat-y;
- font-size: 13px;
- padding: 0px;
-}
-td, select, input, li{
- font-family: Verdana, Helvetica, Arial, sans-serif;
- font-size: 12px;
- color:#333333;
+ background-color: #fff;
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ margin-left: auto;
+ margin-right: auto;
+ background-repeat: repeat-y;
+ font-size: 13px;
+ padding: 0px;
+}
+
+td, select, input, li {
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-size: 12px;
+ color: #333333;
}
-code{
- font-size: 12px;
+
+code {
+ font-size: 12px;
}
+
a {
- text-decoration: none;
+ text-decoration: none;
}
+
a:link {
- color:#47a;
+ color: #47a;
}
-a:visited {
- color:#666666;
+
+a:visited {
+ color: #666666;
}
+
a:active, a:hover {
- color:#990000;
+ color: #990000;
}
+
#legend li.externalLink {
- background: url(../images/external.png) left top no-repeat;
- padding-left: 18px;
+ background: url( ../images/external.png ) left top no-repeat;
+ padding-left: 18px;
}
+
a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
- background: url(../images/external.png) right center no-repeat;
- padding-right: 18px;
+ background: url( ../images/external.png ) right center no-repeat;
+ padding-right: 18px;
}
+
#legend li.newWindow {
- background: url(../images/newwindow.png) left top no-repeat;
- padding-left: 18px;
+ background: url( ../images/newwindow.png ) left top no-repeat;
+ padding-left: 18px;
}
+
a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
- background: url(../images/newwindow.png) right center no-repeat;
- padding-right: 18px;
+ background: url( ../images/newwindow.png ) right center no-repeat;
+ padding-right: 18px;
}
+
h2 {
- font-size: 17px;
- color: #333333;
+ font-size: 17px;
+ color: #333333;
}
+
h3 {
- padding: 4px 4px 4px 24px;
- color: #666;
- background-color: #ccc;
- font-weight: bold;
- font-size: 14px;
- background-image: url(../images/h3.jpg);
- background-repeat: no-repeat;
- background-position: left bottom;
+ padding: 4px 4px 4px 24px;
+ color: #666;
+ background-color: #ccc;
+ font-weight: bold;
+ font-size: 14px;
+ background-image: url( ../images/h3.jpg );
+ background-repeat: no-repeat;
+ background-position: left bottom;
}
+
p {
- line-height: 1.3em;
- font-size: 12px;
- color: #000;
+ line-height: 1.3em;
+ font-size: 12px;
+ color: #000;
}
+
#breadcrumbs {
- height: 13px;
- background-image: url(../images/breadcrumbs.jpg);
- padding: 5px 10px 14px 20px;
+ height: 13px;
+ background-image: url( ../images/breadcrumbs.jpg );
+ padding: 5px 10px 14px 20px;
}
+
* html #breadcrumbs {
- padding-bottom: 8px;
+ padding-bottom: 8px;
}
+
#leftColumn {
- margin: 10px 0 10px 0;
- border-top-color: #ccc;
- border-top-style: solid;
- border-top-width: 1px;
- border-right-color: #ccc;
- border-right-style: solid;
- border-right-width: 1px;
- border-bottom-color: #ccc;
- border-bottom-style: solid;
- border-bottom-width: 1px;
- padding-right: 5px;
- padding-left: 5px;
+ margin: 10px 0 10px 0;
+ border-top-color: #ccc;
+ border-top-style: solid;
+ border-top-width: 1px;
+ border-right-color: #ccc;
+ border-right-style: solid;
+ border-right-width: 1px;
+ border-bottom-color: #ccc;
+ border-bottom-style: solid;
+ border-bottom-width: 1px;
+ padding-right: 5px;
+ padding-left: 5px;
}
+
#navcolumn h5 {
- font-size: smaller;
- border-bottom: 1px solid #aaaaaa;
- padding-top: 2px;
- padding-left: 9px;
- color: #49635a;
- background-image: url(../images/h5.jpg);
- background-repeat: no-repeat;
- background-position: left bottom;
+ font-size: smaller;
+ border-bottom: 1px solid #aaaaaa;
+ padding-top: 2px;
+ padding-left: 9px;
+ color: #49635a;
+ background-image: url( ../images/h5.jpg );
+ background-repeat: no-repeat;
+ background-position: left bottom;
}
table.bodyTable th {
- color: white;
- background-color: #bbb;
- text-align: left;
- font-weight: bold;
+ color: white;
+ background-color: #bbb;
+ text-align: left;
+ font-weight: bold;
}
table.bodyTable th, table.bodyTable td {
- font-size: 11px;
+ font-size: 11px;
}
table.bodyTable tr.a {
- background-color: #ddd;
+ background-color: #ddd;
}
table.bodyTable tr.b {
- background-color: #eee;
+ background-color: #eee;
}
.source {
- border: 1px solid #999;
- overflow:auto
+ border: 1px solid #999;
+ overflow: auto
}
+
dt {
- padding: 4px 4px 4px 24px;
- color: #333333;
- background-color: #ccc;
- font-weight: bold;
- font-size: 14px;
- background-image: url(../images/h3.jpg);
- background-repeat: no-repeat;
- background-position: left bottom;
+ padding: 4px 4px 4px 24px;
+ color: #333333;
+ background-color: #ccc;
+ font-weight: bold;
+ font-size: 14px;
+ background-image: url( ../images/h3.jpg );
+ background-repeat: no-repeat;
+ background-position: left bottom;
}
+
.subsectionTitle {
- font-size: 13px;
- font-weight: bold;
- color: #666;
+ font-size: 13px;
+ font-weight: bold;
+ color: #666;
}
table {
- font-size: 10px;
+ font-size: 10px;
}
+
.xright a:link, .xright a:visited, .xright a:active {
- color: #666;
+ color: #666;
}
+
.xright a:hover {
- color: #003300;
+ color: #003300;
}
+
#banner {
- height: 93px;
- background: url(../images/banner.jpg);
+ height: 93px;
+ background: url( ../images/banner.jpg );
}
+
#navcolumn ul {
- margin: 5px 0 15px -0em;
+ margin: 5px 0 15px -0em;
}
+
#navcolumn ul a {
- color: #333333;
+ color: #333333;
}
+
#navcolumn ul a:hover {
- color: red;
+ color: red;
}
+
#intro {
- border: solid #ccc 1px;
- margin: 6px 0px 0px 0px;
- padding: 10px 40px 10px 40px;
+ border: solid #ccc 1px;
+ margin: 6px 0px 0px 0px;
+ padding: 10px 40px 10px 40px;
}
+
.subsection {
- margin-left: 3px;
- color: #333333;
+ margin-left: 3px;
+ color: #333333;
}
.subsection p {
- font-size: 12px;
+ font-size: 12px;
}
+
#footer {
- padding: 10px;
- margin: 20px 0px 20px 0px;
- border-top: solid #ccc 1px;
- color: #333333;
+ padding: 10px;
+ margin: 20px 0px 20px 0px;
+ border-top: solid #ccc 1px;
+ color: #333333;
}
Modified: maven/scm/trunk/maven-scm-site/src/site/resources/css/site.css
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-site/src/site/resources/css/site.css?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-site/src/site/resources/css/site.css (original)
+++ maven/scm/trunk/maven-scm-site/src/site/resources/css/site.css Mon Feb 27 07:00:06 2006
@@ -1,52 +1,52 @@
a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
- background: none;
- padding-right: 0;
+ background: none;
+ padding-right: 0;
}
-/*
-body ul {
- list-style-type: square;
-}
-*/
+ /*
+ body ul {
+ list-style-type: square;
+ }
+ */
#downloadbox {
- float: right;
- margin: 0 10px 20px 20px;
- padding: 5px;
- border: 1px solid #999;
- background-color: #eee;
+ float: right;
+ margin: 0 10px 20px 20px;
+ padding: 5px;
+ border: 1px solid #999;
+ background-color: #eee;
}
#downloadbox h5 {
- color: #000;
- margin: 0;
- border-bottom: 1px solid #aaaaaa;
- font-size: smaller;
- padding: 0;
+ color: #000;
+ margin: 0;
+ border-bottom: 1px solid #aaaaaa;
+ font-size: smaller;
+ padding: 0;
}
#downloadbox p {
- margin-top: 1em;
- margin-bottom: 0;
+ margin-top: 1em;
+ margin-bottom: 0;
}
#downloadbox ul {
- margin-top: 0;
- margin-bottom: 1em;
- list-style-type: disc;
+ margin-top: 0;
+ margin-bottom: 1em;
+ list-style-type: disc;
}
#downloadbox li {
- font-size: smaller;
+ font-size: smaller;
}
-/*
-h4 {
- padding: 0;
- border: none;
- color: #000;
- margin: 0;
- font-size: larger;
- font-weight: bold;
-}
-*/
+ /*
+ h4 {
+ padding: 0;
+ border: none;
+ color: #000;
+ margin: 0;
+ font-size: larger;
+ font-weight: bold;
+ }
+ */
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/diff/DiffCommandTckTest.java Mon Feb 27 07:00:06 2006
@@ -16,12 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTckTestCase;
@@ -30,6 +24,12 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+
/**
* This test tests the diff command.
*
@@ -110,7 +110,7 @@
assertPath( "/src/main/java/org/Foo.java", file.getPath() );
- assertTrue( file.getStatus().isDiff());
+ assertTrue( file.getStatus().isDiff() );
String postRangeStr = "+/src/main/java/org/Foo.java\n\\ No newline at end of file\n";
String actualStr = differences.get( file.getPath() ).toString();
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/status/StatusCommandTckTest.java Mon Feb 27 07:00:06 2006
@@ -16,11 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TreeSet;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
@@ -30,6 +25,11 @@
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
/**
* This test tests the status command.
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java?rev=381352&r1=381351&r2=381352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java Mon Feb 27 07:00:06 2006
@@ -16,11 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TreeSet;
-
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
@@ -31,6 +26,11 @@
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.repository.ScmRepository;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
+
/**
* This test tests the update command.
* <p/>
@@ -142,7 +142,7 @@
ScmFile file = (ScmFile) files.next();
assertPath( "/src/main/java/org/Foo.java", file.getPath() );
//TODO : Consolidate file status so that we can remove "|| ADDED" term
- assertTrue( file.getStatus().isUpdate() || file.getStatus() == ScmFileStatus.ADDED);
+ assertTrue( file.getStatus().isUpdate() || file.getStatus() == ScmFileStatus.ADDED );
//readme.txt
file = (ScmFile) files.next();
@@ -153,6 +153,6 @@
file = (ScmFile) files.next();
assertPath( "/project.xml", file.getPath() );
//TODO : Consolidate file status so that we can remove "|| ADDED" term
- assertTrue( file.getStatus().isUpdate() || file.getStatus() == ScmFileStatus.ADDED);
+ assertTrue( file.getStatus().isUpdate() || file.getStatus() == ScmFileStatus.ADDED );
}
}