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 21:57:03 UTC
svn commit: r686352 [1/2] - in /maven/scm/trunk/maven-scm-providers:
maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/
maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/checkout/
mave...
Author: vsiveton
Date: Fri Aug 15 12:57:01 2008
New Revision: 686352
URL: http://svn.apache.org/viewvc?rev=686352&view=rev
Log:
o checkstyle again
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.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/repository/ClearCaseScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/LocalScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyCCM.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/util/SynergyUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/VssScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssParameterContext.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/checkout/VssCheckOutConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/edit/VssEditConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/update/VssUpdateConsumer.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/diff/CvsDiffConsumer.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/login/CvsPass.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/SvnChangeSet.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/SvnTagBranchUtils.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/command/diff/SvnDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommand.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarConfig.java Fri Aug 15 12:57:01 2008
@@ -189,10 +189,10 @@
private float version = -1;
- VersionConsumer( String version_tag )
+ VersionConsumer( String aVersionTag )
{
super( new DefaultLog() );
- this.versionTag = version_tag;
+ this.versionTag = aVersionTag;
}
public void doConsume( ScmFileStatus status, String line )
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=686352&r1=686351&r2=686352&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 12:57:01 2008
@@ -246,7 +246,7 @@
// return command;
// }
- protected Commandline createCreateViewCommandLine( File workingDirectory, String viewName, String streamIdentifier)
+ protected Commandline createCreateViewCommandLine( File workingDirectory, String viewName, String streamIdentifier )
throws IOException
{
Commandline command = new Commandline();
@@ -287,7 +287,7 @@
* @param vobName
* @return the formatted stream identifier if the two parameter are not null
*/
- protected String getStreamIdentifier(String streamName, String vobName)
+ protected String getStreamIdentifier( String streamName, String vobName )
{
if ( streamName == null || vobName == null )
{
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=686352&r1=686351&r2=686352&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 12:57:01 2008
@@ -148,9 +148,13 @@
String configSpecString = null;
if ( CLEARCASE_UCM.equals( settings.getClearcaseType() ) )
+ {
configSpecString = fillUCMProperties( tokenizer );
+ }
else
+ {
configSpecString = fillDefaultProperties( tokenizer );
+ }
if ( !configSpecString.startsWith( "load " ) )
{
@@ -190,8 +194,10 @@
{
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 )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/LocalScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/LocalScmProvider.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/LocalScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/LocalScmProvider.java Fri Aug 15 12:57:01 2008
@@ -65,9 +65,8 @@
if ( tokens.length != 2 )
{
- throw new ScmRepositoryException(
- "The connection string didn't contain the expected number of tokens. Expected 2 tokens but got " +
- tokens.length + " tokens." );
+ throw new ScmRepositoryException( "The connection string didn't contain the expected number of tokens. "
+ + "Expected 2 tokens but got " + tokens.length + " tokens." );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java Fri Aug 15 12:57:01 2008
@@ -130,6 +130,7 @@
{
if ( endDate.after( modifiedDate ) || endDate.equals( modifiedDate ) )
{
+ // nop
}
else
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/list/LocalListScmResult.java Fri Aug 15 12:57:01 2008
@@ -1,5 +1,24 @@
package org.apache.maven.scm.provider.local.command.list;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.command.list.ListScmResult;
import java.util.List;
@@ -13,6 +32,6 @@
{
public LocalListScmResult( String commandLine, List files )
{
- super( commandLine, files);
+ super( commandLine, files );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java Fri Aug 15 12:57:01 2008
@@ -86,8 +86,8 @@
if ( !baseDestination.exists() && !baseDestination.isDirectory() )
{
- throw new ScmException( "The destination directory isn't a directory or doesn't exist (" +
- baseDestination.getAbsolutePath() + ")." );
+ throw new ScmException( "The destination directory isn't a directory or doesn't exist ("
+ + baseDestination.getAbsolutePath() + ")." );
}
List updatedFiles;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java Fri Aug 15 12:57:01 2008
@@ -56,6 +56,10 @@
/**
* Builds LocalScmMetadata based on contents of repository
+ *
+ * @param repository
+ * @return
+ * @throws IOException if any
*/
public LocalScmMetadata buildMetadata( File repository )
throws IOException
@@ -68,6 +72,10 @@
/**
* Writes metadata file
+ *
+ * @param destinationDir
+ * @param metadata
+ * @throws IOException if any
*/
public void writeMetadata( File destinationDir, LocalScmMetadata metadata )
throws IOException
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java Fri Aug 15 12:57:01 2008
@@ -129,8 +129,8 @@
{
if ( host != null )
{
- getLogger().warn( "Username as part of path is deprecated, the new format is " +
- "scm:perforce:[username@]host:port:path_to_repository" );
+ getLogger().warn( "Username as part of path is deprecated, the new format is "
+ + "scm:perforce:[username@]host:port:path_to_repository" );
}
user = path.substring( 0, path.indexOf( "@" ) );
@@ -145,9 +145,7 @@
return "perforce";
}
- /**
- * @see org.apache.maven.scm.provider.AbstractScmProvider#changelog(org.apache.maven.scm.provider.ScmProviderRepository,org.apache.maven.scm.ScmFileSet,org.apache.maven.scm.CommandParameters)
- */
+ /** {@inheritDoc} */
protected ChangeLogScmResult changelog( ScmProviderRepository repository, ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -300,6 +298,9 @@
* //depot/foo/bar -> //depot/foo/bar/...
* //depot/foo/bar/ -> //depot/foo/bar/...
* //depot/foo/bar/... -> //depot/foo/bar/...
+ *
+ * @param repoPath
+ * @return
*/
public static String getCanonicalRepoPath( String repoPath )
{
@@ -319,11 +320,11 @@
private static final String NEWLINE = "\r\n";
- /*
+ /*
* Clientspec name can be overridden with the system property below. I don't
* know of any way for this code to get access to maven's settings.xml so this
* is the best I can do.
- *
+ *
* Sample clientspec:
Client: mperham-mikeperham-dt-maven
@@ -460,9 +461,9 @@
log.debug( "Actual POM location: " + loc );
if ( !repo.getPath().equals( loc ) )
{
- log.info( "The SCM location in your pom.xml (" + repo.getPath() +
- ") is not equal to the depot location (" + loc +
- "). This happens frequently with branches. " + "Ignoring the SCM location." );
+ log.info( "The SCM location in your pom.xml (" + repo.getPath()
+ + ") is not equal to the depot location (" + loc
+ + "). This happens frequently with branches. " + "Ignoring the SCM location." );
}
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java Fri Aug 15 12:57:01 2008
@@ -131,7 +131,7 @@
}
else
{
- getLogger().debug( "Cannot find client.");
+ getLogger().debug( "Cannot find client." );
entries.put( "Client root", "" );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceVerbMapper.java Fri Aug 15 12:57:01 2008
@@ -30,27 +30,27 @@
*/
public class PerforceVerbMapper
{
- private static final Map map = new HashMap();
+ private static final Map VERB = new HashMap();
static
{
// Perforce uses different tenses sometimes so we need to map
// the different tenses to the same status.
- map.put( "add", ScmFileStatus.ADDED );
- map.put( "added", ScmFileStatus.ADDED );
- map.put( "delete", ScmFileStatus.DELETED );
- map.put( "deleted", ScmFileStatus.DELETED );
- map.put( "edit", ScmFileStatus.MODIFIED );
- map.put( "edited", ScmFileStatus.MODIFIED );
- map.put( "updating", ScmFileStatus.UPDATED );
- map.put( "updated", ScmFileStatus.UPDATED );
+ VERB.put( "add", ScmFileStatus.ADDED );
+ VERB.put( "added", ScmFileStatus.ADDED );
+ VERB.put( "delete", ScmFileStatus.DELETED );
+ VERB.put( "deleted", ScmFileStatus.DELETED );
+ VERB.put( "edit", ScmFileStatus.MODIFIED );
+ VERB.put( "edited", ScmFileStatus.MODIFIED );
+ VERB.put( "updating", ScmFileStatus.UPDATED );
+ VERB.put( "updated", ScmFileStatus.UPDATED );
// UNKNOWN means we just ignore this verb
- map.put( "refreshing", ScmFileStatus.UNKNOWN );
+ VERB.put( "refreshing", ScmFileStatus.UNKNOWN );
}
public static ScmFileStatus toStatus( String verb )
{
- ScmFileStatus stat = (ScmFileStatus) map.get( verb );
+ ScmFileStatus stat = (ScmFileStatus) VERB.get( verb );
if ( stat == null )
{
// XXX testing only
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java Fri Aug 15 12:57:01 2008
@@ -37,7 +37,8 @@
* <p/>
* <pre>
* p4 where pom.xml
- * //depot/modules/fabric/trunk/pom.xml //mikeperham-dt/depot/modules/fabric/trunk/pom.xml d:\perforce\depot\modules\fabric\trunk\pom.xml
+ * //depot/modules/fabric/trunk/pom.xml //mikeperham-dt/depot/modules/fabric/trunk/pom.xml
+ * d:\perforce\depot\modules\fabric\trunk\pom.xml
* </pre>
*
* @author mperham
@@ -103,7 +104,7 @@
path = line.substring( 0, line.lastIndexOf( "//" ) - 1 );
}
// Check for errors
- while( ( line = brErr.readLine() ) != null )
+ while ( ( line = brErr.readLine() ) != null )
{
if ( line.indexOf( "not in client view" ) != -1 )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogConsumer.java Fri Aug 15 12:57:01 2008
@@ -101,7 +101,7 @@
private String userDatePattern;
- private static final String pattern = "^\\.\\.\\. #(\\d+) " + // revision number
+ private static final String PATTERN = "^\\.\\.\\. #(\\d+) " + // revision number
"change (\\d+) .* " + // changelist number
"on (.*) " + // date
"by (.*)@"; // author
@@ -118,7 +118,7 @@
try
{
- revisionRegexp = new RE( pattern );
+ revisionRegexp = new RE( PATTERN );
}
catch ( RESyntaxException ignored )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInConsumer.java Fri Aug 15 12:57:01 2008
@@ -148,6 +148,7 @@
case STATE_ERROR:
error( line );
break;
+ default:
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java Fri Aug 15 12:57:01 2008
@@ -71,7 +71,7 @@
actualLocation = PerforceScmProvider.getRepoPath( getLogger(), prepo, files.getBasedir() );
- String specname = PerforceScmProvider.getClientspecName(getLogger(), prepo, workingDirectory );
+ String specname = PerforceScmProvider.getClientspecName( getLogger(), prepo, workingDirectory );
PerforceCheckOutConsumer consumer = new PerforceCheckOutConsumer( specname, actualLocation );
getLogger().info( "Checkout working directory: " + workingDirectory );
Commandline cl = null;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutConsumer.java Fri Aug 15 12:57:01 2008
@@ -85,8 +85,9 @@
/** {@inheritDoc} */
public void consumeLine( String line )
{
- if ( currentState == STATE_CLIENTSPEC && ( line.startsWith( "Client " + specname + " saved." ) ||
- line.startsWith( "Client " + specname + " not changed." ) ) )
+ if ( currentState == STATE_CLIENTSPEC
+ && ( line.startsWith( "Client " + specname + " saved." ) || line.startsWith( "Client " + specname
+ + " not changed." ) ) )
{
currentState = STATE_NORMAL;
return;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java Fri Aug 15 12:57:01 2008
@@ -81,10 +81,13 @@
e.printStackTrace();
}
- if(consumer.isSuccess()) {
+ if ( consumer.isSuccess() )
+ {
return new EditScmResult( cl.toString(), consumer.getEdits() );
- } else {
- return new EditScmResult( cl.toString(), "Unable to edit file(s)", consumer.getErrorMessage(), false);
+ }
+ else
+ {
+ return new EditScmResult( cl.toString(), "Unable to edit file(s)", consumer.getErrorMessage(), false );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java Fri Aug 15 12:57:01 2008
@@ -19,6 +19,12 @@
* under the License.
*/
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -28,11 +34,9 @@
import org.apache.maven.scm.provider.perforce.PerforceScmProvider;
import org.apache.maven.scm.provider.perforce.command.PerforceCommand;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
-import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.StringUtils;
-
-import java.io.*;
+import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.Commandline;
/**
* @author Mike Perham
@@ -54,8 +58,9 @@
{
Process proc = cl.execute();
DataOutputStream dos = new DataOutputStream( proc.getOutputStream() );
- if(StringUtils.isEmpty(repo.getPassword())) {
- throw new ScmException("password is required for the perforce scm plugin.");
+ if ( StringUtils.isEmpty( repo.getPassword() ) )
+ {
+ throw new ScmException( "password is required for the perforce scm plugin." );
}
dos.writeUTF( repo.getPassword() );
dos.close();
@@ -77,15 +82,15 @@
}
catch ( CommandLineException e )
{
- throw new ScmException("", e);
+ throw new ScmException( "", e );
}
catch ( IOException e )
{
- throw new ScmException("", e);
+ throw new ScmException( "", e );
}
- return new LoginScmResult( cl.toString(), consumer.isSuccess() ? "Login successful" : "Login failed", consumer
- .getOutput(), consumer.isSuccess() );
+ return new LoginScmResult( cl.toString(), consumer.isSuccess() ? "Login successful" : "Login failed",
+ consumer.getOutput(), consumer.isSuccess() );
}
public static Commandline createCommandLine( PerforceScmProviderRepository repo, File workingDir )
@@ -93,7 +98,8 @@
Commandline command = PerforceScmProvider.createP4Command( repo, workingDir );
command.createArgument().setValue( "login" );
- if(!StringUtils.isEmpty(repo.getUser())) {
+ if ( !StringUtils.isEmpty( repo.getUser() ) )
+ {
command.createArgument().setValue( repo.getUser() );
}
return command;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java Fri Aug 15 12:57:01 2008
@@ -55,7 +55,7 @@
throws ScmException
{
- if ( branch != null || StringUtils.isNotEmpty( (branch==null)?null:branch.getName() ) )
+ if ( branch != null || StringUtils.isNotEmpty( ( branch == null ) ? null : branch.getName() ) )
{
this.getLogger().warn( "This provider doesn't support changelog with on a given branch." );
}
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/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java?rev=686352&r1=686351&r2=686352&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 Fri Aug 15 12:57:01 2008
@@ -155,8 +155,8 @@
return;
}
- if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN ) ||
- line.startsWith( UNCHANGED_LINE_TOKEN ) )
+ if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN )
+ || line.startsWith( UNCHANGED_LINE_TOKEN ) )
{
// add to buffer
currentDifference.append( line ).append( "\n" );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java Fri Aug 15 12:57:01 2008
@@ -52,9 +52,11 @@
}
catch ( FileNotFoundException e )
{
+ // nop
}
catch ( IOException e )
{
+ // nop
}
catch ( XmlPullParserException e )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/add/SynergyAddCommand.java Fri Aug 15 12:57:01 2008
@@ -57,19 +57,19 @@
message = "Maven SCM Synergy provider: adding file(s) to project " + repo.getProjectSpec();
}
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
try
{
- int taskNum = SynergyUtil.createTask( getLogger(), message, repo.getProjectRelease(), true, CCM_ADDR );
- String project_spec =
- SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), CCM_ADDR );
- if ( project_spec == null )
+ int taskNum = SynergyUtil.createTask( getLogger(), message, repo.getProjectRelease(), true, ccmAddr );
+ String projectSpec =
+ SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), ccmAddr );
+ if ( projectSpec == null )
{
throw new ScmException( "You should checkout project first" );
}
- File WAPath = SynergyUtil.getWorkArea( getLogger(), project_spec, CCM_ADDR );
- File destPath = new File( WAPath, repo.getProjectName() );
+ File waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
+ File destPath = new File( waPath, repo.getProjectName() );
for ( Iterator i = fileSet.getFileList().iterator(); i.hasNext(); )
{
File f = (File) i.next();
@@ -87,14 +87,14 @@
throw new ScmException( "Unable to copy file in Work Area", e );
}
}
- SynergyUtil.create( getLogger(), dest, message, CCM_ADDR );
+ SynergyUtil.create( getLogger(), dest, message, ccmAddr );
}
- SynergyUtil.checkinTask( getLogger(), taskNum, message, CCM_ADDR );
+ SynergyUtil.checkinTask( getLogger(), taskNum, message, ccmAddr );
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
return new AddScmResult( "", fileSet.getFileList() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/changelog/SynergyChangeLogCommand.java Fri Aug 15 12:57:01 2008
@@ -56,19 +56,19 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository) repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
List csList = new ArrayList();
try
{
- String project_spec =
- SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), CCM_ADDR );
- if ( project_spec == null )
+ String projectSpec =
+ SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), ccmAddr );
+ if ( projectSpec == null )
{
throw new ScmException( "You should checkout project first" );
}
- List tasks = SynergyUtil.getCompletedTasks( getLogger(), project_spec, startDate, endDate, CCM_ADDR );
+ List tasks = SynergyUtil.getCompletedTasks( getLogger(), projectSpec, startDate, endDate, ccmAddr );
for ( Iterator i = tasks.iterator(); i.hasNext(); )
{
ChangeSet cs = new ChangeSet();
@@ -76,13 +76,13 @@
cs.setAuthor( t.getUsername() );
cs.setComment( "Task " + t.getNumber() + ": " + t.getComment() );
cs.setDate( t.getModifiedTime() );
- cs.setFiles( SynergyUtil.getModifiedObjects( getLogger(), t.getNumber(), CCM_ADDR ) );
+ cs.setFiles( SynergyUtil.getModifiedObjects( getLogger(), t.getNumber(), ccmAddr ) );
csList.add( cs );
}
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
return new ChangeLogScmResult( "ccm query ...", new ChangeLogSet( csList, startDate, endDate ) );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkin/SynergyCheckInCommand.java Fri Aug 15 12:57:01 2008
@@ -47,15 +47,15 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository) repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
try
{
- SynergyUtil.checkinDefaultTask( getLogger(), message, CCM_ADDR );
+ SynergyUtil.checkinDefaultTask( getLogger(), message, ccmAddr );
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
return new CheckInScmResult( "ccm checkin", fileSet.getFileList() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/checkout/SynergyCheckOutCommand.java Fri Aug 15 12:57:01 2008
@@ -57,39 +57,39 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository) repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
- File WAPath;
+ File waPath;
try
{
- String project_spec =
- SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), CCM_ADDR );
- if ( project_spec != null )
+ String projectSpec =
+ SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), ccmAddr );
+ if ( projectSpec != null )
{
- getLogger().info( "A working project already exists [" + project_spec + "]." );
- SynergyUtil.synchronize( getLogger(), project_spec, CCM_ADDR );
+ getLogger().info( "A working project already exists [" + projectSpec + "]." );
+ SynergyUtil.synchronize( getLogger(), projectSpec, ccmAddr );
}
else
{
- SynergyUtil.checkoutProject( getLogger(), null, repo.getProjectSpec(), version, repo.getProjectPurpose(),
- repo.getProjectRelease(), CCM_ADDR );
- project_spec =
- SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), CCM_ADDR );
- getLogger().info( "A new working project [" + project_spec + "] was created." );
+ SynergyUtil.checkoutProject( getLogger(), null, repo.getProjectSpec(), version,
+ repo.getProjectPurpose(), repo.getProjectRelease(), ccmAddr );
+ projectSpec =
+ SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), ccmAddr );
+ getLogger().info( "A new working project [" + projectSpec + "] was created." );
}
- SynergyUtil.reconfigure( getLogger(), project_spec, CCM_ADDR );
- WAPath = SynergyUtil.getWorkArea( getLogger(), project_spec, CCM_ADDR );
+ SynergyUtil.reconfigure( getLogger(), projectSpec, ccmAddr );
+ waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
- File source = new File( WAPath, repo.getProjectName() );
+ File source = new File( waPath, repo.getProjectName() );
- getLogger().info( "We will now copy files from Synergy Work Area [" + source + "] to expected folder [" +
- fileSet.getBasedir() + "]" );
+ getLogger().info( "We will now copy files from Synergy Work Area [" + source + "] to expected folder ["
+ + fileSet.getBasedir() + "]" );
// Move files to the expected folder
try
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java Fri Aug 15 12:57:01 2008
@@ -53,20 +53,20 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository) repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
try
{
- String project_spec =
- SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), CCM_ADDR );
- File WAPath = SynergyUtil.getWorkArea( getLogger(), project_spec, CCM_ADDR );
- File sourcePath = new File( WAPath, repo.getProjectName() );
- if ( project_spec == null )
+ String projectSpec =
+ SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), ccmAddr );
+ File waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
+ File sourcePath = new File( waPath, repo.getProjectName() );
+ if ( projectSpec == null )
{
throw new ScmException( "You should checkout project first" );
}
int taskNum = SynergyUtil.createTask( getLogger(), "Maven SCM Synergy provider: edit command for project " +
- repo.getProjectSpec(), repo.getProjectRelease(), true, CCM_ADDR );
+ repo.getProjectSpec(), repo.getProjectRelease(), true, ccmAddr );
getLogger().info( "Task " + taskNum + " was created to perform checkout." );
for ( Iterator i = fileSet.getFileList().iterator(); i.hasNext(); )
{
@@ -75,7 +75,7 @@
File source = new File( sourcePath, SynergyUtil.removePrefix( fileSet.getBasedir(), f ) );
List list = new LinkedList();
list.add( source );
- SynergyUtil.checkoutFiles( getLogger(), list, CCM_ADDR );
+ SynergyUtil.checkoutFiles( getLogger(), list, ccmAddr );
if ( !source.equals( dest ) )
{
getLogger().debug( "Copy file [" + source + "] to expected folder [" + dest + "]." );
@@ -92,7 +92,7 @@
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
return new EditScmResult( "", fileSet.getFileList() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/remove/SynergyRemoveCommand.java Fri Aug 15 12:57:01 2008
@@ -50,24 +50,24 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository) repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
try
{
- String project_spec =
- SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), CCM_ADDR );
- if ( project_spec == null )
+ String projectSpec =
+ SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), ccmAddr );
+ if ( projectSpec == null )
{
throw new ScmException( "You should checkout project first" );
}
- File WAPath = SynergyUtil.getWorkArea( getLogger(), project_spec, CCM_ADDR );
- File destPath = new File( WAPath, repo.getProjectName() );
+ File waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
+ File destPath = new File( waPath, repo.getProjectName() );
for ( Iterator i = fileSet.getFileList().iterator(); i.hasNext(); )
{
ScmFile f = (ScmFile) i.next();
File source = new File( fileSet.getBasedir(), f.getPath() );
File dest = new File( destPath, f.getPath() );
- SynergyUtil.delete( getLogger(), dest, CCM_ADDR, false );
+ SynergyUtil.delete( getLogger(), dest, ccmAddr, false );
if ( !source.equals( dest ) )
{
getLogger().debug( "Delete file [" + source + "]." );
@@ -77,7 +77,7 @@
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
return new StatusScmResult( "", fileSet.getFileList() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/status/SynergyStatusCommand.java Fri Aug 15 12:57:01 2008
@@ -51,16 +51,16 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository) repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
List l;
try
{
- l = SynergyUtil.getWorkingFiles( getLogger(), repo.getProjectSpec(), repo.getProjectRelease(), CCM_ADDR );
+ l = SynergyUtil.getWorkingFiles( getLogger(), repo.getProjectSpec(), repo.getProjectRelease(), ccmAddr );
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
List result = new LinkedList();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java Fri Aug 15 12:57:01 2008
@@ -52,24 +52,24 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository) repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
try
{
- String project_spec =
- SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), CCM_ADDR );
- if ( project_spec == null )
+ String projectSpec =
+ SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), ccmAddr );
+ if ( projectSpec == null )
{
throw new ScmException( "You should checkout project first" );
}
- File WAPath = SynergyUtil.getWorkArea( getLogger(), project_spec, CCM_ADDR );
- File destPath = new File( WAPath, repo.getProjectName() );
+ File waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
+ File destPath = new File( waPath, repo.getProjectName() );
for ( Iterator i = fileSet.getFileList().iterator(); i.hasNext(); )
{
ScmFile f = (ScmFile) i.next();
File source = new File( fileSet.getBasedir(), f.getPath() );
File dest = new File( destPath, f.getPath() );
- SynergyUtil.delete( getLogger(), dest, CCM_ADDR, true );
+ SynergyUtil.delete( getLogger(), dest, ccmAddr, true );
if ( !source.equals( dest ) )
{
getLogger().debug( "Copy file [" + dest + "] to [" + source + "]." );
@@ -86,7 +86,7 @@
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
return new UnEditScmResult( "", fileSet.getFileList() );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/update/SynergyUpdateCommand.java Fri Aug 15 12:57:01 2008
@@ -56,31 +56,31 @@
SynergyScmProviderRepository repo = (SynergyScmProviderRepository) repository;
getLogger().debug( "basedir: " + fileSet.getBasedir() );
- String CCM_ADDR = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
+ String ccmAddr = SynergyUtil.start( getLogger(), repo.getUser(), repo.getPassword(), null );
- File WAPath;
+ File waPath;
try
{
- String project_spec =
- SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), CCM_ADDR );
- SynergyUtil.reconfigureProperties( getLogger(), project_spec, CCM_ADDR );
- SynergyUtil.reconfigure( getLogger(), project_spec, CCM_ADDR );
+ String projectSpec =
+ SynergyUtil.getWorkingProject( getLogger(), repo.getProjectSpec(), repo.getUser(), ccmAddr );
+ SynergyUtil.reconfigureProperties( getLogger(), projectSpec, ccmAddr );
+ SynergyUtil.reconfigure( getLogger(), projectSpec, ccmAddr );
// We need to get WA path
- WAPath = SynergyUtil.getWorkArea( getLogger(), project_spec, CCM_ADDR );
+ waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec, ccmAddr );
}
finally
{
- SynergyUtil.stop( getLogger(), CCM_ADDR );
+ SynergyUtil.stop( getLogger(), ccmAddr );
}
- File source = new File( WAPath, repo.getProjectName() );
+ File source = new File( waPath, repo.getProjectName() );
// Move file from work area to expected dir if not the same
List modifications = new ArrayList();
if ( !source.equals( fileSet.getBasedir() ) )
{
- getLogger().info( "We will copy modified files from Synergy Work Area [" + source +
- "] to expected folder [" + fileSet.getBasedir() + "]" );
+ getLogger().info( "We will copy modified files from Synergy Work Area [" + source
+ + "] to expected folder [" + fileSet.getBasedir() + "]" );
try
{
copyDirectoryStructure( source, fileSet.getBasedir(), modifications );
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetCompletedTasksConsumer.java Fri Aug 15 12:57:01 2008
@@ -51,7 +51,7 @@
private String country = "US";
- public static String OUTPUT_FORMAT = "%displayname" + SynergyUtil.SEPARATOR + "%owner" + SynergyUtil.SEPARATOR +
+ public static final String OUTPUT_FORMAT = "%displayname" + SynergyUtil.SEPARATOR + "%owner" + SynergyUtil.SEPARATOR +
"%completion_date" + SynergyUtil.SEPARATOR + "%task_synopsis" + SynergyUtil.SEPARATOR;
private List entries = new ArrayList();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetTaskObjectsConsumer.java Fri Aug 15 12:57:01 2008
@@ -40,7 +40,7 @@
private List entries = new ArrayList();
- public static String OUTPUT_FORMAT = "%name" + SynergyUtil.SEPARATOR + // 0
+ public static final String OUTPUT_FORMAT = "%name" + SynergyUtil.SEPARATOR + // 0
"%version" + SynergyUtil.SEPARATOR;
/**
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/consumer/SynergyGetWorkingFilesConsumer.java Fri Aug 15 12:57:01 2008
@@ -36,7 +36,7 @@
private List files = new ArrayList();
- public static String OUTPUT_FORMAT = "%name";
+ public static final String OUTPUT_FORMAT = "%name";
public SynergyGetWorkingFilesConsumer( ScmLogger logger )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java?rev=686352&r1=686351&r2=686352&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java Fri Aug 15 12:57:01 2008
@@ -35,15 +35,15 @@
extends ScmProviderRepository
{
- private String project_spec;
+ private String projectSpec;
- private String project_name;
+ private String projectName;
- private String project_version;
+ private String projectVersion;
- private String project_release;
+ private String projectRelease;
- private String project_purpose;
+ private String projectPurpose;
private String delimiter;
@@ -93,13 +93,13 @@
{
if ( tokenizer.countTokens() == 5 )
{
- project_name = tokenizer.nextToken();
+ projectName = tokenizer.nextToken();
delimiter = tokenizer.nextToken();
- project_version = tokenizer.nextToken();
- project_release = tokenizer.nextToken();
- project_purpose = tokenizer.nextToken();
+ projectVersion = tokenizer.nextToken();
+ projectRelease = tokenizer.nextToken();
+ projectPurpose = tokenizer.nextToken();
- project_spec = project_name + delimiter + project_version;
+ projectSpec = projectName + delimiter + projectVersion;
}
else
@@ -110,17 +110,17 @@
public String getProjectSpec()
{
- return project_spec;
+ return projectSpec;
}
public String getProjectName()
{
- return project_name;
+ return projectName;
}
public String getProjectVersion()
{
- return project_version;
+ return projectVersion;
}
/**
@@ -128,7 +128,7 @@
*/
public String getProjectPurpose()
{
- return project_purpose;
+ return projectPurpose;
}
/**
@@ -136,7 +136,7 @@
*/
public String getProjectRelease()
{
- return project_release;
+ return projectRelease;
}
}