Index: xdocs/goals.xml
===================================================================
--- xdocs/goals.xml	(revision 180068)
+++ xdocs/goals.xml	(working copy)
@@ -33,10 +33,18 @@
         <description>Checkout a project</description>
       </goal>
       <goal>
+        <name>scm:checkin</name>
+        <description>Check in a list files</description>
+      </goal>
+      <goal>
         <name>scm:update</name>
         <description>Update a project from SCM</description>
       </goal>
       <goal>
+        <name>scm:add</name>
+        <description>Add new files into SCM</description>
+      </goal>
+      <goal>
         <name>scm:tag</name>
         <description>Tag a project in the SCM</description>
       </goal>
Index: xdocs/scmurl.xml
===================================================================
--- xdocs/scmurl.xml	(revision 180068)
+++ xdocs/scmurl.xml	(working copy)
@@ -64,7 +64,29 @@
 scm:svn:http://svn.apache.org/svn/root/module
 scm:cvs:https://username@svn.apache.org/svn/root/module</source>
       </subsection>
+    
+      <subsection name="StarTeam">
+        <p>
+          The full connection string for StarTeam is as follows:
+        </p>
+        <source>scm:starteam:username:password@hostName:endpoint/projectName/viewName/folderHierarchy</source>
+        <p>
+        <code>maven.scm.username</code> and <code>maven.scm.password</code>
+        are the prefer way to store authentication information.
+        </p>
+        <p>
+          For example:
+        </p>
+        <source>
+scm:starteam:username:password@hostname:23456/project/view/folder1/folder2
+scm:starteam:username@hostname:23456/project/view/folder
+scm:starteam:hostname:23456/project/view/folder
+        </source>
+      </subsection>
+      
     </section>
+
+    
   </body>
 </document>
 
Index: xdocs/properties.xml
===================================================================
--- xdocs/properties.xml	(revision 180068)
+++ xdocs/properties.xml	(working copy)
@@ -118,7 +118,7 @@
             <td>Yes</td>
             <td>
               <p>
-                The username to pass to the SCM. Currently only Subversion is known to honour this.
+                The username to pass to the SCM. Currently only Subversion and Starteam are known to honour this.
                 You can also add it to the URL, eg. <code>http://user@svn.mycompany.com/repos</code>.
               </p>
             </td>
@@ -128,12 +128,45 @@
             <td>Yes</td>
             <td>
               <p>
-                The password to give to the SCM. Currently only Subversion is known to honour this.
+                The password to give to the SCM. Currently only Subversion and Starteam are known to honour this.
                 It is not recommended that you use this property, and instead use an alternative authentication
                 technique such as an ssh agent or Subversion's password caching mechanism.
               </p>
             </td>
           </tr>
+          
+          <tr>
+            <td>maven.scm.message</td>
+            <td>Yes</td>
+            <td>
+              <p>
+                Add/Checkin comment. Default is blank.
+              </p>
+            </td>
+          </tr>
+          
+          <tr>
+            <td>maven.scm.src.includes</td>
+            <td>Yes</td>
+            <td>
+              <p>
+                Comma or space separated list of Ant path patterns for scm:checkin, scm:update, scm:add goals
+                Default is blank.
+              </p>
+            </td>
+          </tr>
+          <tr>
+            <td>maven.scm.src.excludes</td>
+            <td>Yes</td>
+            <td>
+              <p>
+                Comma or space separated list of Ant path patterns for scm:checkin, scm:update, scm:add goals
+                Default is blank.
+              </p>
+            </td>
+          </tr>
+
+          
         </table>
       </subsection>
       <subsection name="Subversion Specific Settings">
Index: project.xml
===================================================================
--- project.xml	(revision 180068)
+++ project.xml	(working copy)
@@ -22,7 +22,7 @@
   <extend>../plugin-parent/project.xml</extend>
   <id>maven-scm-plugin</id>
   <name>Maven Source Control Management Plug-in</name>
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.5.1-SNAPSHOT</currentVersion>
   <description>A plugin for SCM tasks, currently CVS.</description>
   <shortDescription>SCM Plugin for Maven.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/scm/</url>
@@ -124,17 +124,22 @@
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-api</artifactId>
-      <version>1.0-alpha-1</version>
+      <version>1.0-alpha-2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-cvs</artifactId>
-      <version>1.0-alpha-1</version>
+      <version>1.0-alpha-2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-svn</artifactId>
-      <version>1.0-alpha-1</version>
+      <version>1.0-alpha-2-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.scm</groupId>
+      <artifactId>maven-scm-provider-starteam</artifactId>
+      <version>1.0-alpha-2-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
Index: src/main/org/apache/maven/plugins/scm/ScmBean.java
===================================================================
--- src/main/org/apache/maven/plugins/scm/ScmBean.java	(revision 180068)
+++ src/main/org/apache/maven/plugins/scm/ScmBean.java	(working copy)
@@ -20,6 +20,7 @@
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmResult;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.command.tag.TagScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
@@ -119,6 +120,21 @@
                 svnRepo.setTagBase( tagBase );
             }
         }
+        
+        if ( repository.getProvider().equals( "starteam" ) )
+        {
+            StarteamScmProviderRepository starteamRepo = (StarteamScmProviderRepository) repository.getProviderRepository();
+
+            if ( username != null && username.length() > 0 )
+            {
+                starteamRepo.setUser( username );
+            }
+            if ( password != null && password.length() > 0 )
+            {
+                starteamRepo.setPassword( password );
+            }
+        }
+        
         return repository;
     }
 
Index: plugin.properties
===================================================================
--- plugin.properties	(revision 180068)
+++ plugin.properties	(working copy)
@@ -41,6 +41,13 @@
 # check whether CVS tagged first, and warn
 maven.scm.check.tagged=true
 
+# settings for scm:checkin, scm:add
+maven.scm.src.includes=
+maven.scm.src.excludes=
+
+#specific to scm:checkin
+maven.scm.message=
+
 #===============
 # CVS Properties
 #===============
Index: plugin.jelly
===================================================================
--- plugin.jelly	(revision 180068)
+++ plugin.jelly	(working copy)
@@ -38,7 +38,7 @@
     <define:jellybean
        name="update"
        method="update"     
-       className="org.apache.maven.plugins.scm.ScmBean"
+       className="org.apache.maven.plugins.scm.ScmUpdateBean"
     />
     <define:jellybean
        name="tag"
@@ -60,6 +60,12 @@
        method="diff"     
        className="org.apache.maven.plugins.scm.ScmDiffBean"
     />
+    <define:jellybean
+       name="add"
+       method="add"     
+       className="org.apache.maven.plugins.scm.ScmAddBean"
+    />
+    
   </define:taglib>
 
   <goal name="scm:find-connection">
@@ -125,10 +131,21 @@
   </goal>
 
   <goal name="scm:update" prereqs="scm:find-connection" description="Update the project in the current directory from SCM">
+
     <ant:echo>Updating from SCM</ant:echo>
 
-    <!-- Connection may not be used, but is needed for correct operation of Maven SCM at this point and for the tag in SVN if that were implemented -->
-    <scm:update url="${scmConnection}" workingDirectory="${basedir}" username="${maven.scm.username}" password="${maven.scm.password}" />
+    <j:if test="${scmConnection == null}">
+      <ant:fail>You must specify an SCM URL to connect to</ant:fail>
+    </j:if>
+
+    <scm:update 
+        url="${scmConnection}" 
+        workingDirectory="${basedir}" 
+        includes="${maven.scm.src.includes}"
+        excludes="${maven.scm.src.excludes}"
+        username="${maven.scm.username}" 
+        password="${maven.scm.password}" />
+        
   </goal>
 
   <goal name="scm:tag" prereqs="scm:find-connection" description="Tag the project in the current directory in SCM">
@@ -145,6 +162,60 @@
     <scm:tag url="${scmConnection}" workingDirectory="${basedir}" tag="${maven.scm.tag}" tagBase="${maven.scm.svn.tag.base}" username="${maven.scm.username}" password="${maven.scm.password}" />
   </goal>
 
+  <goal name="scm:checkin" prereqs="scm:find-connection" description="Checkin a set of files in the current directory of SCM" >
+  
+    <ant:echo>Checkin files to SCM</ant:echo>
+
+    <j:if test="${scmConnection == null}">
+      <ant:fail>You must specify an SCM URL to connect to</ant:fail>
+    </j:if>
+
+    <scm:checkin 
+      url="${scmConnection}" 
+      workingDirectory="${basedir}" 
+      username="${maven.scm.username}" 
+      password="${maven.scm.password}" 
+      excludes="${maven.scm.src.excludes}" 
+      includes="${maven.scm.src.includes}" 
+      message="${maven.scm.message}" 
+      tag="${maven.scm.tag}" />
+    
+  </goal>
+
+  <goal name="scm:add" prereqs="scm:find-connection" description="Add a set of files in the current directory of SCM" >
+
+    <ant:echo>Add files to SCM</ant:echo>
+
+    <j:if test="${scmConnection == null}">
+      <ant:fail>You must specify an SCM URL to connect to</ant:fail>
+    </j:if>
+
+    <scm:add
+      url="${scmConnection}" 
+      workingDirectory="${basedir}" 
+      username="${maven.scm.username}" 
+      password="${maven.scm.password}" 
+      excludes="${maven.scm.src.excludes}" 
+      includes="${maven.scm.src.includes}"  />
+    
+  </goal>
+
+  <goal name="scm:status" prereqs="scm:find-connection" description="Query for status in the current directory of SCM" >
+
+    <ant:echo>Query for status</ant:echo>
+
+    <j:if test="${scmConnection == null}">
+      <ant:fail>You must specify an SCM URL to connect to</ant:fail>
+    </j:if>
+
+    <scm:status
+      url="${scmConnection}" 
+      workingDirectory="${basedir}" 
+      username="${maven.scm.username}" 
+      password="${maven.scm.password}" />
+    
+  </goal>
+  
   <!-- TODO: change prereqs to scm:find-connection only -->
   <goal name="scm:perform-release" prereqs="scm:parse-connection,scm:check-deprecated-cvs-vars"
     description="Perform a release from SCM">