You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by vs...@apache.org on 2008/08/15 14:14:25 UTC

svn commit: r686199 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase: ./ command/add/ command/checkout/ command/remove/ command/status/ command/tag/ repository/ util/

Author: vsiveton
Date: Fri Aug 15 05:14:25 2008
New Revision: 686199

URL: http://svn.apache.org/viewvc?rev=686199&view=rev
Log:
o fixed checkstyle

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java?rev=686199&r1=686198&r2=686199&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/ClearCaseScmProvider.java Fri Aug 15 05:14:25 2008
@@ -67,7 +67,7 @@
         throws ScmRepositoryException
     {
         settings = ClearCaseUtil.getSettings();
-        return new ClearCaseScmProviderRepository( getLogger(), scmSpecificUrl, settings);
+        return new ClearCaseScmProviderRepository( getLogger(), scmSpecificUrl, settings );
     }
 
     /** {@inheritDoc} */
@@ -83,7 +83,8 @@
     }
 
     /** {@inheritDoc} */
-    public ChangeLogScmResult changelog( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+    public ChangeLogScmResult changelog( ScmProviderRepository repository, ScmFileSet fileSet,
+                                         CommandParameters parameters )
         throws ScmException
     {
         ClearCaseChangeLogCommand command = new ClearCaseChangeLogCommand();
@@ -94,7 +95,8 @@
     }
 
     /** {@inheritDoc} */
-    public CheckInScmResult checkin( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+    public CheckInScmResult checkin( ScmProviderRepository repository, ScmFileSet fileSet,
+                                     CommandParameters parameters )
         throws ScmException
     {
         ClearCaseCheckInCommand command = new ClearCaseCheckInCommand();
@@ -105,19 +107,21 @@
     }
 
     /** {@inheritDoc} */
-    public CheckOutScmResult checkout( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+    public CheckOutScmResult checkout( ScmProviderRepository repository, ScmFileSet fileSet,
+                                       CommandParameters parameters )
         throws ScmException
     {
         ClearCaseCheckOutCommand command = new ClearCaseCheckOutCommand();
 
         command.setLogger( getLogger() );
-        command.setSettings(settings);
+        command.setSettings( settings );
 
         return (CheckOutScmResult) command.execute( repository, fileSet, parameters );
     }
 
     /** {@inheritDoc} */
-    protected UpdateScmResult update( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+    protected UpdateScmResult update( ScmProviderRepository repository, ScmFileSet fileSet,
+                                      CommandParameters parameters )
         throws ScmException
     {
         ClearCaseUpdateCommand command = new ClearCaseUpdateCommand();
@@ -139,7 +143,8 @@
     }
 
     /** {@inheritDoc} */
-    protected StatusScmResult status( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+    protected StatusScmResult status( ScmProviderRepository repository, ScmFileSet fileSet,
+                                      CommandParameters parameters )
         throws ScmException
     {
         ClearCaseStatusCommand command = new ClearCaseStatusCommand();
@@ -150,7 +155,8 @@
     }
 
     /** {@inheritDoc} */
-    protected EditScmResult edit( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+    protected EditScmResult edit( ScmProviderRepository repository, ScmFileSet fileSet,
+                                  CommandParameters parameters )
         throws ScmException
     {
         ClearCaseEditCommand command = new ClearCaseEditCommand();

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java?rev=686199&r1=686198&r2=686199&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/add/ClearCaseAddCommand.java Fri Aug 15 05:14:25 2008
@@ -60,8 +60,10 @@
             // First we need to 'check out' the current directory
             Commandline checkoutCurrentDirCommandLine =
                 ClearCaseEditCommand.createCheckoutCurrentDirCommandLine( scmFileSet );
-            getLogger().debug( "Executing: " + checkoutCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() +
-                ">>" + checkoutCurrentDirCommandLine.toString() );
+            getLogger().debug(
+                               "Executing: "
+                                   + checkoutCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() + ">>"
+                                   + checkoutCurrentDirCommandLine.toString() );
             exitCode = CommandLineUtils.executeCommandLine( checkoutCurrentDirCommandLine,
                                                             new CommandLineUtils.StringStreamConsumer(), stderr );
 
@@ -76,9 +78,10 @@
                     // Then we check in the current directory again.
                     Commandline checkinCurrentDirCommandLine =
                         ClearCaseEditCommand.createCheckinCurrentDirCommandLine( scmFileSet );
-                    getLogger().debug( "Executing: " +
-                        checkinCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() + ">>" +
-                        checkinCurrentDirCommandLine.toString() );
+                    getLogger().debug(
+                                       "Executing: "
+                                           + checkinCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath()
+                                           + ">>" + checkinCurrentDirCommandLine.toString() );
                     exitCode = CommandLineUtils.executeCommandLine( checkinCurrentDirCommandLine,
                                                                     new CommandLineUtils.StringStreamConsumer(),
                                                                     stderr );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java?rev=686199&r1=686198&r2=686199&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommand.java Fri Aug 15 05:14:25 2008
@@ -82,14 +82,16 @@
 
         try
         {
-            // Since clearcase only wants to checkout to a non-existent directory, first delete the working dir if it already exists
+            // Since clearcase only wants to checkout to a non-existent directory, first delete the working dir
+            // if it already exists
             FileUtils.deleteDirectory( workingDirectory );
             // First create the view
             String viewName = getUniqueViewName( repo, workingDirectory.getAbsolutePath() );
-            String streamIdentifier = getStreamIdentifier(repo.getStreamName(), repo.getVobName());
+            String streamIdentifier = getStreamIdentifier( repo.getStreamName(), repo.getVobName() );
             cl = createCreateViewCommandLine( workingDirectory, viewName, streamIdentifier );
             getLogger().info( "Executing: " + cl.getWorkingDirectory().getAbsolutePath() + ">>" + cl.toString() );
-            exitCode = CommandLineUtils.executeCommandLine( cl, new CommandLineUtils.StringStreamConsumer(), stderr );
+            exitCode =
+                CommandLineUtils.executeCommandLine( cl, new CommandLineUtils.StringStreamConsumer(), stderr );
 
             if ( exitCode == 0 )
             {
@@ -167,6 +169,7 @@
      * @param configSpecContents The contents for the file
      * @param viewName           The name of the view; used to determine an appropriate file
      *                           name
+     * @throws IOException
      */
     protected File writeTemporaryConfigSpecFile( String configSpecContents, String viewName )
         throws IOException
@@ -258,7 +261,7 @@
         command.createArgument().setValue( "-tag" );
         command.createArgument().setValue( viewName );
 
-        if (isClearCaseUCM())
+        if ( isClearCaseUCM() )
         {
             command.createArgument().setValue( "-stream" );
             command.createArgument().setValue( streamIdentifier );
@@ -286,8 +289,10 @@
      */
     protected String getStreamIdentifier(String streamName, String vobName)
     {
-        if (streamName == null || vobName == null)
+        if ( streamName == null || vobName == null )
+        {
             return null;
+        }
         return "stream:" + streamName + "@" + vobName;
     }
 
@@ -352,12 +357,12 @@
 
     protected boolean isClearCaseLT()
     {
-        return ClearCaseScmProviderRepository.CLEARCASE_LT.equals(settings.getClearcaseType());
+        return ClearCaseScmProviderRepository.CLEARCASE_LT.equals( settings.getClearcaseType() );
     }
 
     protected boolean isClearCaseUCM()
     {
-        return ClearCaseScmProviderRepository.CLEARCASE_UCM.equals(settings.getClearcaseType());
+        return ClearCaseScmProviderRepository.CLEARCASE_UCM.equals( settings.getClearcaseType() );
     }
 
     /**
@@ -390,7 +395,8 @@
         return username;
     }
 
-    public void setSettings(Settings settings) {
+    public void setSettings( Settings settings )
+    {
         this.settings = settings;
     }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java?rev=686199&r1=686198&r2=686199&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/remove/ClearCaseRemoveCommand.java Fri Aug 15 05:14:25 2008
@@ -60,10 +60,13 @@
             // First we need to 'check out' the current directory
             Commandline checkoutCurrentDirCommandLine =
                 ClearCaseEditCommand.createCheckoutCurrentDirCommandLine( scmFileSet );
-            getLogger().debug( "Executing: " + checkoutCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() +
-                ">>" + checkoutCurrentDirCommandLine.toString() );
-            exitCode = CommandLineUtils.executeCommandLine( checkoutCurrentDirCommandLine,
-                                                            new CommandLineUtils.StringStreamConsumer(), stderr );
+            getLogger().debug(
+                               "Executing: "
+                                   + checkoutCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() + ">>"
+                                   + checkoutCurrentDirCommandLine.toString() );
+            exitCode =
+                CommandLineUtils.executeCommandLine( checkoutCurrentDirCommandLine,
+                                                     new CommandLineUtils.StringStreamConsumer(), stderr );
 
             if ( exitCode == 0 )
             {
@@ -76,9 +79,10 @@
                     // Then we check in the current directory again.
                     Commandline checkinCurrentDirCommandLine =
                         ClearCaseEditCommand.createCheckinCurrentDirCommandLine( scmFileSet );
-                    getLogger().debug( "Executing: " +
-                        checkinCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath() + ">>" +
-                        checkinCurrentDirCommandLine.toString() );
+                    getLogger().debug(
+                                       "Executing: "
+                                           + checkinCurrentDirCommandLine.getWorkingDirectory().getAbsolutePath()
+                                           + ">>" + checkinCurrentDirCommandLine.toString() );
                     exitCode = CommandLineUtils.executeCommandLine( checkinCurrentDirCommandLine,
                                                                     new CommandLineUtils.StringStreamConsumer(),
                                                                     stderr );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java?rev=686199&r1=686198&r2=686199&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/status/ClearCaseStatusCommand.java Fri Aug 15 05:14:25 2008
@@ -85,7 +85,7 @@
         command.setExecutable( "cleartool" );
 
         command.createArgument().setValue( "lscheckout" );
-        command.createArgument().setValue( "-cview");
+        command.createArgument().setValue( "-cview" );
         command.createArgument().setValue( "-r" );
         command.createArgument().setValue( "-fmt" );
         command.createArgument().setValue( "%n\\n" );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java?rev=686199&r1=686198&r2=686199&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java Fri Aug 15 05:14:25 2008
@@ -59,8 +59,9 @@
         {
             getLogger().debug( "Creating label: " + tag );
             Commandline newLabelCommandLine = createNewLabelCommandLine( fileSet, tag );
-            getLogger().debug( "Executing: " + newLabelCommandLine.getWorkingDirectory().getAbsolutePath() + ">>" +
-                newLabelCommandLine.toString() );
+            getLogger().debug(
+                               "Executing: " + newLabelCommandLine.getWorkingDirectory().getAbsolutePath() + ">>"
+                                   + newLabelCommandLine.toString() );
             exitCode = CommandLineUtils.executeCommandLine( newLabelCommandLine,
                                                             new CommandLineUtils.StringStreamConsumer(), stderr );
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java?rev=686199&r1=686198&r2=686199&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java Fri Aug 15 05:14:25 2008
@@ -37,10 +37,10 @@
  * Provider Repository for ClearCase (standard, LT, UCM)
  * <p />
  * Url format for ClearCase and ClearCaseLT : <br />
- * [view_name]:[configspec] or [view_name]|[configspec] 
+ * [view_name]:[configspec] or [view_name]|[configspec]
  * <p />
  * Url format for ClearCaseUCM : <br />
- * [view_name]|[configspec]|[vob_name]|[stream_name] or [view_name]:[configspec]:[vob_name]:[stream_name]  
+ * [view_name]|[configspec]|[vob_name]|[stream_name] or [view_name]:[configspec]:[vob_name]:[stream_name]
  * <p />
  * [configspec] can be used in two different ways:
  * <ul>
@@ -83,12 +83,12 @@
      * Describe the vob containing the stream. Only used with ClearCaseUCM
      */
     private String vobName;
-    
+
     /**
      * Provider configuration settings
      */
     private Settings settings;
-    
+
     /**
      * Define the flag used in the clearcase-settings.xml when using ClearCaseLT
      */
@@ -103,7 +103,7 @@
      * Define the default value from the clearcase-settings.xml when using ClearCase
      */
     public static final String CLEARCASE_DEFAULT = null;
-    
+
     public ClearCaseScmProviderRepository( ScmLogger logger, String url, Settings settings )
         throws ScmRepositoryException
     {
@@ -146,12 +146,12 @@
         throws UnknownHostException, URISyntaxException, MalformedURLException
     {
         String configSpecString = null;
-        
-        if (CLEARCASE_UCM.equals(settings.getClearcaseType()))
-            configSpecString = fillUCMProperties(tokenizer);
+
+        if ( CLEARCASE_UCM.equals( settings.getClearcaseType() ) )
+            configSpecString = fillUCMProperties( tokenizer );
         else
-            configSpecString = fillDefaultProperties(tokenizer);
-        
+            configSpecString = fillDefaultProperties( tokenizer );
+
         if ( !configSpecString.startsWith( "load " ) )
         {
             configSpec = createConfigSpecFile( configSpecString );
@@ -165,35 +165,38 @@
         }
     }
 
-    private String fillDefaultProperties(StringTokenizer tokenizer) throws UnknownHostException 
+    private String fillDefaultProperties( StringTokenizer tokenizer )
+        throws UnknownHostException
     {
-        int tokenNumber = tokenizer.countTokens();  
+        int tokenNumber = tokenizer.countTokens();
         String configSpecString;
         if ( tokenNumber == 1 )
         {
-            //No view name was given
+            // No view name was given
             viewName = getDefaultViewName();
             configSpecString = tokenizer.nextToken();
         }
         else
         {
-            configSpecString = checkViewName(tokenizer);
-            checkUnexpectedParameter(tokenizer, tokenNumber, 2);
+            configSpecString = checkViewName( tokenizer );
+            checkUnexpectedParameter( tokenizer, tokenNumber, 2 );
         }
         logger.debug( "viewName = '" + viewName + "' ; configSpec = '" + configSpecString + "'" );
         return configSpecString;
     }
 
-    private String fillUCMProperties(StringTokenizer tokenizer) throws UnknownHostException, MalformedURLException 
+    private String fillUCMProperties( StringTokenizer tokenizer )
+        throws UnknownHostException, MalformedURLException
     {
         int tokenNumber = tokenizer.countTokens();
         if ( tokenNumber <= 2 )
-            throw new MalformedURLException("ClearCaseUCM need more parameters. Expected url format : [view_name]|[configspec]|[vob_name]|[stream_name]");
-        
+            throw new MalformedURLException(
+                                             "ClearCaseUCM need more parameters. Expected url format : [view_name]|[configspec]|[vob_name]|[stream_name]" );
+
         String configSpecString;
         if ( tokenNumber == 3 )
         {
-            //No view name was given
+            // No view name was given
             viewName = getDefaultViewName();
             configSpecString = tokenizer.nextToken();
             vobName = tokenizer.nextToken();
@@ -201,16 +204,18 @@
         }
         else
         {
-            configSpecString = checkViewName(tokenizer);
+            configSpecString = checkViewName( tokenizer );
             vobName = tokenizer.nextToken();
-            streamName = tokenizer.nextToken();       
-            checkUnexpectedParameter(tokenizer, tokenNumber, 4);
+            streamName = tokenizer.nextToken();
+            checkUnexpectedParameter( tokenizer, tokenNumber, 4 );
         }
-        logger.info( "viewName = '" + viewName + "' ; configSpec = '" + configSpecString + "' ; vobName = '" + vobName + "' ; streamName = '" + streamName + "'" );
+        logger.info( "viewName = '" + viewName + "' ; configSpec = '" + configSpecString + "' ; vobName = '"
+            + vobName + "' ; streamName = '" + streamName + "'" );
         return configSpecString;
     }
 
-    private String checkViewName(StringTokenizer tokenizer) throws UnknownHostException 
+    private String checkViewName( StringTokenizer tokenizer )
+        throws UnknownHostException
     {
         viewName = tokenizer.nextToken();
         if ( viewName.length() > 0 )
@@ -224,15 +229,15 @@
         return tokenizer.nextToken();
     }
 
-    private void checkUnexpectedParameter(StringTokenizer tokenizer, int tokenNumber, int maxTokenNumber) 
+    private void checkUnexpectedParameter( StringTokenizer tokenizer, int tokenNumber, int maxTokenNumber )
     {
-        if (tokenNumber > maxTokenNumber)
+        if ( tokenNumber > maxTokenNumber )
         {
             String unexpectedToken = tokenizer.nextToken();
-            logger.info("The SCM URL contains unused parameter : " + unexpectedToken);
+            logger.info( "The SCM URL contains unused parameter : " + unexpectedToken );
         }
     }
-    
+
     private File createConfigSpecFile( String spec )
         throws URISyntaxException, MalformedURLException
     {
@@ -324,11 +329,13 @@
         return loadDirectory;
     }
 
-    public String getStreamName() {
+    public String getStreamName()
+    {
         return streamName;
     }
 
-    public String getVobName() {
+    public String getVobName()
+    {
         return vobName;
     }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java?rev=686199&r1=686198&r2=686199&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java Fri Aug 15 05:14:25 2008
@@ -63,9 +63,11 @@
             }
             catch ( FileNotFoundException e )
             {
+                // nop
             }
             catch ( IOException e )
             {
+                // nop
             }
             catch ( XmlPullParserException e )
             {