Author: jvanzyl
Date: Mon Jun  2 20:39:46 2008
New Revision: 662629

URL: http://svn.apache.org/viewvc?rev=662629&view=rev
Log:
SCM-382: cleanup dependencies in maven-scm-provider-accurev
Submitted by: Eugene Kuleshov

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevCheckOutUsingPopCommand.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/login/AccuRevLoginCommand.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevScmTckTestCase.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml?rev=662629&r1=662628&r2=662629&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml 
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/pom.xml Mon 
Jun  2 20:39:46 2008
@@ -41,19 +41,9 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-cli</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>1.4.7</version>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java?rev=662629&r1=662628&r2=662629&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
 Mon Jun  2 20:39:46 2008
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.maven.scm.CommandParameters;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
@@ -31,6 +30,7 @@
 import 
org.apache.maven.scm.provider.accurev.commands.checkout.AccuRevCheckOutWorkspaceCommand;
 import 
org.apache.maven.scm.provider.accurev.commands.checkout.AccuRevCheckOutUsingPopCommand;
 import org.apache.maven.scm.repository.ScmRepositoryException;
+import org.codehaus.plexus.util.StringUtils;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -117,7 +117,7 @@
                processDepotStreamAndWorkspace(scmSpecificUrl, delimiter, rep);
 
                String checkoutMethodParam = (String) 
rep.getParams().get(CHECKOUT_METHOD_PARAM_NAME);
-               if (StringUtils.isNotBlank(checkoutMethodParam)) {
+               if (StringUtils.isNotEmpty(checkoutMethodParam)) {
                        //Set checkout method from the SCM URL parameter
                        rep.setCheckoutMethod(checkoutMethodParam.trim());
                }
@@ -133,7 +133,7 @@
 
        private void processParams(String params, AccuRevScmProviderRepository 
rep) {
                //Parse params
-               String[] paramKeyValuePairs = StringUtils.split(params, '&');
+               String[] paramKeyValuePairs = StringUtils.split(params, "&");
                for (int i = 0; i < paramKeyValuePairs.length; i++) {
                        String keyValuePair = paramKeyValuePairs[i];
                        int delimiterIdx = keyValuePair.indexOf('=');
@@ -274,7 +274,7 @@
         */
        private static String getSubstring(String string, int fromIdx, int 
toIdx, boolean blankIsNull) {
                String substring = string.substring(fromIdx, toIdx);
-               return (blankIsNull && StringUtils.isBlank(substring)) ? null : 
substring;
+               return (blankIsNull && StringUtils.isEmpty(substring)) ? null : 
substring;
        }
 
        /**

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java?rev=662629&r1=662628&r2=662629&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
 Mon Jun  2 20:39:46 2008
@@ -17,7 +17,6 @@
  */
 
 import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -96,14 +95,14 @@
        }
 
        public String toString() {
-               return new ToStringBuilder(this)
-                               .append("host", this.host)
-                               .append("port", this.port)
-                               .append("depot", this.depot)
-                               .append("streamName", this.streamName)
-                               .append("workspaceName", this.workspaceName)
-                               .append("checkoutMethod", this.checkoutMethod)
-                               .append("params", this.params)
+               return new StringBuffer()
+                               .append("host:").append(this.host)
+                               .append(", port:").append(this.port)
+                               .append(", depot:").append(this.depot)
+                               .append(", streamName:").append(this.streamName)
+                               .append(", 
workspaceName:").append(this.workspaceName)
+                               .append(", 
checkoutMethod:").append(this.checkoutMethod)
+                               .append(", params:").append(this.params)
                                .toString();
        }
 }

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevCheckOutUsingPopCommand.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevCheckOutUsingPopCommand.java?rev=662629&r1=662628&r2=662629&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevCheckOutUsingPopCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevCheckOutUsingPopCommand.java
 Mon Jun  2 20:39:46 2008
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmVersion;
@@ -25,7 +24,7 @@
 import org.apache.maven.scm.provider.ScmProviderRepository;
 import org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepository;
 import org.apache.maven.scm.provider.accurev.AccuRevScmProvider;
-import 
org.apache.maven.scm.provider.accurev.commands.checkout.BaseAccuRevCheckOutCommand;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
@@ -133,7 +132,7 @@
         }
         else
         {
-            String[] elements = StringUtils.split( filelistParam, ',' );
+            String[] elements = StringUtils.split( filelistParam, "," );
             fileSetArguments.addAll( Arrays.asList( elements ) );
         }
         commandline.addArguments( (String[]) fileSetArguments.toArray( new 
String[fileSetArguments.size()] ) );

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/login/AccuRevLoginCommand.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/login/AccuRevLoginCommand.java?rev=662629&r1=662628&r2=662629&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/login/AccuRevLoginCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/login/AccuRevLoginCommand.java
 Mon Jun  2 20:39:46 2008
@@ -16,20 +16,20 @@
  * limitations under the License.
  */
 
+import java.util.ArrayList;
+
+import org.apache.maven.scm.CommandParameters;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.login.AbstractLoginCommand;
 import org.apache.maven.scm.command.login.LoginScmResult;
 import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepository;
 import org.apache.maven.scm.provider.accurev.AccuRevScmProvider;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.CommandParameters;
-import org.apache.maven.scm.ScmException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepository;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.CommandLineException;
-
-import java.util.ArrayList;
 
 public class AccuRevLoginCommand extends AbstractLoginCommand
 {
@@ -92,7 +92,7 @@
         //Append command params
         params.add( repository.getUser() );
         String password = repository.getPassword();
-        params.add( StringUtils.isBlank( password ) ? "\"\"" : password );
+        params.add( StringUtils.isEmpty( password ) ? "\"\"" : password );
         //Set arguments to command line
         cl.addArguments( (String[]) params.toArray( new String[params.size()] 
) );
         return cl;

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevScmTckTestCase.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevScmTckTestCase.java?rev=662629&r1=662628&r2=662629&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevScmTckTestCase.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/commands/checkout/AccuRevScmTckTestCase.java
 Mon Jun  2 20:39:46 2008
@@ -16,7 +16,14 @@
  * limitations under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.apache.maven.scm.CommandParameters;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
@@ -32,14 +39,6 @@
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public class AccuRevScmTckTestCase extends CheckOutCommandTckTest
 {
     private String username;
@@ -83,9 +82,26 @@
 
     public String getScmUrl( String workspaceName, String checkoutMethod ) 
throws Exception
     {
-        return StringUtils.join( new String[]{
-            "scm", "accurev", username, password + "@" + host, String.valueOf( 
port ), depot, stream, workspaceName
-        }, ':' ) + "?checkoutMethod=" + checkoutMethod;
+       // return StringUtils.join( new String[]{
+       //            "scm", "accurev", username, password + "@" + host, 
String.valueOf( port ), depot, stream, workspaceName
+       //        }, ':' ) + "?checkoutMethod=" + checkoutMethod;
+       return new StringBuffer("scm:accurev:") //
+                               .append(username) //
+                               .append(':') //
+                               .append(password) //
+                               .append('@') //
+                               .append(host) //
+                               .append(':') //
+                               .append(String.valueOf(port)) //
+                               .append(':') //
+                               .append(depot) //
+                               .append(':') //
+                               .append(stream) //
+                               .append(':') //
+                               .append(workspaceName) //
+                               .append("?checkoutMethod=") //
+                               .append(checkoutMethod) //
+                               .toString();
     }
 
     public String getScmUrl() throws Exception


Reply via email to