Author: evenisse
Date: Wed Mar 14 12:12:06 2007
New Revision: 518268
URL: http://svn.apache.org/viewvc?view=rev&rev=518268
Log:
Sharing consumers in cvs-commons
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java
(with props)
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
(with props)
Removed:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkin/CvsCheckInConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsCheckOutConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/diff/CvsDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/status/CvsStatusConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/tag/CvsTagConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/update/CvsUpdateConsumer.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkin/CvsExeCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/diff/CvsExeDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/remove/CvsExeRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/status/CvsExeStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/tag/CvsExeTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/update/CvsExeUpdateCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
Wed Mar 14 12:12:06 2007
@@ -67,7 +67,7 @@
if ( startDate != null )
{
- SimpleDateFormat outputDate = new SimpleDateFormat(
"yyyy-MM-dd'T'HH:mm:ssZ" );
+ SimpleDateFormat outputDate = new SimpleDateFormat(
getDateFormat() );
String dateRange;
@@ -82,16 +82,7 @@
cl.createArgument().setValue( "-d" );
- // There's a difference between UNIX-like OS and Windows
- // See http://jira.codehaus.org/browse/SCM-187
- if ( System.getProperty( "os.name" ).toLowerCase().indexOf(
"windows" ) > -1 )
- {
- cl.createArgument().setValue( "\"" + dateRange + "\"" );
- }
- else
- {
- cl.createArgument().setValue( dateRange );
- }
+ addDateRangeParameter( cl, dateRange );
}
if ( branch != null )
@@ -115,4 +106,23 @@
protected abstract ChangeLogScmResult executeCvsCommand( Commandline cl,
Date startDate, Date endDate,
String
datePattern )
throws ScmException;
+
+ protected String getDateFormat()
+ {
+ return "yyyy-MM-dd'T'HH:mm:ssZ";
+ }
+
+ protected void addDateRangeParameter( Commandline cl, String dateRange )
+ {
+ // There's a difference between UNIX-like OS and Windows
+ // See http://jira.codehaus.org/browse/SCM-187
+ if ( System.getProperty( "os.name" ).toLowerCase().indexOf( "windows"
) > -1 )
+ {
+ cl.createArgument().setValue( "\"" + dateRange + "\"" );
+ }
+ else
+ {
+ cl.createArgument().setValue( dateRange );
+ }
+ }
}
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java?view=auto&rev=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java
(added)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java
Wed Mar 14 12:12:06 2007
@@ -0,0 +1,90 @@
+package org.apache.maven.scm.provider.cvslib.command.checkin;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class CvsCheckInConsumer
+ implements StreamConsumer
+{
+ private List checkedInFiles = new ArrayList();
+
+ private String remotePath;
+
+ private ScmLogger logger;
+
+ public CvsCheckInConsumer( String remotePath, ScmLogger logger )
+ {
+ this.remotePath = remotePath;
+
+ this.logger = logger;
+ }
+
+ // ----------------------------------------------------------------------
+ // StreamConsumer Implementation
+ // ----------------------------------------------------------------------
+
+ public void consumeLine( String line )
+ {
+ /*
+ * The output from "cvs commit" contains lines like this:
+ *
+ * /path/rot/repo/test-repo/check-in/foo/bar,v <-- bar
+ *
+ * so this code assumes that it contains ",v <-- "
+ * it's a committed file.
+ */
+
+ logger.debug( line );
+
+ int end = line.indexOf( ",v <-- " );
+
+ if ( end == -1 )
+ {
+ return;
+ }
+
+ String fileName = line.substring( 0, end );
+
+ if ( !fileName.startsWith( remotePath ) )
+ {
+ return;
+ }
+
+ fileName = fileName.substring( remotePath.length() );
+
+ checkedInFiles.add( new ScmFile( fileName, ScmFileStatus.CHECKED_IN )
);
+ }
+
+ public List getCheckedInFiles()
+ {
+ return checkedInFiles;
+ }
+}
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java?view=auto&rev=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java
(added)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java
Wed Mar 14 12:12:06 2007
@@ -0,0 +1,89 @@
+package org.apache.maven.scm.provider.cvslib.command.checkout;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class CvsCheckOutConsumer
+ implements StreamConsumer
+{
+ private ScmLogger logger;
+
+ private List files = new ArrayList();
+
+ public CvsCheckOutConsumer( ScmLogger logger )
+ {
+ this.logger = logger;
+ }
+
+ public void consumeLine( String line )
+ {
+ logger.debug( line );
+
+ if ( line.length() < 3 )
+ {
+ if ( StringUtils.isNotEmpty( line ) )
+ {
+ logger.warn(
+ "Unable to parse output from command: line length must be
bigger than 3. (" + line + ")." );
+ }
+ return;
+ }
+
+ String status = line.substring( 0, 2 );
+
+ String file = line.substring( 2 );
+
+ file = file.substring( file.indexOf( '/' ) );
+
+ if ( status.equals( "U " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.UPDATED ) );
+ }
+ else if ( status.equals( "P " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.PATCHED ) );
+ }
+ else if ( status.equals( "C " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.CONFLICT ) );
+ }
+ else
+ {
+ logger.warn( "Unknown status: '" + status + "'." );
+ }
+ }
+
+ public List getCheckedOutFiles()
+ {
+ return files;
+ }
+}
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/AbstractCvsDiffCommand.java
Wed Mar 14 12:12:06 2007
@@ -47,7 +47,10 @@
cl.createArgument().setValue( "-u" );
- cl.createArgument().setValue( "-N" );
+ if ( isSupportNewFileParameter() )
+ {
+ cl.createArgument().setValue( "-N" );
+ }
if ( startRevision != null )
{
@@ -69,4 +72,9 @@
protected abstract DiffScmResult executeCvsCommand( Commandline cl )
throws ScmException;
+
+ protected boolean isSupportNewFileParameter()
+ {
+ return true;
+ }
}
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java?view=auto&rev=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
(added)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
Wed Mar 14 12:12:06 2007
@@ -0,0 +1,185 @@
+package org.apache.maven.scm.provider.cvslib.command.diff;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @version $Id$
+ * @todo share with SVN (3 extra lines can be ignored)
+ */
+public class CvsDiffConsumer
+ implements StreamConsumer
+{
+ //
+ // Index: plugin.jelly
+ // ===================================================================
+ // RCS file:
/home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/resources/META-INF/plexus/components.xml,v
+ // retrieving revision 1.2
+ // diff -u -r1.2 components.xml
+ // --- plugin.jelly (revision 124799)
+ // +++ plugin.jelly (working copy)
+ //
+
+ private final static String RCS_TOKEN = "RCS file: ";
+
+ private final static String RETRIEVING_TOKEN = "retrieving revision ";
+
+ private final static String DIFF_TOKEN = "diff ";
+
+ private final static String INDEX_TOKEN = "Index: ";
+
+ private final static String FILE_SEPARATOR_TOKEN = "===";
+
+ private final static String START_REVISION_TOKEN = "---";
+
+ private final static String END_REVISION_TOKEN = "+++";
+
+ private final static String ADDED_LINE_TOKEN = "+";
+
+ private final static String REMOVED_LINE_TOKEN = "-";
+
+ private final static String UNCHANGED_LINE_TOKEN = " ";
+
+ private final static String CHANGE_SEPARATOR_TOKEN = "@@";
+
+ private final static String NO_NEWLINE_TOKEN = "\\ No newline at end of
file";
+
+ private ScmLogger logger;
+
+ private String currentFile;
+
+ private StringBuffer currentDifference;
+
+ private List changedFiles = new ArrayList();
+
+ private Map differences = new HashMap();
+
+ private StringBuffer patch = new StringBuffer();
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ public CvsDiffConsumer( ScmLogger logger, File workingDirectory )
+ {
+ this.logger = logger;
+ }
+
+ // ----------------------------------------------------------------------
+ // StreamConsumer Implementation
+ // ----------------------------------------------------------------------
+
+ public void consumeLine( String line )
+ {
+ if ( line.startsWith( INDEX_TOKEN ) )
+ {
+ // start a new file
+ currentFile = line.substring( INDEX_TOKEN.length() );
+
+ changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED
) );
+
+ currentDifference = new StringBuffer();
+
+ differences.put( currentFile, currentDifference );
+
+ patch.append( line ).append( "\n" );
+
+ return;
+ }
+
+ if ( currentFile == null )
+ {
+ logger.warn( "Unparseable line: '" + line + "'" );
+ patch.append( line ).append( "\n" );
+ return;
+ }
+
+ if ( line.startsWith( FILE_SEPARATOR_TOKEN ) )
+ {
+ // skip
+ patch.append( line ).append( "\n" );
+ }
+ else if ( line.startsWith( START_REVISION_TOKEN ) )
+ {
+ // skip, though could parse to verify filename, start revision
+ patch.append( line ).append( "\n" );
+ }
+ else if ( line.startsWith( END_REVISION_TOKEN ) )
+ {
+ // skip, though could parse to verify filename, end revision
+ patch.append( line ).append( "\n" );
+ }
+ else if ( line.startsWith( RCS_TOKEN ) )
+ {
+ // skip, though could parse to verify filename
+ }
+ else if ( line.startsWith( RETRIEVING_TOKEN ) )
+ {
+ // skip, though could parse to verify version
+ }
+ else if ( line.startsWith( DIFF_TOKEN ) )
+ {
+ // skip, though could parse to verify command
+ }
+ else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith(
REMOVED_LINE_TOKEN ) ||
+ line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith(
CHANGE_SEPARATOR_TOKEN ) ||
+ line.equals( NO_NEWLINE_TOKEN ) )
+ {
+ // add to buffer
+ currentDifference.append( line ).append( "\n" );
+ patch.append( line ).append( "\n" );
+ }
+ else
+ {
+ logger.warn( "Unparseable line: '" + line + "'" );
+ patch.append( line ).append( "\n" );
+ // skip to next file
+ currentFile = null;
+ currentDifference = null;
+ }
+ }
+
+ public List getChangedFiles()
+ {
+ return changedFiles;
+ }
+
+ public Map getDifferences()
+ {
+ return differences;
+ }
+
+ public String getPatch()
+ {
+ return patch.toString();
+ }
+
+}
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java?view=auto&rev=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java
(added)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java
Wed Mar 14 12:12:06 2007
@@ -0,0 +1,119 @@
+package org.apache.maven.scm.provider.cvslib.command.status;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @version $Id$
+ */
+public class CvsStatusConsumer
+ implements StreamConsumer
+{
+ private ScmLogger logger;
+
+ private File workingDirectory;
+
+ private List changedFiles = new ArrayList();
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ public CvsStatusConsumer( ScmLogger logger, File workingDirectory )
+ {
+ this.logger = logger;
+
+ this.workingDirectory = workingDirectory;
+ }
+
+ // ----------------------------------------------------------------------
+ // StreamConsumer Implementation
+ // ----------------------------------------------------------------------
+
+ public void consumeLine( String line )
+ {
+ if ( line.length() <= 3 )
+ {
+ logger.warn( "Unexpected input, the line must be at least three
characters long. Line: '" + line + "'." );
+
+ return;
+ }
+
+ String statusString = line.substring( 0, 1 );
+
+ String file = line.substring( 2 );
+
+ ScmFileStatus status;
+
+ if ( statusString.equals( "A" ) )
+ {
+ status = ScmFileStatus.ADDED;
+ }
+ else if ( statusString.equals( "M" ) )
+ {
+ status = ScmFileStatus.MODIFIED;
+ }
+ else if ( statusString.equals( "D" ) )
+ {
+ status = ScmFileStatus.DELETED;
+ }
+ else if ( statusString.equals( "C" ) )
+ {
+ status = ScmFileStatus.CONFLICT;
+ }
+ else if ( statusString.equals( "?" ) )
+ {
+ status = ScmFileStatus.UNKNOWN;
+ }
+ else if ( statusString.equals( "U" ) || statusString.equals( "P" ) )
+ {
+ // skip remote changes
+ return;
+ }
+ else
+ {
+ logger.info( "Unknown file status: '" + statusString + "'." );
+
+ return;
+ }
+
+ // If the file isn't a file; don't add it.
+ if ( !new File( workingDirectory, file ).isFile() )
+ {
+ return;
+ }
+
+ changedFiles.add( new ScmFile( file, status ) );
+ }
+
+ public List getChangedFiles()
+ {
+ return changedFiles;
+ }
+}
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java?view=auto&rev=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java
(added)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java
Wed Mar 14 12:12:06 2007
@@ -0,0 +1,79 @@
+package org.apache.maven.scm.provider.cvslib.command.tag;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @version $Id$
+ */
+public class CvsTagConsumer
+ implements StreamConsumer
+{
+ private ScmLogger logger;
+
+ private List files = new ArrayList();
+
+ public CvsTagConsumer( ScmLogger logger )
+ {
+ this.logger = logger;
+ }
+
+ public void consumeLine( String line )
+ {
+ logger.debug( line );
+
+ if ( line.length() < 3 )
+ {
+ if ( StringUtils.isNotEmpty( line ) )
+ {
+ logger.warn(
+ "Unable to parse output from command: line length must be
bigger than 3. (" + line + ")." );
+ }
+ return;
+ }
+
+ String status = line.substring( 0, 2 );
+
+ String file = line.substring( 2 );
+
+ if ( status.equals( "T " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.TAGGED ) );
+ }
+ else
+ {
+ logger.warn( "Unknown status: '" + status + "'." );
+ }
+ }
+
+ public List getTaggedFiles()
+ {
+ return files;
+ }
+}
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java?view=auto&rev=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
(added)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
Wed Mar 14 12:12:06 2007
@@ -0,0 +1,99 @@
+package org.apache.maven.scm.provider.cvslib.command.update;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class CvsUpdateConsumer
+ implements StreamConsumer
+{
+ private ScmLogger logger;
+
+ private List files = new ArrayList();
+
+ public CvsUpdateConsumer( ScmLogger logger )
+ {
+ this.logger = logger;
+ }
+
+ public void consumeLine( String line )
+ {
+ logger.debug( line );
+
+ if ( line.length() < 3 )
+ {
+ if ( StringUtils.isNotEmpty( line ) )
+ {
+ logger.warn(
+ "Unable to parse output from command: line length must be
bigger than 3. (" + line + ")." );
+ }
+ return;
+ }
+
+ String status = line.substring( 0, 2 );
+
+ String file = line.substring( 2 );
+
+ if ( status.equals( "U " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.UPDATED ) );
+ }
+ else if ( status.equals( "P " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.PATCHED ) );
+ }
+ else if ( status.equals( "A " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.ADDED ) );
+ }
+ else if ( status.equals( "C " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.CONFLICT ) );
+ }
+ else if ( status.equals( "M " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.MODIFIED ) );
+ }
+ else if ( status.equals( "? " ) )
+ {
+ files.add( new ScmFile( file, ScmFileStatus.UNKNOWN ) );
+ }
+ else
+ {
+ logger.warn( "Unknown status: '" + status + "' for file '" + file
+ "'." );
+ }
+ }
+
+ public List getUpdatedFiles()
+ {
+ return files;
+ }
+}
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkin/CvsExeCheckInCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkin/CvsExeCheckInCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkin/CvsExeCheckInCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkin/CvsExeCheckInCommand.java
Wed Mar 14 12:12:06 2007
@@ -22,6 +22,7 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import
org.apache.maven.scm.provider.cvslib.command.checkin.AbstractCvsCheckInCommand;
+import org.apache.maven.scm.provider.cvslib.command.checkin.CvsCheckInConsumer;
import
org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckOutCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckOutCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckOutCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/checkout/CvsExeCheckOutCommand.java
Wed Mar 14 12:12:06 2007
@@ -22,6 +22,7 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import
org.apache.maven.scm.provider.cvslib.command.checkout.AbstractCvsCheckOutCommand;
+import
org.apache.maven.scm.provider.cvslib.command.checkout.CvsCheckOutConsumer;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/diff/CvsExeDiffCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/diff/CvsExeDiffCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/diff/CvsExeDiffCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/diff/CvsExeDiffCommand.java
Wed Mar 14 12:12:06 2007
@@ -22,6 +22,7 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.diff.DiffScmResult;
import
org.apache.maven.scm.provider.cvslib.command.diff.AbstractCvsDiffCommand;
+import org.apache.maven.scm.provider.cvslib.command.diff.CvsDiffConsumer;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/list/CvsExeListCommand.java
Wed Mar 14 12:12:06 2007
@@ -19,17 +19,10 @@
* under the License.
*/
-import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.command.list.ListScmResult;
-import org.apache.maven.scm.command.status.StatusScmResult;
-import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.provider.ScmProviderRepository;
import
org.apache.maven.scm.provider.cvslib.command.list.AbstractCvsListCommand;
-import
org.apache.maven.scm.provider.cvslib.cvsexe.command.status.CvsExeStatusCommand;
-import
org.apache.maven.scm.provider.cvslib.cvsexe.command.status.CvsStatusConsumer;
+import org.apache.maven.scm.provider.cvslib.command.status.CvsStatusConsumer;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/remove/CvsExeRemoveCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/remove/CvsExeRemoveCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/remove/CvsExeRemoveCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/remove/CvsExeRemoveCommand.java
Wed Mar 14 12:12:06 2007
@@ -60,6 +60,5 @@
}
return new RemoveScmResult( cl.toString(), removedFiles );
-
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/status/CvsExeStatusCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/status/CvsExeStatusCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/status/CvsExeStatusCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/status/CvsExeStatusCommand.java
Wed Mar 14 12:12:06 2007
@@ -22,6 +22,7 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.status.StatusScmResult;
import
org.apache.maven.scm.provider.cvslib.command.status.AbstractCvsStatusCommand;
+import org.apache.maven.scm.provider.cvslib.command.status.CvsStatusConsumer;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/tag/CvsExeTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/tag/CvsExeTagCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/tag/CvsExeTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/tag/CvsExeTagCommand.java
Wed Mar 14 12:12:06 2007
@@ -22,6 +22,7 @@
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.provider.cvslib.command.tag.AbstractCvsTagCommand;
+import org.apache.maven.scm.provider.cvslib.command.tag.CvsTagConsumer;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/update/CvsExeUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/update/CvsExeUpdateCommand.java?view=diff&rev=518268&r1=518267&r2=518268
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/update/CvsExeUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/main/java/org/apache/maven/scm/provider/cvslib/cvsexe/command/update/CvsExeUpdateCommand.java
Wed Mar 14 12:12:06 2007
@@ -23,6 +23,7 @@
import org.apache.maven.scm.command.changelog.ChangeLogCommand;
import org.apache.maven.scm.command.update.UpdateScmResult;
import
org.apache.maven.scm.provider.cvslib.command.update.AbstractCvsUpdateCommand;
+import org.apache.maven.scm.provider.cvslib.command.update.CvsUpdateConsumer;
import
org.apache.maven.scm.provider.cvslib.cvsexe.command.changelog.CvsExeChangeLogCommand;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -68,6 +69,5 @@
command.setLogger( getLogger() );
return command;
-
}
}
