maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r264806 [1/3] - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src: main/java/org/apache/maven/scm/provider/starteam/command/add/ main/java/org/apache/maven/scm/provider/starteam/command/checkin/ main/java/org/apache/ma...
Date Tue, 30 Aug 2005 16:26:54 GMT
Author: evenisse
Date: Tue Aug 30 09:26:17 2005
New Revision: 264806

URL: http://svn.apache.org/viewcvs?rev=264806&view=rev
Log:
Fix svn properties

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommand.java   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumer.java   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumer.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagConsumer.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommand.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommandTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumerTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommandTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumerTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumerTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommandTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumerTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommandTest.java   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumerTest.java   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommandTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumerTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommandTest.java   (contents, props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/update/StarteamUpdateCommandTest.java   (contents, props changed)

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.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/add/StarteamAddCommand.java?rev=264806&r1=264805&r2=264806&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java Tue Aug 30 09:26:17 2005
@@ -1,90 +1,90 @@
-package org.apache.maven.scm.provider.starteam.command.add;
-
-/*
- * Copyright 2001-2005 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 java.io.File;
-
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.command.add.AbstractAddCommand;
-import org.apache.maven.scm.command.add.AddScmResult;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
-import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
-import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-import org.codehaus.plexus.util.cli.Commandline;
-
-/**
- * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
- * @version $Id: $
- */
-public class StarteamAddCommand
-    extends AbstractAddCommand
-    implements StarteamCommand
-{
-    protected ScmResult executeAddCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
-                                           boolean binary )
-        throws ScmException
-    {
-
-        //work around until maven-scm-api allow this
-        String issue = System.getProperty( "maven.scm.issue" );
-
-        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
-
-        StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
-
-        StarteamAddConsumer consumer = new StarteamAddConsumer( getLogger(), fileSet.getBasedir() );
-
-        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-
-        File[] files = fileSet.getFiles();
-
-        for ( int i = 0; i < files.length; ++i )
-        {
-            Commandline cl = createCommandLine( repository, files[i], issue );
-
-            int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
-
-            if ( exitCode != 0 )
-            {
-                return new AddScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
-            }
-        }
-
-        return new AddScmResult( null, consumer.getAddedFiles() );
-    }
-
-    static Commandline createCommandLine( StarteamScmProviderRepository repo, File toBeAddedFile, String issue )
-    {
-        Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "add", toBeAddedFile, repo );
-
-        if ( issue != null && issue.length() > 0 )
-        {
-            cl.createArgument().setValue( "-cr" );
-
-            cl.createArgument().setValue( issue );
-        }
-
-        cl.createArgument().setValue( toBeAddedFile.getName() );
-
-        return cl;
-    }
-}
+package org.apache.maven.scm.provider.starteam.command.add;
+
+/*
+ * Copyright 2001-2005 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 java.io.File;
+
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.add.AbstractAddCommand;
+import org.apache.maven.scm.command.add.AddScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
+import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
+import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
+
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+/**
+ * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @version $Id$
+ */
+public class StarteamAddCommand
+    extends AbstractAddCommand
+    implements StarteamCommand
+{
+    protected ScmResult executeAddCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
+                                           boolean binary )
+        throws ScmException
+    {
+
+        //work around until maven-scm-api allow this
+        String issue = System.getProperty( "maven.scm.issue" );
+
+        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
+
+        StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
+
+        StarteamAddConsumer consumer = new StarteamAddConsumer( getLogger(), fileSet.getBasedir() );
+
+        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
+
+        File[] files = fileSet.getFiles();
+
+        for ( int i = 0; i < files.length; ++i )
+        {
+            Commandline cl = createCommandLine( repository, files[i], issue );
+
+            int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
+
+            if ( exitCode != 0 )
+            {
+                return new AddScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+            }
+        }
+
+        return new AddScmResult( null, consumer.getAddedFiles() );
+    }
+
+    static Commandline createCommandLine( StarteamScmProviderRepository repo, File toBeAddedFile, String issue )
+    {
+        Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "add", toBeAddedFile, repo );
+
+        if ( issue != null && issue.length() > 0 )
+        {
+            cl.createArgument().setValue( "-cr" );
+
+            cl.createArgument().setValue( issue );
+        }
+
+        cl.createArgument().setValue( toBeAddedFile.getName() );
+
+        return cl;
+    }
+}

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddCommand.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.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/add/StarteamAddConsumer.java?rev=264806&r1=264805&r2=264806&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java Tue Aug 30 09:26:17 2005
@@ -1,122 +1,122 @@
-package org.apache.maven.scm.provider.starteam.command.add;
-
-/*
- * Copyright 2001-2005 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.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;
-import java.io.File;
-
-/**
- * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
- * @version $Id: $
- */
-public class StarteamAddConsumer
-    implements StreamConsumer
-{
-    private ScmLogger logger;
-
-    private String workingDirectory;
-
-    /**
-     * the current directory entry being processed by the parser
-     */
-    private String currentDir;
-
-    private List files = new ArrayList();
-
-    /**
-     * Marks current directory data
-     */
-    private static final String DIR_MARKER = "(working dir: ";
-
-    /**
-     * Marks current file data
-     */
-    private static final String ADDED_MARKER = ": added";
-
-    /**
-     * Marks current file data
-     */
-    private static final String LINKTO_MARKER = ": linked to";
-
-    public StarteamAddConsumer( ScmLogger logger, File basedir )
-    {
-        this.logger = logger;
-
-        this.workingDirectory = basedir.getPath().replace( '\\', '/' );
-    }
-
-    public void consumeLine( String line )
-    {
-        logger.debug( line );
-
-        int pos = 0;
-
-        if ( ( pos = line.indexOf( DIR_MARKER ) ) != -1 )
-        {
-            processDirectory( line, pos );
-        }
-        else if ( ( pos = line.indexOf( ADDED_MARKER ) ) != -1 )
-        {
-            processAddedFile( line, pos );
-        }
-        else if ( ( pos = line.indexOf( LINKTO_MARKER ) ) != -1 )
-        {
-            //ignore
-        }
-        else
-        {
-            this.logger.warn( "Unknown add ouput: " + line );
-        }
-    }
-
-    public List getAddedFiles()
-    {
-        return files;
-    }
-
-    private void processDirectory( String line, int pos )
-    {
-        String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace( '\\', '/' );
-
-        if ( !dirPath.startsWith( workingDirectory ) )
-        {
-            logger.info( "Working directory: " + workingDirectory );
-
-            logger.info( "Checkin directory path: " + dirPath );
-
-            throw new IllegalStateException( "Working and checkin directories are not on the same tree" );
-        }
-
-        this.currentDir = "." + dirPath.substring( workingDirectory.length() );
-    }
-
-    private void processAddedFile( String line, int pos )
-    {
-        String addedFilePath = this.currentDir + "/" + line.substring( 0, pos );
-
-        this.files.add( new ScmFile( addedFilePath, ScmFileStatus.ADDED ) );
-
-        this.logger.info( "Added: " + addedFilePath );
-    }
-
-}
+package org.apache.maven.scm.provider.starteam.command.add;
+
+/*
+ * Copyright 2001-2005 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.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;
+import java.io.File;
+
+/**
+ * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @version $Id$
+ */
+public class StarteamAddConsumer
+    implements StreamConsumer
+{
+    private ScmLogger logger;
+
+    private String workingDirectory;
+
+    /**
+     * the current directory entry being processed by the parser
+     */
+    private String currentDir;
+
+    private List files = new ArrayList();
+
+    /**
+     * Marks current directory data
+     */
+    private static final String DIR_MARKER = "(working dir: ";
+
+    /**
+     * Marks current file data
+     */
+    private static final String ADDED_MARKER = ": added";
+
+    /**
+     * Marks current file data
+     */
+    private static final String LINKTO_MARKER = ": linked to";
+
+    public StarteamAddConsumer( ScmLogger logger, File basedir )
+    {
+        this.logger = logger;
+
+        this.workingDirectory = basedir.getPath().replace( '\\', '/' );
+    }
+
+    public void consumeLine( String line )
+    {
+        logger.debug( line );
+
+        int pos = 0;
+
+        if ( ( pos = line.indexOf( DIR_MARKER ) ) != -1 )
+        {
+            processDirectory( line, pos );
+        }
+        else if ( ( pos = line.indexOf( ADDED_MARKER ) ) != -1 )
+        {
+            processAddedFile( line, pos );
+        }
+        else if ( ( pos = line.indexOf( LINKTO_MARKER ) ) != -1 )
+        {
+            //ignore
+        }
+        else
+        {
+            this.logger.warn( "Unknown add ouput: " + line );
+        }
+    }
+
+    public List getAddedFiles()
+    {
+        return files;
+    }
+
+    private void processDirectory( String line, int pos )
+    {
+        String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace( '\\', '/' );
+
+        if ( !dirPath.startsWith( workingDirectory ) )
+        {
+            logger.info( "Working directory: " + workingDirectory );
+
+            logger.info( "Checkin directory path: " + dirPath );
+
+            throw new IllegalStateException( "Working and checkin directories are not on the same tree" );
+        }
+
+        this.currentDir = "." + dirPath.substring( workingDirectory.length() );
+    }
+
+    private void processAddedFile( String line, int pos )
+    {
+        String addedFilePath = this.currentDir + "/" + line.substring( 0, pos );
+
+        this.files.add( new ScmFile( addedFilePath, ScmFileStatus.ADDED ) );
+
+        this.logger.info( "Added: " + addedFilePath );
+    }
+
+}

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/add/StarteamAddConsumer.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.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/checkin/StarteamCheckInCommand.java?rev=264806&r1=264805&r2=264806&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java Tue Aug 30 09:26:17 2005
@@ -1,136 +1,136 @@
-package org.apache.maven.scm.provider.starteam.command.checkin;
-
-/*
- * Copyright 2001-2005 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 java.io.File;
-
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-
-import org.apache.maven.scm.command.checkin.AbstractCheckInCommand;
-import org.apache.maven.scm.command.checkin.CheckInScmResult;
-
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
-import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
-import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-
-/**
- * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
- * @version $Id: $
- */
-public class StarteamCheckInCommand
-    extends AbstractCheckInCommand
-    implements StarteamCommand
-{
-    // ----------------------------------------------------------------------
-    // AbstractCheckInCommand Implementation
-    // ----------------------------------------------------------------------
-
-    protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
-                                                      String tag )
-        throws ScmException
-    {
-        //work around until maven-scm-api allow this
-        String issue = System.getProperty( "maven.scm.issue" );
-
-        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
-
-        StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
-
-        StarteamCheckInConsumer consumer = new StarteamCheckInConsumer( getLogger(), fileSet.getBasedir() );
-
-        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-
-        File[] checkInFiles = fileSet.getFiles();
-
-        if ( checkInFiles.length == 0 )
-        {
-            Commandline cl = createCommandLine( repository, fileSet.getBasedir(), message, tag, issue );
-
-            int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
-
-            if ( exitCode != 0 )
-            {
-                return new CheckInScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
-            }
-        }
-        else
-        {
-            //update only interested files already on the local disk
-            for ( int i = 0; i < checkInFiles.length; ++i )
-            {
-                Commandline cl = createCommandLine( repository, checkInFiles[i], message, tag, issue );
-
-                int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
-
-                if ( exitCode != 0 )
-                {
-                    return new CheckInScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
-                }
-            }
-        }
-
-        return new CheckInScmResult( null, consumer.getCheckedInFiles() );
-
-    }
-
-    public static Commandline createCommandLine( StarteamScmProviderRepository repo, File dirOrFile, String message,
-                                                 String tag, String issue )
-    {
-        Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "ci", dirOrFile, repo );
-
-        if ( message != null && message.length() > 0 )
-        {
-            cl.createArgument().setValue( "-r" );
-
-            cl.createArgument().setValue( message );
-        }
-
-        if ( tag != null && tag.length() > 0 )
-        {
-            cl.createArgument().setValue( "-vl" );
-
-            cl.createArgument().setValue( tag );
-        }
-
-        if ( issue != null && issue.length() > 0 )
-        {
-            cl.createArgument().setValue( "-cr" );
-
-            cl.createArgument().setValue( issue );
-        }
-
-        if ( dirOrFile.isDirectory() )
-        {
-            cl.createArgument().setValue( "-f" );
-
-            cl.createArgument().setValue( "NCI" );
-
-            cl.createArgument().setValue( "-is" );
-        }
-        else
-        {
-            cl.createArgument().setValue( dirOrFile.getName() );
-        }
-
-        return cl;
-    }
-}
+package org.apache.maven.scm.provider.starteam.command.checkin;
+
+/*
+ * Copyright 2001-2005 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 java.io.File;
+
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+
+import org.apache.maven.scm.command.checkin.AbstractCheckInCommand;
+import org.apache.maven.scm.command.checkin.CheckInScmResult;
+
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
+import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
+import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
+
+import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+
+/**
+ * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @version $Id$
+ */
+public class StarteamCheckInCommand
+    extends AbstractCheckInCommand
+    implements StarteamCommand
+{
+    // ----------------------------------------------------------------------
+    // AbstractCheckInCommand Implementation
+    // ----------------------------------------------------------------------
+
+    protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
+                                                      String tag )
+        throws ScmException
+    {
+        //work around until maven-scm-api allow this
+        String issue = System.getProperty( "maven.scm.issue" );
+
+        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
+
+        StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
+
+        StarteamCheckInConsumer consumer = new StarteamCheckInConsumer( getLogger(), fileSet.getBasedir() );
+
+        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
+
+        File[] checkInFiles = fileSet.getFiles();
+
+        if ( checkInFiles.length == 0 )
+        {
+            Commandline cl = createCommandLine( repository, fileSet.getBasedir(), message, tag, issue );
+
+            int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
+
+            if ( exitCode != 0 )
+            {
+                return new CheckInScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+            }
+        }
+        else
+        {
+            //update only interested files already on the local disk
+            for ( int i = 0; i < checkInFiles.length; ++i )
+            {
+                Commandline cl = createCommandLine( repository, checkInFiles[i], message, tag, issue );
+
+                int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
+
+                if ( exitCode != 0 )
+                {
+                    return new CheckInScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+                }
+            }
+        }
+
+        return new CheckInScmResult( null, consumer.getCheckedInFiles() );
+
+    }
+
+    public static Commandline createCommandLine( StarteamScmProviderRepository repo, File dirOrFile, String message,
+                                                 String tag, String issue )
+    {
+        Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "ci", dirOrFile, repo );
+
+        if ( message != null && message.length() > 0 )
+        {
+            cl.createArgument().setValue( "-r" );
+
+            cl.createArgument().setValue( message );
+        }
+
+        if ( tag != null && tag.length() > 0 )
+        {
+            cl.createArgument().setValue( "-vl" );
+
+            cl.createArgument().setValue( tag );
+        }
+
+        if ( issue != null && issue.length() > 0 )
+        {
+            cl.createArgument().setValue( "-cr" );
+
+            cl.createArgument().setValue( issue );
+        }
+
+        if ( dirOrFile.isDirectory() )
+        {
+            cl.createArgument().setValue( "-f" );
+
+            cl.createArgument().setValue( "NCI" );
+
+            cl.createArgument().setValue( "-is" );
+        }
+        else
+        {
+            cl.createArgument().setValue( dirOrFile.getName() );
+        }
+
+        return cl;
+    }
+}

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInCommand.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.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/checkin/StarteamCheckInConsumer.java?rev=264806&r1=264805&r2=264806&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java Tue Aug 30 09:26:17 2005
@@ -1,138 +1,138 @@
-package org.apache.maven.scm.provider.starteam.command.checkin;
-
-/*
- * Copyright 2001-2005 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.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;
-import java.io.File;
-
-/**
- * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
- * @version $Id: $
- */
-public class StarteamCheckInConsumer
-    implements StreamConsumer
-{
-    private String workingDirectory;
-
-    private ScmLogger logger;
-
-    private List files = new ArrayList();
-
-    /**
-     * the current directory entry being processed by the parser
-     */
-    private String currentDir = "";
-
-    /**
-     * Marks current directory data
-     */
-    private static final String DIR_MARKER = "(working dir: ";
-
-    /**
-     * Marks current file data
-     */
-    private static final String CHECKIN_MARKER = ": checked in";
-
-    /**
-     * Marks skipped file during update
-     */
-    private static final String SKIPPED_MARKER = ": skipped";
-
-    /**
-     * Marks current file data
-     */
-    private static final String LINKTO_MARKER = ": linked to";
-
-    public StarteamCheckInConsumer( ScmLogger logger, File basedir )
-    {
-        this.logger = logger;
-        this.workingDirectory = basedir.getPath().replace( '\\', '/' );
-    }
-
-    public void consumeLine( String line )
-    {
-        logger.debug( line );
-
-        int pos = 0;
-
-        if ( ( pos = line.indexOf( DIR_MARKER ) ) != -1 )
-        {
-            processDirectory( line, pos );
-        }
-        else if ( ( pos = line.indexOf( CHECKIN_MARKER ) ) != -1 )
-        {
-            processCheckedInFile( line, pos );
-        }
-        else if ( ( pos = line.indexOf( SKIPPED_MARKER ) ) != -1 )
-        {
-            processSkippedFile( line, pos );
-        }
-        else if ( ( pos = line.indexOf( LINKTO_MARKER ) ) != -1 )
-        {
-            //ignore
-        }
-        else
-        {
-            this.logger.warn( "Unknown checkin ouput: " + line );
-        }
-
-    }
-
-    public List getCheckedInFiles()
-    {
-        return files;
-    }
-
-    private void processDirectory( String line, int pos )
-    {
-        String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace( '\\', '/' );
-
-        if ( !dirPath.startsWith( workingDirectory ) )
-        {
-            logger.info( "Working directory: " + workingDirectory );
-
-            logger.info( "Checkin directory: " + dirPath );
-
-            throw new IllegalStateException( "Working and checkin directories are not on the same tree" );
-        }
-
-        this.currentDir = "." + dirPath.substring( workingDirectory.length() );
-    }
-
-    private void processCheckedInFile( String line, int pos )
-    {
-        String checkedInFilePath = this.currentDir + "/" + line.substring( 0, pos );
-
-        this.files.add( new ScmFile( checkedInFilePath, ScmFileStatus.CHECKED_OUT ) );
-
-        this.logger.info( "Checked in: " + checkedInFilePath );
-    }
-
-    private void processSkippedFile( String line, int pos )
-    {
-        String skippedFilePath = this.currentDir + "/" + line.substring( 0, pos );
-
-        this.logger.info( "Skipped: " + skippedFilePath );
-    }
-
-}
+package org.apache.maven.scm.provider.starteam.command.checkin;
+
+/*
+ * Copyright 2001-2005 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.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;
+import java.io.File;
+
+/**
+ * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @version $Id$
+ */
+public class StarteamCheckInConsumer
+    implements StreamConsumer
+{
+    private String workingDirectory;
+
+    private ScmLogger logger;
+
+    private List files = new ArrayList();
+
+    /**
+     * the current directory entry being processed by the parser
+     */
+    private String currentDir = "";
+
+    /**
+     * Marks current directory data
+     */
+    private static final String DIR_MARKER = "(working dir: ";
+
+    /**
+     * Marks current file data
+     */
+    private static final String CHECKIN_MARKER = ": checked in";
+
+    /**
+     * Marks skipped file during update
+     */
+    private static final String SKIPPED_MARKER = ": skipped";
+
+    /**
+     * Marks current file data
+     */
+    private static final String LINKTO_MARKER = ": linked to";
+
+    public StarteamCheckInConsumer( ScmLogger logger, File basedir )
+    {
+        this.logger = logger;
+        this.workingDirectory = basedir.getPath().replace( '\\', '/' );
+    }
+
+    public void consumeLine( String line )
+    {
+        logger.debug( line );
+
+        int pos = 0;
+
+        if ( ( pos = line.indexOf( DIR_MARKER ) ) != -1 )
+        {
+            processDirectory( line, pos );
+        }
+        else if ( ( pos = line.indexOf( CHECKIN_MARKER ) ) != -1 )
+        {
+            processCheckedInFile( line, pos );
+        }
+        else if ( ( pos = line.indexOf( SKIPPED_MARKER ) ) != -1 )
+        {
+            processSkippedFile( line, pos );
+        }
+        else if ( ( pos = line.indexOf( LINKTO_MARKER ) ) != -1 )
+        {
+            //ignore
+        }
+        else
+        {
+            this.logger.warn( "Unknown checkin ouput: " + line );
+        }
+
+    }
+
+    public List getCheckedInFiles()
+    {
+        return files;
+    }
+
+    private void processDirectory( String line, int pos )
+    {
+        String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace( '\\', '/' );
+
+        if ( !dirPath.startsWith( workingDirectory ) )
+        {
+            logger.info( "Working directory: " + workingDirectory );
+
+            logger.info( "Checkin directory: " + dirPath );
+
+            throw new IllegalStateException( "Working and checkin directories are not on the same tree" );
+        }
+
+        this.currentDir = "." + dirPath.substring( workingDirectory.length() );
+    }
+
+    private void processCheckedInFile( String line, int pos )
+    {
+        String checkedInFilePath = this.currentDir + "/" + line.substring( 0, pos );
+
+        this.files.add( new ScmFile( checkedInFilePath, ScmFileStatus.CHECKED_OUT ) );
+
+        this.logger.info( "Checked in: " + checkedInFilePath );
+    }
+
+    private void processSkippedFile( String line, int pos )
+    {
+        String skippedFilePath = this.currentDir + "/" + line.substring( 0, pos );
+
+        this.logger.info( "Skipped: " + skippedFilePath );
+    }
+
+}

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkin/StarteamCheckInConsumer.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.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/checkout/StarteamCheckOutConsumer.java?rev=264806&r1=264805&r2=264806&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java Tue Aug 30 09:26:17 2005
@@ -1,130 +1,130 @@
-package org.apache.maven.scm.provider.starteam.command.checkout;
-
-/*
- * Copyright 2001-2005 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.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;
-import java.io.File;
-
-/**
- * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
- * @version $Id: $
- */
-public class StarteamCheckOutConsumer
-    implements StreamConsumer
-{
-    private ScmLogger logger;
-
-    private String workingDirectory;
-
-    private String currentDir = "";
-
-    private List files = new ArrayList();
-
-    /**
-     * Marks current directory data
-     */
-    private static final String DIR_MARKER = "(working dir: ";
-
-    /**
-     * Marks current file data
-     */
-    private static final String CHECKOUT_MARKER = ": checked out";
-
-    /**
-     * Marks skipped file during update
-     */
-    private static final String SKIPPED_MARKER = ": skipped";
-
-    public StarteamCheckOutConsumer( ScmLogger logger, File workingDirectory )
-    {
-        this.logger = logger;
-
-        this.workingDirectory = workingDirectory.getPath().replace( '\\', '/' );
-    }
-
-    public void consumeLine( String line )
-    {
-        logger.debug( line );
-
-        int pos = 0;
-
-        if ( ( pos = line.indexOf( CHECKOUT_MARKER ) ) != -1 )
-        {
-            processCheckedOutFile( line, pos );
-        }
-        else if ( ( pos = line.indexOf( DIR_MARKER ) ) != -1 )
-        {
-            processDirectory( line, pos );
-        }
-        else if ( ( pos = line.indexOf( CHECKOUT_MARKER ) ) != -1 )
-        {
-            processCheckedOutFile( line, pos );
-        }
-        else if ( ( pos = line.indexOf( SKIPPED_MARKER ) ) != -1 )
-        {
-            processSkippedFile( line, pos );
-        }
-        else
-        {
-            this.logger.warn( "Unknown checkout ouput: " + line );
-        }
-    }
-
-    public List getCheckedOutFiles()
-    {
-        return files;
-    }
-
-    private void processDirectory( String line, int pos )
-    {
-        String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace( '\\', '/' );
-
-        if ( !dirPath.startsWith( workingDirectory ) )
-        {
-            logger.info( "Working directory: " + workingDirectory );
-
-            logger.info( "Checked out directory: " + dirPath );
-
-            throw new IllegalStateException( "Working and check out directories are not on the same tree" );
-        }
-
-        this.currentDir = "." + dirPath.substring( workingDirectory.length() );
-    }
-
-    private void processCheckedOutFile( String line, int pos )
-    {
-        String checkedOutFilePath = this.currentDir + "/" + line.substring( 0, pos );
-
-        this.files.add( new ScmFile( checkedOutFilePath, ScmFileStatus.CHECKED_OUT ) );
-
-        this.logger.info( "Checked out: " + checkedOutFilePath );
-    }
-
-    private void processSkippedFile( String line, int pos )
-    {
-        String skippedFilePath = this.currentDir + "/" + line.substring( 0, pos );
-
-        this.logger.debug( "Skipped: " + skippedFilePath );
-    }
-
-}
+package org.apache.maven.scm.provider.starteam.command.checkout;
+
+/*
+ * Copyright 2001-2005 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.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;
+import java.io.File;
+
+/**
+ * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @version $Id$
+ */
+public class StarteamCheckOutConsumer
+    implements StreamConsumer
+{
+    private ScmLogger logger;
+
+    private String workingDirectory;
+
+    private String currentDir = "";
+
+    private List files = new ArrayList();
+
+    /**
+     * Marks current directory data
+     */
+    private static final String DIR_MARKER = "(working dir: ";
+
+    /**
+     * Marks current file data
+     */
+    private static final String CHECKOUT_MARKER = ": checked out";
+
+    /**
+     * Marks skipped file during update
+     */
+    private static final String SKIPPED_MARKER = ": skipped";
+
+    public StarteamCheckOutConsumer( ScmLogger logger, File workingDirectory )
+    {
+        this.logger = logger;
+
+        this.workingDirectory = workingDirectory.getPath().replace( '\\', '/' );
+    }
+
+    public void consumeLine( String line )
+    {
+        logger.debug( line );
+
+        int pos = 0;
+
+        if ( ( pos = line.indexOf( CHECKOUT_MARKER ) ) != -1 )
+        {
+            processCheckedOutFile( line, pos );
+        }
+        else if ( ( pos = line.indexOf( DIR_MARKER ) ) != -1 )
+        {
+            processDirectory( line, pos );
+        }
+        else if ( ( pos = line.indexOf( CHECKOUT_MARKER ) ) != -1 )
+        {
+            processCheckedOutFile( line, pos );
+        }
+        else if ( ( pos = line.indexOf( SKIPPED_MARKER ) ) != -1 )
+        {
+            processSkippedFile( line, pos );
+        }
+        else
+        {
+            this.logger.warn( "Unknown checkout ouput: " + line );
+        }
+    }
+
+    public List getCheckedOutFiles()
+    {
+        return files;
+    }
+
+    private void processDirectory( String line, int pos )
+    {
+        String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace( '\\', '/' );
+
+        if ( !dirPath.startsWith( workingDirectory ) )
+        {
+            logger.info( "Working directory: " + workingDirectory );
+
+            logger.info( "Checked out directory: " + dirPath );
+
+            throw new IllegalStateException( "Working and check out directories are not on the same tree" );
+        }
+
+        this.currentDir = "." + dirPath.substring( workingDirectory.length() );
+    }
+
+    private void processCheckedOutFile( String line, int pos )
+    {
+        String checkedOutFilePath = this.currentDir + "/" + line.substring( 0, pos );
+
+        this.files.add( new ScmFile( checkedOutFilePath, ScmFileStatus.CHECKED_OUT ) );
+
+        this.logger.info( "Checked out: " + checkedOutFilePath );
+    }
+
+    private void processSkippedFile( String line, int pos )
+    {
+        String skippedFilePath = this.currentDir + "/" + line.substring( 0, pos );
+
+        this.logger.debug( "Skipped: " + skippedFilePath );
+    }
+
+}

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.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/diff/StarteamDiffCommand.java?rev=264806&r1=264805&r2=264806&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java Tue Aug 30 09:26:17 2005
@@ -1,111 +1,111 @@
-package org.apache.maven.scm.provider.starteam.command.diff;
-
-/*
- * Copyright 2001-2005 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 java.io.File;
-
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.command.diff.AbstractDiffCommand;
-import org.apache.maven.scm.command.diff.DiffScmResult;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
-import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
-import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-
-/**
- * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
- * @version $Id: $
- */
-public class StarteamDiffCommand
-    extends AbstractDiffCommand
-    implements StarteamCommand
-{
-    // ----------------------------------------------------------------------
-    // AbstractDiffCommand Implementation
-    // ----------------------------------------------------------------------
-    protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet, String startRevision,
-                                                String endRevision )
-        throws ScmException
-    {
-
-        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
-
-        if ( fileSet.getFiles().length != 0 )
-        {
-            throw new ScmException( "This provider doesn't support diff command on a subsets of a directory" );
-        }
-
-        StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
-
-        StarteamDiffConsumer consumer = new StarteamDiffConsumer( getLogger(), fileSet.getBasedir() );
-
-        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-
-        Commandline cl = createCommandLine( repository, fileSet.getBasedir(), startRevision, endRevision );
-
-        int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
-
-        if ( exitCode != 0 )
-        {
-            return new DiffScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
-        }
-
-        return new DiffScmResult( cl.toString(), consumer.getChangedFiles(), consumer.getDifferences(), consumer.getPatch() );
-    }
-
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    public static Commandline createCommandLine( StarteamScmProviderRepository repo, File workingDirectory,
-                                                 String startLabel, String endLabel )
-        throws ScmException
-    {
-        Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "diff", workingDirectory, repo );
-
-        cl.createArgument().setValue( "-is" );
-
-        cl.createArgument().setValue( "-filter" );
-
-        cl.createArgument().setValue( "M" );
-
-        if ( startLabel != null && startLabel.length() != 0 )
-        {
-            cl.createArgument().setValue( "-vl" );
-
-            cl.createArgument().setValue( startLabel );
-        }
-
-        if ( endLabel != null && endLabel.length() != 0 )
-        {
-            cl.createArgument().setValue( "-vl" );
-
-            cl.createArgument().setValue( endLabel );
-        }
-
-        if ( endLabel != null && ( startLabel == null || startLabel.length() == 0 ) )
-        {
-            throw new ScmException( "Missing start label." );
-        }
-
-        return cl;
-    }
-}
+package org.apache.maven.scm.provider.starteam.command.diff;
+
+/*
+ * Copyright 2001-2005 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 java.io.File;
+
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.command.diff.AbstractDiffCommand;
+import org.apache.maven.scm.command.diff.DiffScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
+import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
+import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
+
+import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+
+/**
+ * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @version $Id$
+ */
+public class StarteamDiffCommand
+    extends AbstractDiffCommand
+    implements StarteamCommand
+{
+    // ----------------------------------------------------------------------
+    // AbstractDiffCommand Implementation
+    // ----------------------------------------------------------------------
+    protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet, String startRevision,
+                                                String endRevision )
+        throws ScmException
+    {
+
+        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
+
+        if ( fileSet.getFiles().length != 0 )
+        {
+            throw new ScmException( "This provider doesn't support diff command on a subsets of a directory" );
+        }
+
+        StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
+
+        StarteamDiffConsumer consumer = new StarteamDiffConsumer( getLogger(), fileSet.getBasedir() );
+
+        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
+
+        Commandline cl = createCommandLine( repository, fileSet.getBasedir(), startRevision, endRevision );
+
+        int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
+
+        if ( exitCode != 0 )
+        {
+            return new DiffScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+        }
+
+        return new DiffScmResult( cl.toString(), consumer.getChangedFiles(), consumer.getDifferences(), consumer.getPatch() );
+    }
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+
+    public static Commandline createCommandLine( StarteamScmProviderRepository repo, File workingDirectory,
+                                                 String startLabel, String endLabel )
+        throws ScmException
+    {
+        Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "diff", workingDirectory, repo );
+
+        cl.createArgument().setValue( "-is" );
+
+        cl.createArgument().setValue( "-filter" );
+
+        cl.createArgument().setValue( "M" );
+
+        if ( startLabel != null && startLabel.length() != 0 )
+        {
+            cl.createArgument().setValue( "-vl" );
+
+            cl.createArgument().setValue( startLabel );
+        }
+
+        if ( endLabel != null && endLabel.length() != 0 )
+        {
+            cl.createArgument().setValue( "-vl" );
+
+            cl.createArgument().setValue( endLabel );
+        }
+
+        if ( endLabel != null && ( startLabel == null || startLabel.length() == 0 ) )
+        {
+            throw new ScmException( "Missing start label." );
+        }
+
+        return cl;
+    }
+}

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffCommand.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.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/diff/StarteamDiffConsumer.java?rev=264806&r1=264805&r2=264806&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java Tue Aug 30 09:26:17 2005
@@ -1,210 +1,210 @@
-package org.apache.maven.scm.provider.starteam.command.diff;
-
-/*
- * Copyright 2001-2005 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.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:dantran@gmail.com">Dan T. Tran</a>
- * @version $Id: $
- */
-public class StarteamDiffConsumer
-    implements StreamConsumer
-{
-    private final static String FOLDER_TOKEN = "Folder: ";
-
-    private final static String WORKING_DIR_TOKEN = "(working dir: ";
-
-    private final static String PATCH_SEPARATOR_TOKEN = "--------------";
-
-    private final static String REVISION_TOKEN = " Revision: ";
-
-    private final static String ONDISK_TOKEN = " (on disk)";
-
-    private final static String ADDED_LINE_TOKEN = "+";
-
-    private final static String REMOVED_LINE_TOKEN = "-";
-
-    private final static String UNCHANGED_LINE_TOKEN = " ";
-
-    private ScmLogger logger;
-
-    private String currentDir = "";
-
-    private boolean diffBlockProcessingStarted = false;
-
-    private boolean revisionBlockStarted = false;
-
-    private File workingDirectory;
-
-    private String currentFile;
-
-    private StringBuffer currentDifference;
-
-    private List changedFiles = new ArrayList();
-
-    private Map differences = new HashMap();
-
-    private StringBuffer patch = new StringBuffer();
-
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    public StarteamDiffConsumer( ScmLogger logger, File workingDirectory )
-    {
-        this.logger = logger;
-
-        this.workingDirectory = workingDirectory;
-    }
-
-    // ----------------------------------------------------------------------
-    // StreamConsumer Implementation
-    // ----------------------------------------------------------------------
-
-    public void consumeLine( String line )
-    {
-        int pos = 0;
-
-        logger.debug( line );
-
-        patch.append( line ).append( "\n" );
-
-        if ( line.trim().length() == 0 )
-        {
-            return;
-        }
-
-        if ( ( pos = line.indexOf( WORKING_DIR_TOKEN ) ) != -1 )
-        {
-            processGetDir( line, pos );
-
-            return;
-        }
-
-        if ( line.startsWith( PATCH_SEPARATOR_TOKEN ) )
-        {
-            diffBlockProcessingStarted = !diffBlockProcessingStarted;
-
-            if ( diffBlockProcessingStarted )
-            {
-                if ( revisionBlockStarted )
-                {
-                    throw new IllegalStateException( "Missing second Revision line or local copy line " );
-                }
-            }
-
-            return;
-        }
-
-        if ( ( pos = line.indexOf( REVISION_TOKEN ) ) != -1 )
-        {
-            if ( revisionBlockStarted )
-            {
-                revisionBlockStarted = false;
-            }
-            else
-            {
-                extractCurrentFile( line, pos );
-
-                revisionBlockStarted = true;
-            }
-
-            return;
-        }
-
-        if ( ( pos = line.indexOf( ONDISK_TOKEN ) ) != -1 )
-        {
-            if ( revisionBlockStarted )
-            {
-                revisionBlockStarted = false;
-            }
-            else
-            {
-                throw new IllegalStateException( "Working copy line found at the wrong state " );
-            }
-
-            return;
-        }
-
-        if ( !diffBlockProcessingStarted )
-        {
-            logger.warn( "Unparseable line: '" + line + "'" );
-
-            return;
-        }
-
-        if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN )
-             || line.startsWith( UNCHANGED_LINE_TOKEN ) )
-        {
-            // add to buffer
-            currentDifference.append( line ).append( "\n" );
-        }
-        else
-        {
-            logger.warn( "Unparseable line: '" + line + "'" );
-        }
-    }
-
-    /**
-     * Process the current input line in the Get Directory
-     *
-     * @param line a line of text from the Starteam log output
-     */
-    private void processGetDir( String line, int pos )
-    {
-        String dirPath = line.substring( pos + WORKING_DIR_TOKEN.length(), line.length() - 1 ).replace( '\\', '/' );
-
-        this.currentDir = dirPath;
-    }
-
-    private void extractCurrentFile( String line, int pos )
-    {
-        currentFile = line.substring( 0, pos );
-
-        changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED ) );
-
-        currentDifference = new StringBuffer();
-
-        differences.put( currentFile, currentDifference );
-    }
-
-    public List getChangedFiles()
-    {
-        return changedFiles;
-    }
-
-    public Map getDifferences()
-    {
-        return differences;
-    }
-
-    public String getPatch()
-    {
-        return patch.toString();
-    }
-
-}
+package org.apache.maven.scm.provider.starteam.command.diff;
+
+/*
+ * Copyright 2001-2005 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.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:dantran@gmail.com">Dan T. Tran</a>
+ * @version $Id$
+ */
+public class StarteamDiffConsumer
+    implements StreamConsumer
+{
+    private final static String FOLDER_TOKEN = "Folder: ";
+
+    private final static String WORKING_DIR_TOKEN = "(working dir: ";
+
+    private final static String PATCH_SEPARATOR_TOKEN = "--------------";
+
+    private final static String REVISION_TOKEN = " Revision: ";
+
+    private final static String ONDISK_TOKEN = " (on disk)";
+
+    private final static String ADDED_LINE_TOKEN = "+";
+
+    private final static String REMOVED_LINE_TOKEN = "-";
+
+    private final static String UNCHANGED_LINE_TOKEN = " ";
+
+    private ScmLogger logger;
+
+    private String currentDir = "";
+
+    private boolean diffBlockProcessingStarted = false;
+
+    private boolean revisionBlockStarted = false;
+
+    private File workingDirectory;
+
+    private String currentFile;
+
+    private StringBuffer currentDifference;
+
+    private List changedFiles = new ArrayList();
+
+    private Map differences = new HashMap();
+
+    private StringBuffer patch = new StringBuffer();
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+
+    public StarteamDiffConsumer( ScmLogger logger, File workingDirectory )
+    {
+        this.logger = logger;
+
+        this.workingDirectory = workingDirectory;
+    }
+
+    // ----------------------------------------------------------------------
+    // StreamConsumer Implementation
+    // ----------------------------------------------------------------------
+
+    public void consumeLine( String line )
+    {
+        int pos = 0;
+
+        logger.debug( line );
+
+        patch.append( line ).append( "\n" );
+
+        if ( line.trim().length() == 0 )
+        {
+            return;
+        }
+
+        if ( ( pos = line.indexOf( WORKING_DIR_TOKEN ) ) != -1 )
+        {
+            processGetDir( line, pos );
+
+            return;
+        }
+
+        if ( line.startsWith( PATCH_SEPARATOR_TOKEN ) )
+        {
+            diffBlockProcessingStarted = !diffBlockProcessingStarted;
+
+            if ( diffBlockProcessingStarted )
+            {
+                if ( revisionBlockStarted )
+                {
+                    throw new IllegalStateException( "Missing second Revision line or local copy line " );
+                }
+            }
+
+            return;
+        }
+
+        if ( ( pos = line.indexOf( REVISION_TOKEN ) ) != -1 )
+        {
+            if ( revisionBlockStarted )
+            {
+                revisionBlockStarted = false;
+            }
+            else
+            {
+                extractCurrentFile( line, pos );
+
+                revisionBlockStarted = true;
+            }
+
+            return;
+        }
+
+        if ( ( pos = line.indexOf( ONDISK_TOKEN ) ) != -1 )
+        {
+            if ( revisionBlockStarted )
+            {
+                revisionBlockStarted = false;
+            }
+            else
+            {
+                throw new IllegalStateException( "Working copy line found at the wrong state " );
+            }
+
+            return;
+        }
+
+        if ( !diffBlockProcessingStarted )
+        {
+            logger.warn( "Unparseable line: '" + line + "'" );
+
+            return;
+        }
+
+        if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN )
+             || line.startsWith( UNCHANGED_LINE_TOKEN ) )
+        {
+            // add to buffer
+            currentDifference.append( line ).append( "\n" );
+        }
+        else
+        {
+            logger.warn( "Unparseable line: '" + line + "'" );
+        }
+    }
+
+    /**
+     * Process the current input line in the Get Directory
+     *
+     * @param line a line of text from the Starteam log output
+     */
+    private void processGetDir( String line, int pos )
+    {
+        String dirPath = line.substring( pos + WORKING_DIR_TOKEN.length(), line.length() - 1 ).replace( '\\', '/' );
+
+        this.currentDir = dirPath;
+    }
+
+    private void extractCurrentFile( String line, int pos )
+    {
+        currentFile = line.substring( 0, pos );
+
+        changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED ) );
+
+        currentDifference = new StringBuffer();
+
+        differences.put( currentFile, currentDifference );
+    }
+
+    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-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveCommand.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Aug 30 09:26:17 2005
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/remove/StarteamRemoveConsumer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Aug 30 09:26:17 2005
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.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/status/StarteamStatusCommand.java?rev=264806&r1=264805&r2=264806&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java Tue Aug 30 09:26:17 2005
@@ -1,87 +1,87 @@
-package org.apache.maven.scm.provider.starteam.command.status;
-
-/*
- * Copyright 2001-2005 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 java.io.File;
-
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.command.status.AbstractStatusCommand;
-import org.apache.maven.scm.command.status.StatusScmResult;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
-import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
-import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
-
-import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-
-/**
- * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
- * @version $Id: $
- */
-public class StarteamStatusCommand
-    extends AbstractStatusCommand
-    implements StarteamCommand
-{
-    // ----------------------------------------------------------------------
-    // AbstractStatusCommand Implementation
-    // ----------------------------------------------------------------------
-
-    protected StatusScmResult executeStatusCommand( ScmProviderRepository repo, ScmFileSet fileSet )
-        throws ScmException
-    {
-
-        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
-
-        if ( fileSet.getFiles().length != 0 )
-        {
-            throw new ScmException( "This provider doesn't support checking status of a subsets of a directory" );
-        }
-
-        StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
-
-        StarteamStatusConsumer consumer = new StarteamStatusConsumer( getLogger(), fileSet.getBasedir() );
-
-        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-
-        Commandline cl = createCommandLine( repository, fileSet.getBasedir() );
-
-        int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
-
-        if ( exitCode != 0 )
-        {
-            return new StatusScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
-        }
-
-        return new StatusScmResult( cl.toString(), consumer.getChangedFiles() );
-    }
-
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    public static Commandline createCommandLine( StarteamScmProviderRepository repo, File workingDirectory )
-    {
-
-        Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "hist", workingDirectory, repo );
-
-        cl.createArgument().setValue( "-is" );
-
-        return cl;
-    }
-}
+package org.apache.maven.scm.provider.starteam.command.status;
+
+/*
+ * Copyright 2001-2005 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 java.io.File;
+
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.command.status.AbstractStatusCommand;
+import org.apache.maven.scm.command.status.StatusScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
+import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
+import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
+
+import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+
+/**
+ * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
+ * @version $Id$
+ */
+public class StarteamStatusCommand
+    extends AbstractStatusCommand
+    implements StarteamCommand
+{
+    // ----------------------------------------------------------------------
+    // AbstractStatusCommand Implementation
+    // ----------------------------------------------------------------------
+
+    protected StatusScmResult executeStatusCommand( ScmProviderRepository repo, ScmFileSet fileSet )
+        throws ScmException
+    {
+
+        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
+
+        if ( fileSet.getFiles().length != 0 )
+        {
+            throw new ScmException( "This provider doesn't support checking status of a subsets of a directory" );
+        }
+
+        StarteamScmProviderRepository repository = (StarteamScmProviderRepository) repo;
+
+        StarteamStatusConsumer consumer = new StarteamStatusConsumer( getLogger(), fileSet.getBasedir() );
+
+        CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
+
+        Commandline cl = createCommandLine( repository, fileSet.getBasedir() );
+
+        int exitCode = StarteamCommandLineUtils.executeCommandline( cl, consumer, stderr, getLogger() );
+
+        if ( exitCode != 0 )
+        {
+            return new StatusScmResult( cl.toString(), "The starteam command failed.", stderr.getOutput(), false );
+        }
+
+        return new StatusScmResult( cl.toString(), consumer.getChangedFiles() );
+    }
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+
+    public static Commandline createCommandLine( StarteamScmProviderRepository repo, File workingDirectory )
+    {
+
+        Commandline cl = StarteamCommandLineUtils.createStarteamBaseCommandLine( "hist", workingDirectory, repo );
+
+        cl.createArgument().setValue( "-is" );
+
+        return cl;
+    }
+}

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusCommand.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message