Author: vsiveton
Date: Tue Sep 2 03:48:32 2008
New Revision: 691192
URL: http://svn.apache.org/viewvc?rev=691192&view=rev
Log:
o using Os.isFamily( "windows" ) instead of System.getProperty()
Modified:
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-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
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=691192&r1=691191&r2=691192&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
Tue Sep 2 03:48:32 2008
@@ -33,6 +33,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.Os;
import org.codehaus.plexus.util.StringUtils;
import java.util.LinkedList;
@@ -61,8 +62,7 @@
public AccuRevScmProvider()
{
- boolean isWindows = System.getProperty( "os.name"
).toLowerCase().indexOf( "windows" ) != -1;
- this.accurevExecutable = resolveAccurevExecutable( isWindows );
+ this.accurevExecutable = resolveAccurevExecutable( Os.isFamily(
"windows" ) );
}
/** [EMAIL PROTECTED] */
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java?rev=691192&r1=691191&r2=691192&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearCaseCheckOutCommandTest.java
Tue Sep 2 03:48:32 2008
@@ -24,6 +24,7 @@
import org.apache.maven.scm.log.DefaultLog;
import
org.apache.maven.scm.provider.clearcase.repository.ClearCaseScmProviderRepository;
import org.apache.maven.scm.providers.clearcase.settings.Settings;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
@@ -95,7 +96,7 @@
settings.setClearcaseType(
ClearCaseScmProviderRepository.CLEARCASE_DEFAULT );
File configSpecLocation;
- if ( System.getProperty( "os.name" ).toLowerCase().indexOf( "windows"
) >= 0 )
+ if ( Os.isFamily( "windows" ) )
{
configSpecLocation = new File(
"\\\\myserver\\configspecs\\testconfigspec.txt" );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java?rev=691192&r1=691191&r2=691192&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/AbstractCvsChangeLogCommand.java
Tue Sep 2 03:48:32 2008
@@ -30,6 +30,7 @@
import org.apache.maven.scm.provider.cvslib.command.CvsCommandUtils;
import
org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
import org.apache.maven.scm.provider.cvslib.util.CvsUtil;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.Commandline;
@@ -125,7 +126,7 @@
{
// There's a difference between UNIX-like OS and Windows
// See http://jira.codehaus.org/browse/SCM-187
- if ( System.getProperty( "os.name" ).toLowerCase().indexOf( "windows"
) > -1 )
+ if ( Os.isFamily( "windows" ) )
{
cl.createArg().setValue( "\"" + dateRange + "\"" );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java?rev=691192&r1=691191&r2=691192&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
Tue Sep 2 03:48:32 2008
@@ -22,6 +22,7 @@
import junit.framework.Assert;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -44,9 +45,9 @@
throws IOException
{
initRepo( "src/test/repository/", repository, workingDirectory );
-
+
FileUtils.deleteDirectory( assertionDirectory );
-
+
Assert.assertTrue( assertionDirectory.mkdirs() );
}
@@ -55,15 +56,15 @@
{
// Copy the repository to target
File src = PlexusTestCase.getTestFile( source );
-
+
FileUtils.deleteDirectory( repository );
-
+
Assert.assertTrue( repository.mkdirs() );
-
+
FileUtils.copyDirectoryStructure( src, repository );
-
+
FileUtils.deleteDirectory( workingDirectory );
-
+
Assert.assertTrue( workingDirectory.mkdirs() );
}
@@ -95,7 +96,7 @@
repositoryRoot = stdout.getOutput().trim();
}
- else if ( System.getProperty( "os.name" ).startsWith( "Windows" ) )
+ else if ( Os.isFamily( "windows" ) )
{
repositoryRoot = "/" + StringUtils.replace( repositoryRoot, "\\",
"/" );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java?rev=691192&r1=691191&r2=691192&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnConfigFileReader.java
Tue Sep 2 03:48:32 2008
@@ -20,6 +20,7 @@
*/
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
import java.io.BufferedReader;
@@ -42,7 +43,7 @@
{
if ( configDirectory == null )
{
- if ( System.getProperty( "os.name" ).toLowerCase().indexOf(
"windows" ) >= 0 )
+ if ( Os.isFamily( "windows" ) )
{
configDirectory = new File( System.getProperty( "user.home" ),
"Application Data/Subversion" );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java?rev=691192&r1=691191&r2=691192&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
Tue Sep 2 03:48:32 2008
@@ -22,6 +22,7 @@
import junit.framework.Assert;
import org.apache.maven.scm.ScmTestCase;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -152,7 +153,7 @@
repositoryRoot = stdout.getOutput().trim();
}
- else if ( System.getProperty( "os.name" ).startsWith( "Windows" ) )
+ else if ( Os.isFamily( "windows" ) )
{
repositoryRoot = "/" + StringUtils.replace( repositoryRoot, "\\",
"/" );
}
