You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/11/23 10:49:28 UTC
[05/10] Added .gitattributes to enforce proper line endings,
remaining incorrect files fixed.
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unedit/IntegrityUnEditCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unedit/IntegrityUnEditCommand.java b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unedit/IntegrityUnEditCommand.java
index a70c574..1701c30 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unedit/IntegrityUnEditCommand.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unedit/IntegrityUnEditCommand.java
@@ -1,73 +1,73 @@
-package org.apache.maven.scm.provider.integrity.command.unedit;
-
-/**
- * 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 com.mks.api.response.APIException;
-import com.mks.api.response.Response;
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.command.unedit.AbstractUnEditCommand;
-import org.apache.maven.scm.command.unedit.UnEditScmResult;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.integrity.ExceptionHandler;
-import org.apache.maven.scm.provider.integrity.Sandbox;
-import org.apache.maven.scm.provider.integrity.repository.IntegrityScmProviderRepository;
-
-/**
- * MKS Integrity implementation of Maven's AbstractUnEditCommand
- * <br>This command will execute a 'si revert' command which will revert
- * any modified working files back to their server versions
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityUnEditCommand.java 1.4 2011/08/22 13:06:39EDT Cletus D'Souza (dsouza) Exp $
- * @since 1.6
- */
-public class IntegrityUnEditCommand
- extends AbstractUnEditCommand
-{
- /**
- * {@inheritDoc}
- */
- @Override
- public UnEditScmResult executeUnEditCommand( ScmProviderRepository repository, ScmFileSet fileSet )
- throws ScmException
- {
- getLogger().info( "Attempting to revert members in sandbox " + fileSet.getBasedir().getAbsolutePath() );
- IntegrityScmProviderRepository iRepo = (IntegrityScmProviderRepository) repository;
- UnEditScmResult result;
- try
- {
- Sandbox siSandbox = iRepo.getSandbox();
- Response res = siSandbox.revertMembers();
- int exitCode = res.getExitCode();
- boolean success = ( exitCode == 0 ? true : false );
- result = new UnEditScmResult( res.getCommandString(), "", "Exit Code: " + exitCode, success );
- }
- catch ( APIException aex )
- {
- ExceptionHandler eh = new ExceptionHandler( aex );
- getLogger().error( "MKS API Exception: " + eh.getMessage() );
- getLogger().info( eh.getCommand() + " exited with return code " + eh.getExitCode() );
- result = new UnEditScmResult( eh.getCommand(), eh.getMessage(), "Exit Code: " + eh.getExitCode(), false );
- }
-
- return result;
- }
-}
+package org.apache.maven.scm.provider.integrity.command.unedit;
+
+/**
+ * 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 com.mks.api.response.APIException;
+import com.mks.api.response.Response;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.command.unedit.AbstractUnEditCommand;
+import org.apache.maven.scm.command.unedit.UnEditScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.integrity.ExceptionHandler;
+import org.apache.maven.scm.provider.integrity.Sandbox;
+import org.apache.maven.scm.provider.integrity.repository.IntegrityScmProviderRepository;
+
+/**
+ * MKS Integrity implementation of Maven's AbstractUnEditCommand
+ * <br>This command will execute a 'si revert' command which will revert
+ * any modified working files back to their server versions
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityUnEditCommand.java 1.4 2011/08/22 13:06:39EDT Cletus D'Souza (dsouza) Exp $
+ * @since 1.6
+ */
+public class IntegrityUnEditCommand
+ extends AbstractUnEditCommand
+{
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public UnEditScmResult executeUnEditCommand( ScmProviderRepository repository, ScmFileSet fileSet )
+ throws ScmException
+ {
+ getLogger().info( "Attempting to revert members in sandbox " + fileSet.getBasedir().getAbsolutePath() );
+ IntegrityScmProviderRepository iRepo = (IntegrityScmProviderRepository) repository;
+ UnEditScmResult result;
+ try
+ {
+ Sandbox siSandbox = iRepo.getSandbox();
+ Response res = siSandbox.revertMembers();
+ int exitCode = res.getExitCode();
+ boolean success = ( exitCode == 0 ? true : false );
+ result = new UnEditScmResult( res.getCommandString(), "", "Exit Code: " + exitCode, success );
+ }
+ catch ( APIException aex )
+ {
+ ExceptionHandler eh = new ExceptionHandler( aex );
+ getLogger().error( "MKS API Exception: " + eh.getMessage() );
+ getLogger().info( eh.getCommand() + " exited with return code " + eh.getExitCode() );
+ result = new UnEditScmResult( eh.getCommand(), eh.getMessage(), "Exit Code: " + eh.getExitCode(), false );
+ }
+
+ return result;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unlock/IntegrityUnlockCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unlock/IntegrityUnlockCommand.java b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unlock/IntegrityUnlockCommand.java
index b31fd7c..1314c14 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unlock/IntegrityUnlockCommand.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/unlock/IntegrityUnlockCommand.java
@@ -1,109 +1,109 @@
-package org.apache.maven.scm.provider.integrity.command.unlock;
-
-/**
- * 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 com.mks.api.response.APIException;
-import com.mks.api.response.Response;
-import org.apache.maven.scm.CommandParameter;
-import org.apache.maven.scm.CommandParameters;
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.command.unlock.AbstractUnlockCommand;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.integrity.ExceptionHandler;
-import org.apache.maven.scm.provider.integrity.Sandbox;
-import org.apache.maven.scm.provider.integrity.repository.IntegrityScmProviderRepository;
-
-import java.io.File;
-
-/**
- * MKS Integrity implementation of Maven's AbstractUnlockCommand
- * <br>This command will run a 'si unlock' command for the specified filename
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityUnlockCommand.java 1.3 2011/08/22 13:06:40EDT Cletus D'Souza (dsouza) Exp $
- * @since 1.6
- */
-public class IntegrityUnlockCommand
- extends AbstractUnlockCommand
-{
- // This command will require the filename argument to be supplied for its execution
- private String filename;
-
- /**
- * IntegrityUnlockCommand constructor requires a filename argument to be supplied for its execution
- * <br>This avoids having to run the unlock command across the entire Sandbox.
- *
- * @param filename Relative path of the file needed to be unlocked
- */
- public IntegrityUnlockCommand( String filename )
- {
- this.filename = filename;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ScmResult executeUnlockCommand( ScmProviderRepository repository, File workingDirectory )
- throws ScmException
- {
- getLogger().info( "Attempting to unlock file: " + filename );
- if ( null == filename || filename.length() == 0 )
- {
- throw new ScmException( "A single filename is required to execute the unlock command!" );
- }
-
- ScmResult result;
- IntegrityScmProviderRepository iRepo = (IntegrityScmProviderRepository) repository;
- try
- {
- Sandbox siSandbox = iRepo.getSandbox();
- File memberFile = new File( workingDirectory.getAbsoluteFile() + File.separator + filename );
- Response res = siSandbox.unlock( memberFile, filename );
- int exitCode = res.getExitCode();
- boolean success = ( exitCode == 0 ? true : false );
- result = new ScmResult( res.getCommandString(), "", "Exit Code: " + exitCode, success );
- }
- catch ( APIException aex )
- {
- ExceptionHandler eh = new ExceptionHandler( aex );
- getLogger().error( "MKS API Exception: " + eh.getMessage() );
- getLogger().info( eh.getCommand() + " exited with return code " + eh.getExitCode() );
- result = new ScmResult( eh.getCommand(), eh.getMessage(), "Exit Code: " + eh.getExitCode(), false );
- }
-
- return result;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
- CommandParameters parameters )
- throws ScmException
- {
- filename = parameters.getString( CommandParameter.FILE );
- return executeUnlockCommand( repository, fileSet.getBasedir() );
- }
-
-}
+package org.apache.maven.scm.provider.integrity.command.unlock;
+
+/**
+ * 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 com.mks.api.response.APIException;
+import com.mks.api.response.Response;
+import org.apache.maven.scm.CommandParameter;
+import org.apache.maven.scm.CommandParameters;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.unlock.AbstractUnlockCommand;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.integrity.ExceptionHandler;
+import org.apache.maven.scm.provider.integrity.Sandbox;
+import org.apache.maven.scm.provider.integrity.repository.IntegrityScmProviderRepository;
+
+import java.io.File;
+
+/**
+ * MKS Integrity implementation of Maven's AbstractUnlockCommand
+ * <br>This command will run a 'si unlock' command for the specified filename
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityUnlockCommand.java 1.3 2011/08/22 13:06:40EDT Cletus D'Souza (dsouza) Exp $
+ * @since 1.6
+ */
+public class IntegrityUnlockCommand
+ extends AbstractUnlockCommand
+{
+ // This command will require the filename argument to be supplied for its execution
+ private String filename;
+
+ /**
+ * IntegrityUnlockCommand constructor requires a filename argument to be supplied for its execution
+ * <br>This avoids having to run the unlock command across the entire Sandbox.
+ *
+ * @param filename Relative path of the file needed to be unlocked
+ */
+ public IntegrityUnlockCommand( String filename )
+ {
+ this.filename = filename;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ScmResult executeUnlockCommand( ScmProviderRepository repository, File workingDirectory )
+ throws ScmException
+ {
+ getLogger().info( "Attempting to unlock file: " + filename );
+ if ( null == filename || filename.length() == 0 )
+ {
+ throw new ScmException( "A single filename is required to execute the unlock command!" );
+ }
+
+ ScmResult result;
+ IntegrityScmProviderRepository iRepo = (IntegrityScmProviderRepository) repository;
+ try
+ {
+ Sandbox siSandbox = iRepo.getSandbox();
+ File memberFile = new File( workingDirectory.getAbsoluteFile() + File.separator + filename );
+ Response res = siSandbox.unlock( memberFile, filename );
+ int exitCode = res.getExitCode();
+ boolean success = ( exitCode == 0 ? true : false );
+ result = new ScmResult( res.getCommandString(), "", "Exit Code: " + exitCode, success );
+ }
+ catch ( APIException aex )
+ {
+ ExceptionHandler eh = new ExceptionHandler( aex );
+ getLogger().error( "MKS API Exception: " + eh.getMessage() );
+ getLogger().info( eh.getCommand() + " exited with return code " + eh.getExitCode() );
+ result = new ScmResult( eh.getCommand(), eh.getMessage(), "Exit Code: " + eh.getExitCode(), false );
+ }
+
+ return result;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
+ throws ScmException
+ {
+ filename = parameters.getString( CommandParameter.FILE );
+ return executeUnlockCommand( repository, fileSet.getBasedir() );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/update/IntegrityUpdateCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/update/IntegrityUpdateCommand.java b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/update/IntegrityUpdateCommand.java
index 17e1fe3..597e100 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/update/IntegrityUpdateCommand.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/update/IntegrityUpdateCommand.java
@@ -1,118 +1,118 @@
-package org.apache.maven.scm.provider.integrity.command.update;
-
-/**
- * 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 com.mks.api.response.APIException;
-import com.mks.api.response.Response;
-import com.mks.api.response.Result;
-import com.mks.api.response.WorkItem;
-import com.mks.api.response.WorkItemIterator;
-import com.mks.api.si.SIModelTypeName;
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFile;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmFileStatus;
-import org.apache.maven.scm.ScmVersion;
-import org.apache.maven.scm.command.changelog.ChangeLogCommand;
-import org.apache.maven.scm.command.update.AbstractUpdateCommand;
-import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.integrity.ExceptionHandler;
-import org.apache.maven.scm.provider.integrity.Sandbox;
-import org.apache.maven.scm.provider.integrity.command.changelog.IntegrityChangeLogCommand;
-import org.apache.maven.scm.provider.integrity.repository.IntegrityScmProviderRepository;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * MKS Integrity implementation of Maven's AbstractUpdateCommand
- * <br>This command will execute a 'si resync' to synchronize the sandbox with the server revisions.
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityUpdateCommand.java 1.3 2011/08/22 13:06:42EDT Cletus D'Souza (dsouza) Exp $
- * @since 1.6
- */
-public class IntegrityUpdateCommand
- extends AbstractUpdateCommand
-{
- /**
- * {@inheritDoc}
- */
- @Override
- public UpdateScmResult executeUpdateCommand( ScmProviderRepository repository, ScmFileSet fileSet,
- ScmVersion scmVersion )
- throws ScmException
- {
- getLogger().info( "Attempting to synchronize sandbox in " + fileSet.getBasedir().getAbsolutePath() );
- List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
- IntegrityScmProviderRepository iRepo = (IntegrityScmProviderRepository) repository;
- Sandbox siSandbox = iRepo.getSandbox();
- try
- {
- // Make sure we've got a valid sandbox, otherwise create it...
- if ( siSandbox.create() )
- {
- Response res = siSandbox.resync();
- // Lets capture what we got from running this resync
- WorkItemIterator wit = res.getWorkItems();
- while ( wit.hasNext() )
- {
- WorkItem wi = wit.next();
- if ( wi.getModelType().equals( SIModelTypeName.MEMBER ) )
- {
- Result message = wi.getResult();
- getLogger().debug( wi.getDisplayId() + " " + ( null != message ? message.getMessage() : "" ) );
- if ( null != message && message.getMessage().length() > 0 )
- {
- updatedFiles.add( new ScmFile( wi.getDisplayId(),
- message.getMessage().equalsIgnoreCase( "removed" )
- ? ScmFileStatus.DELETED
- : ScmFileStatus.UPDATED ) );
- }
- }
- }
- return new UpdateScmResult( res.getCommandString(), updatedFiles );
- }
- else
- {
- return new UpdateScmResult( "si resync", "Failed to synchronize workspace", "", false );
- }
- }
- catch ( APIException aex )
- {
- ExceptionHandler eh = new ExceptionHandler( aex );
- getLogger().error( "MKS API Exception: " + eh.getMessage() );
- getLogger().info( eh.getCommand() + " exited with return code " + eh.getExitCode() );
- return new UpdateScmResult( eh.getCommand(), eh.getMessage(), "Exit Code: " + eh.getExitCode(), false );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected ChangeLogCommand getChangeLogCommand()
- {
- IntegrityChangeLogCommand command = new IntegrityChangeLogCommand();
- command.setLogger( getLogger() );
- return command;
- }
-}
+package org.apache.maven.scm.provider.integrity.command.update;
+
+/**
+ * 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 com.mks.api.response.APIException;
+import com.mks.api.response.Response;
+import com.mks.api.response.Result;
+import com.mks.api.response.WorkItem;
+import com.mks.api.response.WorkItemIterator;
+import com.mks.api.si.SIModelTypeName;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.changelog.ChangeLogCommand;
+import org.apache.maven.scm.command.update.AbstractUpdateCommand;
+import org.apache.maven.scm.command.update.UpdateScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.integrity.ExceptionHandler;
+import org.apache.maven.scm.provider.integrity.Sandbox;
+import org.apache.maven.scm.provider.integrity.command.changelog.IntegrityChangeLogCommand;
+import org.apache.maven.scm.provider.integrity.repository.IntegrityScmProviderRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MKS Integrity implementation of Maven's AbstractUpdateCommand
+ * <br>This command will execute a 'si resync' to synchronize the sandbox with the server revisions.
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityUpdateCommand.java 1.3 2011/08/22 13:06:42EDT Cletus D'Souza (dsouza) Exp $
+ * @since 1.6
+ */
+public class IntegrityUpdateCommand
+ extends AbstractUpdateCommand
+{
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public UpdateScmResult executeUpdateCommand( ScmProviderRepository repository, ScmFileSet fileSet,
+ ScmVersion scmVersion )
+ throws ScmException
+ {
+ getLogger().info( "Attempting to synchronize sandbox in " + fileSet.getBasedir().getAbsolutePath() );
+ List<ScmFile> updatedFiles = new ArrayList<ScmFile>();
+ IntegrityScmProviderRepository iRepo = (IntegrityScmProviderRepository) repository;
+ Sandbox siSandbox = iRepo.getSandbox();
+ try
+ {
+ // Make sure we've got a valid sandbox, otherwise create it...
+ if ( siSandbox.create() )
+ {
+ Response res = siSandbox.resync();
+ // Lets capture what we got from running this resync
+ WorkItemIterator wit = res.getWorkItems();
+ while ( wit.hasNext() )
+ {
+ WorkItem wi = wit.next();
+ if ( wi.getModelType().equals( SIModelTypeName.MEMBER ) )
+ {
+ Result message = wi.getResult();
+ getLogger().debug( wi.getDisplayId() + " " + ( null != message ? message.getMessage() : "" ) );
+ if ( null != message && message.getMessage().length() > 0 )
+ {
+ updatedFiles.add( new ScmFile( wi.getDisplayId(),
+ message.getMessage().equalsIgnoreCase( "removed" )
+ ? ScmFileStatus.DELETED
+ : ScmFileStatus.UPDATED ) );
+ }
+ }
+ }
+ return new UpdateScmResult( res.getCommandString(), updatedFiles );
+ }
+ else
+ {
+ return new UpdateScmResult( "si resync", "Failed to synchronize workspace", "", false );
+ }
+ }
+ catch ( APIException aex )
+ {
+ ExceptionHandler eh = new ExceptionHandler( aex );
+ getLogger().error( "MKS API Exception: " + eh.getMessage() );
+ getLogger().info( eh.getCommand() + " exited with return code " + eh.getExitCode() );
+ return new UpdateScmResult( eh.getCommand(), eh.getMessage(), "Exit Code: " + eh.getExitCode(), false );
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected ChangeLogCommand getChangeLogCommand()
+ {
+ IntegrityChangeLogCommand command = new IntegrityChangeLogCommand();
+ command.setLogger( getLogger() );
+ return command;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/repository/IntegrityScmProviderRepository.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/repository/IntegrityScmProviderRepository.java b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/repository/IntegrityScmProviderRepository.java
index 7961dd5..3be3dc1 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/repository/IntegrityScmProviderRepository.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/repository/IntegrityScmProviderRepository.java
@@ -1,133 +1,133 @@
-package org.apache.maven.scm.provider.integrity.repository;
-
-/**
- * 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.log.ScmLogger;
-import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
-import org.apache.maven.scm.provider.integrity.APISession;
-import org.apache.maven.scm.provider.integrity.Project;
-import org.apache.maven.scm.provider.integrity.Sandbox;
-
-/**
- * MKS Integrity implementation of Maven's ScmProviderRepositoryWithHost
- * <br>This class stores an abstraction of the MKS API Session, Project, and Sandbox
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityScmProviderRepository.java 1.2 2011/08/22 13:06:43EDT Cletus D'Souza (dsouza) Exp $
- * @since 1.6
- */
-public class IntegrityScmProviderRepository
- extends ScmProviderRepositoryWithHost
-{
- // Configuration Path for the MKS Integrity SCM Project
- private String configurationPath;
-
- // MKS API Session
- private APISession api;
-
- // Encapsulation for our MKS Integrity SCM Project
- private Project siProject;
-
- // Encapsulation for our MKS Integrity SCM Sandbox
- private Sandbox siSandbox;
-
- /**
- * IntegrityScmProviderRepository constructor
- *
- * @param host MKS Integrity Server hostname or ip address
- * @param port MKS Integrity Server port number
- * @param user MKS Integrity Server username
- * @param paswd Password for MKS Integrity Server username
- * @param configPath MKS Integrity SCM Project Configuration Path
- * @param logger Maven ScmLogger object
- */
- public IntegrityScmProviderRepository( String host, int port, String user, String paswd, String configPath,
- ScmLogger logger )
- {
- super();
- setHost( host );
- setPort( port );
- setUser( user );
- setPassword( paswd );
- configurationPath = configPath;
- api = new APISession( logger );
- logger.debug( "Configuration Path: " + configurationPath );
- }
-
- /**
- * Returns the MKS Integrity SCM Project object for this SCM Provider
- *
- * @return MKS Integrity SCM Project object
- */
- public Project getProject()
- {
- return siProject;
- }
-
- /**
- * Sets the MKS Integrity SCM Project object for this SCM Provider
- *
- * @param project MKS Integrity SCM Project object
- */
- public void setProject( Project project )
- {
- siProject = project;
- }
-
- /**
- * Returns the MKS Integrity SCM Sandbox object for this SCM Provider
- *
- * @return MKS Integrity SCM Sandbox object
- */
- public Sandbox getSandbox()
- {
- return siSandbox;
- }
-
- /**
- * Sets the MKS Integrity SCM Sandbox object for this SCM Provider
- *
- * @param sandbox MKS Integrity SCM Sandbox object
- */
- public void setSandbox( Sandbox sandbox )
- {
- siSandbox = sandbox;
- }
-
- /**
- * Returns the MKS Integrity API Session object for this SCM Provider
- *
- * @return MKS Integrity API Session
- */
- public APISession getAPISession()
- {
- return api;
- }
-
- /**
- * Returns the MKS Integrity SCM Project Configuration Path
- *
- * @return MKS Integrity SCM Project Configuration Path
- */
- public String getConfigruationPath()
- {
- return configurationPath;
- }
-}
+package org.apache.maven.scm.provider.integrity.repository;
+
+/**
+ * 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.log.ScmLogger;
+import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
+import org.apache.maven.scm.provider.integrity.APISession;
+import org.apache.maven.scm.provider.integrity.Project;
+import org.apache.maven.scm.provider.integrity.Sandbox;
+
+/**
+ * MKS Integrity implementation of Maven's ScmProviderRepositoryWithHost
+ * <br>This class stores an abstraction of the MKS API Session, Project, and Sandbox
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityScmProviderRepository.java 1.2 2011/08/22 13:06:43EDT Cletus D'Souza (dsouza) Exp $
+ * @since 1.6
+ */
+public class IntegrityScmProviderRepository
+ extends ScmProviderRepositoryWithHost
+{
+ // Configuration Path for the MKS Integrity SCM Project
+ private String configurationPath;
+
+ // MKS API Session
+ private APISession api;
+
+ // Encapsulation for our MKS Integrity SCM Project
+ private Project siProject;
+
+ // Encapsulation for our MKS Integrity SCM Sandbox
+ private Sandbox siSandbox;
+
+ /**
+ * IntegrityScmProviderRepository constructor
+ *
+ * @param host MKS Integrity Server hostname or ip address
+ * @param port MKS Integrity Server port number
+ * @param user MKS Integrity Server username
+ * @param paswd Password for MKS Integrity Server username
+ * @param configPath MKS Integrity SCM Project Configuration Path
+ * @param logger Maven ScmLogger object
+ */
+ public IntegrityScmProviderRepository( String host, int port, String user, String paswd, String configPath,
+ ScmLogger logger )
+ {
+ super();
+ setHost( host );
+ setPort( port );
+ setUser( user );
+ setPassword( paswd );
+ configurationPath = configPath;
+ api = new APISession( logger );
+ logger.debug( "Configuration Path: " + configurationPath );
+ }
+
+ /**
+ * Returns the MKS Integrity SCM Project object for this SCM Provider
+ *
+ * @return MKS Integrity SCM Project object
+ */
+ public Project getProject()
+ {
+ return siProject;
+ }
+
+ /**
+ * Sets the MKS Integrity SCM Project object for this SCM Provider
+ *
+ * @param project MKS Integrity SCM Project object
+ */
+ public void setProject( Project project )
+ {
+ siProject = project;
+ }
+
+ /**
+ * Returns the MKS Integrity SCM Sandbox object for this SCM Provider
+ *
+ * @return MKS Integrity SCM Sandbox object
+ */
+ public Sandbox getSandbox()
+ {
+ return siSandbox;
+ }
+
+ /**
+ * Sets the MKS Integrity SCM Sandbox object for this SCM Provider
+ *
+ * @param sandbox MKS Integrity SCM Sandbox object
+ */
+ public void setSandbox( Sandbox sandbox )
+ {
+ siSandbox = sandbox;
+ }
+
+ /**
+ * Returns the MKS Integrity API Session object for this SCM Provider
+ *
+ * @return MKS Integrity API Session
+ */
+ public APISession getAPISession()
+ {
+ return api;
+ }
+
+ /**
+ * Returns the MKS Integrity SCM Project Configuration Path
+ *
+ * @return MKS Integrity SCM Project Configuration Path
+ */
+ public String getConfigruationPath()
+ {
+ return configurationPath;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/IntegrityCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/IntegrityCommandTest.java b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/IntegrityCommandTest.java
index f26a3e2..526842c 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/IntegrityCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/IntegrityCommandTest.java
@@ -1,97 +1,97 @@
-package org.apache.maven.scm.provider.integrity.command;
-
-/**
- * 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.CommandParameter;
-import org.apache.maven.scm.CommandParameters;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmTestCase;
-import org.apache.maven.scm.log.ScmLogger;
-import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.manager.plexus.PlexusLogger;
-import org.apache.maven.scm.provider.integrity.command.checkout.IntegrityCheckOutCommand;
-import org.apache.maven.scm.provider.integrity.command.login.IntegrityLoginCommand;
-import org.apache.maven.scm.provider.integrity.repository.IntegrityScmProviderRepository;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.logging.LoggerManager;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * Parent class IntegrityCommandTest for all Integrity Test Command executions
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityCommandTest.java 1.1 2011/08/29 00:29:46EDT Cletus D'Souza (dsouza) Exp $
- */
-public abstract class IntegrityCommandTest
- extends ScmTestCase
-{
- // A simple date format to generate unique names for the test run
- public static final SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddHHmmssSSS" );
-
- public static final String fileName = "NewFile_" + sdf.format( new Date() ) + ".txt";
-
- // A locally pre-configured repository for use with executing Integrity SCM Commands
- protected String testScmURL = "scm:integrity|dsouza/password@xpvm:7001|#/Code_Gen";
-
- protected ScmManager scmManager;
-
- protected ScmLogger logger;
-
- protected IntegrityScmProviderRepository iRepo;
-
- protected ScmFileSet fileSet;
-
- protected CommandParameters parameters;
-
- /**
- * Sets up all commands for unit test execution
- */
- protected void setUp()
- throws Exception
- {
- super.setUp();
- // Set the Change Package ID to :bypass as we wont have a valid Change Pacakge ID for automated tests
- System.setProperty( "maven.scm.integrity.cpid", ":bypass" );
- // Initialize our scmManager
- scmManager = getScmManager();
- // Initialize our logger
- LoggerManager loggerManager = (LoggerManager) getContainer().lookup( LoggerManager.ROLE );
- logger = new PlexusLogger( loggerManager.getLoggerForComponent( ScmManager.ROLE ) );
- // Construct the SCM Repository and initialize our command execution variables
- ScmRepository repo = scmManager.makeScmRepository( testScmURL );
- iRepo = (IntegrityScmProviderRepository) repo.getProviderRepository();
- fileSet = new ScmFileSet( getTestFile( "target/test-execution" ) );
- parameters = new CommandParameters();
- // Set the tag name for our tag and branch commands
- parameters.setString( CommandParameter.TAG_NAME,
- "Maven-${new java.text.SimpleDateFormat(\"yyyyMMddHHmmssSSS\").format(new Date())}" );
- // Connect to the MKS Integrity Server
- IntegrityLoginCommand login = new IntegrityLoginCommand();
- login.setLogger( logger );
- assertResultIsSuccess( login.execute( iRepo, fileSet, parameters ) );
- // Then make sure we've got a sandbox to work with
- IntegrityCheckOutCommand checkout = new IntegrityCheckOutCommand();
- checkout.setLogger( logger );
- assertResultIsSuccess( checkout.execute( iRepo, fileSet, parameters ) );
- }
-}
-
+package org.apache.maven.scm.provider.integrity.command;
+
+/**
+ * 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.CommandParameter;
+import org.apache.maven.scm.CommandParameters;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmTestCase;
+import org.apache.maven.scm.log.ScmLogger;
+import org.apache.maven.scm.manager.ScmManager;
+import org.apache.maven.scm.manager.plexus.PlexusLogger;
+import org.apache.maven.scm.provider.integrity.command.checkout.IntegrityCheckOutCommand;
+import org.apache.maven.scm.provider.integrity.command.login.IntegrityLoginCommand;
+import org.apache.maven.scm.provider.integrity.repository.IntegrityScmProviderRepository;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.codehaus.plexus.logging.LoggerManager;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Parent class IntegrityCommandTest for all Integrity Test Command executions
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityCommandTest.java 1.1 2011/08/29 00:29:46EDT Cletus D'Souza (dsouza) Exp $
+ */
+public abstract class IntegrityCommandTest
+ extends ScmTestCase
+{
+ // A simple date format to generate unique names for the test run
+ public static final SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddHHmmssSSS" );
+
+ public static final String fileName = "NewFile_" + sdf.format( new Date() ) + ".txt";
+
+ // A locally pre-configured repository for use with executing Integrity SCM Commands
+ protected String testScmURL = "scm:integrity|dsouza/password@xpvm:7001|#/Code_Gen";
+
+ protected ScmManager scmManager;
+
+ protected ScmLogger logger;
+
+ protected IntegrityScmProviderRepository iRepo;
+
+ protected ScmFileSet fileSet;
+
+ protected CommandParameters parameters;
+
+ /**
+ * Sets up all commands for unit test execution
+ */
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ // Set the Change Package ID to :bypass as we wont have a valid Change Pacakge ID for automated tests
+ System.setProperty( "maven.scm.integrity.cpid", ":bypass" );
+ // Initialize our scmManager
+ scmManager = getScmManager();
+ // Initialize our logger
+ LoggerManager loggerManager = (LoggerManager) getContainer().lookup( LoggerManager.ROLE );
+ logger = new PlexusLogger( loggerManager.getLoggerForComponent( ScmManager.ROLE ) );
+ // Construct the SCM Repository and initialize our command execution variables
+ ScmRepository repo = scmManager.makeScmRepository( testScmURL );
+ iRepo = (IntegrityScmProviderRepository) repo.getProviderRepository();
+ fileSet = new ScmFileSet( getTestFile( "target/test-execution" ) );
+ parameters = new CommandParameters();
+ // Set the tag name for our tag and branch commands
+ parameters.setString( CommandParameter.TAG_NAME,
+ "Maven-${new java.text.SimpleDateFormat(\"yyyyMMddHHmmssSSS\").format(new Date())}" );
+ // Connect to the MKS Integrity Server
+ IntegrityLoginCommand login = new IntegrityLoginCommand();
+ login.setLogger( logger );
+ assertResultIsSuccess( login.execute( iRepo, fileSet, parameters ) );
+ // Then make sure we've got a sandbox to work with
+ IntegrityCheckOutCommand checkout = new IntegrityCheckOutCommand();
+ checkout.setLogger( logger );
+ assertResultIsSuccess( checkout.execute( iRepo, fileSet, parameters ) );
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/add/IntegrityAddCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/add/IntegrityAddCommandTest.java b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/add/IntegrityAddCommandTest.java
index 60e6ca4..a64b993 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/add/IntegrityAddCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/add/IntegrityAddCommandTest.java
@@ -1,62 +1,62 @@
-package org.apache.maven.scm.provider.integrity.command.add;
-
-/**
- * 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.CommandParameter;
-import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
-
-/**
- * IntegrityAddCommandTest unit test class
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityAddCommandTest.java 1.1 2011/08/29 00:29:48EDT Cletus D'Souza (dsouza) Exp $
- */
-public class IntegrityAddCommandTest
- extends IntegrityCommandTest
-{
- /**
- * Sets up this unit test for execution
- */
- public void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- /**
- * Executes the IntegrityAddCommand and validates the result
- *
- * @throws Exception
- */
- public void testAddCommandTest()
- throws Exception
- {
- // Create a test file in the sandbox dir
- makeFile( fileSet.getBasedir(), fileName, "A new file add test" );
- // Set a couple parameters required for the add command to work
- parameters.setString( CommandParameter.MESSAGE, "A new file test" );
- parameters.setString( CommandParameter.BINARY, "false" );
- // Finally, execute the add command
- IntegrityAddCommand command = new IntegrityAddCommand();
- command.setLogger( logger );
- assertResultIsSuccess( command.execute( iRepo, fileSet, parameters ) );
- }
-}
-
+package org.apache.maven.scm.provider.integrity.command.add;
+
+/**
+ * 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.CommandParameter;
+import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
+
+/**
+ * IntegrityAddCommandTest unit test class
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityAddCommandTest.java 1.1 2011/08/29 00:29:48EDT Cletus D'Souza (dsouza) Exp $
+ */
+public class IntegrityAddCommandTest
+ extends IntegrityCommandTest
+{
+ /**
+ * Sets up this unit test for execution
+ */
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * Executes the IntegrityAddCommand and validates the result
+ *
+ * @throws Exception
+ */
+ public void testAddCommandTest()
+ throws Exception
+ {
+ // Create a test file in the sandbox dir
+ makeFile( fileSet.getBasedir(), fileName, "A new file add test" );
+ // Set a couple parameters required for the add command to work
+ parameters.setString( CommandParameter.MESSAGE, "A new file test" );
+ parameters.setString( CommandParameter.BINARY, "false" );
+ // Finally, execute the add command
+ IntegrityAddCommand command = new IntegrityAddCommand();
+ command.setLogger( logger );
+ assertResultIsSuccess( command.execute( iRepo, fileSet, parameters ) );
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/branch/IntegrityBranchCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/branch/IntegrityBranchCommandTest.java b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/branch/IntegrityBranchCommandTest.java
index d631a16..0a7ca22 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/branch/IntegrityBranchCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/branch/IntegrityBranchCommandTest.java
@@ -1,61 +1,61 @@
-package org.apache.maven.scm.provider.integrity.command.branch;
-
-/**
- * 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.CommandParameter;
-import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
-
-import java.util.Date;
-
-/**
- * IntegrityBranchCommandTest unit test class
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityBranchCommandTest.java 1.1 2011/08/29 00:29:50EDT Cletus D'Souza (dsouza) Exp $
- */
-public class IntegrityBranchCommandTest
- extends IntegrityCommandTest
-{
- /**
- * Sets up this unit test for execution
- */
- public void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- /**
- * Executes the IntegrityBranchCommand and validates the result
- *
- * @throws Exception
- */
- public void testBranchCommandTest()
- throws Exception
- {
- // Set the branch name parameter which will be needed for the Development Path name
- parameters.setString( CommandParameter.BRANCH_NAME, "Test_ " + sdf.format( new Date() ) );
- // Now we can then execute the branch command
- IntegrityBranchCommand command = new IntegrityBranchCommand();
- command.setLogger( logger );
- assertResultIsSuccess( command.execute( iRepo, fileSet, parameters ) );
- }
-}
-
+package org.apache.maven.scm.provider.integrity.command.branch;
+
+/**
+ * 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.CommandParameter;
+import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
+
+import java.util.Date;
+
+/**
+ * IntegrityBranchCommandTest unit test class
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityBranchCommandTest.java 1.1 2011/08/29 00:29:50EDT Cletus D'Souza (dsouza) Exp $
+ */
+public class IntegrityBranchCommandTest
+ extends IntegrityCommandTest
+{
+ /**
+ * Sets up this unit test for execution
+ */
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * Executes the IntegrityBranchCommand and validates the result
+ *
+ * @throws Exception
+ */
+ public void testBranchCommandTest()
+ throws Exception
+ {
+ // Set the branch name parameter which will be needed for the Development Path name
+ parameters.setString( CommandParameter.BRANCH_NAME, "Test_ " + sdf.format( new Date() ) );
+ // Now we can then execute the branch command
+ IntegrityBranchCommand command = new IntegrityBranchCommand();
+ command.setLogger( logger );
+ assertResultIsSuccess( command.execute( iRepo, fileSet, parameters ) );
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/changelog/IntegrityChangeLogCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/changelog/IntegrityChangeLogCommandTest.java b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/changelog/IntegrityChangeLogCommandTest.java
index 6b8d446..9b4327a 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/changelog/IntegrityChangeLogCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/changelog/IntegrityChangeLogCommandTest.java
@@ -1,65 +1,65 @@
-package org.apache.maven.scm.provider.integrity.command.changelog;
-
-/**
- * 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.CommandParameter;
-import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
-
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * IntegrityChangeLogCommandTest unit test class
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityChangeLogCommandTest.java 1.1 2011/08/29 00:29:52EDT Cletus D'Souza (dsouza) Exp $
- */
-public class IntegrityChangeLogCommandTest
- extends IntegrityCommandTest
-{
- /**
- * Sets up this unit test for execution
- */
- public void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- /**
- * Executes the IntegrityChangeLogCommand and validates the result
- *
- * @throws Exception
- */
- public void testChangeLogCommandTest()
- throws Exception
- {
- // Set the start and end date parameters
- Calendar startDate = Calendar.getInstance();
- startDate.add( Calendar.DATE, -1 );
- parameters.setDate( CommandParameter.START_DATE, startDate.getTime() );
- parameters.setDate( CommandParameter.END_DATE, new Date() );
- // Now we can then execute the change log command
- IntegrityChangeLogCommand command = new IntegrityChangeLogCommand();
- command.setLogger( logger );
- assertResultIsSuccess( command.execute( iRepo, fileSet, parameters ) );
- }
-}
-
+package org.apache.maven.scm.provider.integrity.command.changelog;
+
+/**
+ * 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.CommandParameter;
+import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * IntegrityChangeLogCommandTest unit test class
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityChangeLogCommandTest.java 1.1 2011/08/29 00:29:52EDT Cletus D'Souza (dsouza) Exp $
+ */
+public class IntegrityChangeLogCommandTest
+ extends IntegrityCommandTest
+{
+ /**
+ * Sets up this unit test for execution
+ */
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * Executes the IntegrityChangeLogCommand and validates the result
+ *
+ * @throws Exception
+ */
+ public void testChangeLogCommandTest()
+ throws Exception
+ {
+ // Set the start and end date parameters
+ Calendar startDate = Calendar.getInstance();
+ startDate.add( Calendar.DATE, -1 );
+ parameters.setDate( CommandParameter.START_DATE, startDate.getTime() );
+ parameters.setDate( CommandParameter.END_DATE, new Date() );
+ // Now we can then execute the change log command
+ IntegrityChangeLogCommand command = new IntegrityChangeLogCommand();
+ command.setLogger( logger );
+ assertResultIsSuccess( command.execute( iRepo, fileSet, parameters ) );
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkin/IntegrityCheckInCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkin/IntegrityCheckInCommandTest.java b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkin/IntegrityCheckInCommandTest.java
index 5e2f373..0281833 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkin/IntegrityCheckInCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkin/IntegrityCheckInCommandTest.java
@@ -1,75 +1,75 @@
-package org.apache.maven.scm.provider.integrity.command.checkin;
-
-/**
- * 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.CommandParameter;
-import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
-import org.apache.maven.scm.provider.integrity.command.edit.IntegrityEditCommand;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-
-/**
- * IntegrityCheckInCommandTest unit test class
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityCheckInCommandTest.java 1.1 2011/08/29 00:29:54EDT Cletus D'Souza (dsouza) Exp $
- */
-public class IntegrityCheckInCommandTest
- extends IntegrityCommandTest
-{
- /**
- * Sets up this unit test for execution
- */
- public void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- /**
- * Executes the IntegrityCheckInCommand and validates the result
- *
- * @throws Exception
- */
- public void testCheckInCommandTest()
- throws Exception
- {
- // First we need to make the workspace writable
- IntegrityEditCommand edit = new IntegrityEditCommand();
- edit.setLogger( logger );
- assertResultIsSuccess( edit.execute( iRepo, fileSet, parameters ) );
- // Now lets add something to the file we added in the add test
- String nl = System.getProperty( "line.separator" );
- BufferedWriter bw =
- new BufferedWriter( new FileWriter( fileSet.getBasedir() + File.separator + fileName, true ) );
- bw.write( nl + nl + "A new change appended to file by the check-in command test" + nl );
- bw.flush();
- bw.close();
- // Set the message parameter required for the check-in command to work
- parameters.setString( CommandParameter.MESSAGE, "Attempting change to an existing file " + fileName );
- // Now execute the check-in command and validate the results
- IntegrityCheckInCommand checkin = new IntegrityCheckInCommand();
- checkin.setLogger( logger );
- assertResultIsSuccess( checkin.execute( iRepo, fileSet, parameters ) );
- }
-}
-
+package org.apache.maven.scm.provider.integrity.command.checkin;
+
+/**
+ * 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.CommandParameter;
+import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
+import org.apache.maven.scm.provider.integrity.command.edit.IntegrityEditCommand;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+
+/**
+ * IntegrityCheckInCommandTest unit test class
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityCheckInCommandTest.java 1.1 2011/08/29 00:29:54EDT Cletus D'Souza (dsouza) Exp $
+ */
+public class IntegrityCheckInCommandTest
+ extends IntegrityCommandTest
+{
+ /**
+ * Sets up this unit test for execution
+ */
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * Executes the IntegrityCheckInCommand and validates the result
+ *
+ * @throws Exception
+ */
+ public void testCheckInCommandTest()
+ throws Exception
+ {
+ // First we need to make the workspace writable
+ IntegrityEditCommand edit = new IntegrityEditCommand();
+ edit.setLogger( logger );
+ assertResultIsSuccess( edit.execute( iRepo, fileSet, parameters ) );
+ // Now lets add something to the file we added in the add test
+ String nl = System.getProperty( "line.separator" );
+ BufferedWriter bw =
+ new BufferedWriter( new FileWriter( fileSet.getBasedir() + File.separator + fileName, true ) );
+ bw.write( nl + nl + "A new change appended to file by the check-in command test" + nl );
+ bw.flush();
+ bw.close();
+ // Set the message parameter required for the check-in command to work
+ parameters.setString( CommandParameter.MESSAGE, "Attempting change to an existing file " + fileName );
+ // Now execute the check-in command and validate the results
+ IntegrityCheckInCommand checkin = new IntegrityCheckInCommand();
+ checkin.setLogger( logger );
+ assertResultIsSuccess( checkin.execute( iRepo, fileSet, parameters ) );
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkout/IntegrityCheckOutCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkout/IntegrityCheckOutCommandTest.java b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkout/IntegrityCheckOutCommandTest.java
index fbfe021..6fee01b 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkout/IntegrityCheckOutCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/checkout/IntegrityCheckOutCommandTest.java
@@ -1,55 +1,55 @@
-package org.apache.maven.scm.provider.integrity.command.checkout;
-
-/**
- * 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.provider.integrity.command.IntegrityCommandTest;
-
-/**
- * IntegrityCheckOutCommandTest unit test class
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityCheckOutCommandTest.java 1.1 2011/08/29 00:29:55EDT Cletus D'Souza (dsouza) Exp $
- */
-public class IntegrityCheckOutCommandTest
- extends IntegrityCommandTest
-{
- /**
- * Sets up this unit test for execution
- */
- public void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- /**
- * Executes the IntegrityCheckOutCommand and validates the result
- *
- * @throws Exception
- */
- public void testCheckOutCommandTest()
- throws Exception
- {
- IntegrityCheckOutCommand command = new IntegrityCheckOutCommand();
- command.setLogger( logger );
- assertResultIsSuccess( command.execute( iRepo, fileSet, parameters ) );
- }
-}
-
+package org.apache.maven.scm.provider.integrity.command.checkout;
+
+/**
+ * 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.provider.integrity.command.IntegrityCommandTest;
+
+/**
+ * IntegrityCheckOutCommandTest unit test class
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityCheckOutCommandTest.java 1.1 2011/08/29 00:29:55EDT Cletus D'Souza (dsouza) Exp $
+ */
+public class IntegrityCheckOutCommandTest
+ extends IntegrityCommandTest
+{
+ /**
+ * Sets up this unit test for execution
+ */
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * Executes the IntegrityCheckOutCommand and validates the result
+ *
+ * @throws Exception
+ */
+ public void testCheckOutCommandTest()
+ throws Exception
+ {
+ IntegrityCheckOutCommand command = new IntegrityCheckOutCommand();
+ command.setLogger( logger );
+ assertResultIsSuccess( command.execute( iRepo, fileSet, parameters ) );
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/export/IntegrityExportCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/export/IntegrityExportCommandTest.java b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/export/IntegrityExportCommandTest.java
index d99e19b..d31f8ac 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/export/IntegrityExportCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/export/IntegrityExportCommandTest.java
@@ -1,58 +1,58 @@
-package org.apache.maven.scm.provider.integrity.command.export;
-
-/**
- * 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.ScmFileSet;
-import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
-
-/**
- * IntegrityExportCommandTest unit test class
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityExportCommandTest.java 1.1 2011/08/29 00:29:58EDT Cletus D'Souza (dsouza) Exp $
- */
-public class IntegrityExportCommandTest
- extends IntegrityCommandTest
-{
- /**
- * Sets up this unit test for execution
- */
- public void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- /**
- * Executes the IntegrityExportCommand and validates the result
- *
- * @throws Exception
- */
- public void testExportCommandTest()
- throws Exception
- {
- // Then we can then execute the export command
- IntegrityExportCommand command = new IntegrityExportCommand();
- command.setLogger( logger );
- assertResultIsSuccess(
- command.execute( iRepo, new ScmFileSet( getTestFile( "target/test-execution/export" ) ), parameters ) );
- }
-}
-
+package org.apache.maven.scm.provider.integrity.command.export;
+
+/**
+ * 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.ScmFileSet;
+import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
+
+/**
+ * IntegrityExportCommandTest unit test class
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityExportCommandTest.java 1.1 2011/08/29 00:29:58EDT Cletus D'Souza (dsouza) Exp $
+ */
+public class IntegrityExportCommandTest
+ extends IntegrityCommandTest
+{
+ /**
+ * Sets up this unit test for execution
+ */
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * Executes the IntegrityExportCommand and validates the result
+ *
+ * @throws Exception
+ */
+ public void testExportCommandTest()
+ throws Exception
+ {
+ // Then we can then execute the export command
+ IntegrityExportCommand command = new IntegrityExportCommand();
+ command.setLogger( logger );
+ assertResultIsSuccess(
+ command.execute( iRepo, new ScmFileSet( getTestFile( "target/test-execution/export" ) ), parameters ) );
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ad9801d/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/list/IntegrityListCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/list/IntegrityListCommandTest.java b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/list/IntegrityListCommandTest.java
index 068f26a..962f7f9 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/list/IntegrityListCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/test/java/org/apache/maven/scm/provider/integrity/command/list/IntegrityListCommandTest.java
@@ -1,63 +1,63 @@
-package org.apache.maven.scm.provider.integrity.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.CommandParameter;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
-
-import java.io.File;
-
-/**
- * IntegrityListCommandTest unit test class
- *
- * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
- * @version $Id: IntegrityListCommandTest.java 1.1 2011/08/29 00:29:59EDT Cletus D'Souza (dsouza) Exp $
- */
-public class IntegrityListCommandTest
- extends IntegrityCommandTest
-{
- /**
- * Sets up this unit test for execution
- */
- public void setUp()
- throws Exception
- {
- super.setUp();
- }
-
- /**
- * Executes the IntegrityListCommand and validates the result
- *
- * @throws Exception
- */
- public void testListCommandTest()
- throws Exception
- {
- // Add the recursive parameter to the command's parameters
- parameters.setString( CommandParameter.RECURSIVE, "true" );
- // Now, we can execute the list command
- IntegrityListCommand command = new IntegrityListCommand();
- command.setLogger( logger );
- assertResultIsSuccess( command.execute( iRepo, new ScmFileSet( fileSet.getBasedir(), new File(
- "target/test-execution/" + fileName ) ), parameters ) );
- }
-}
-
+package org.apache.maven.scm.provider.integrity.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.CommandParameter;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.provider.integrity.command.IntegrityCommandTest;
+
+import java.io.File;
+
+/**
+ * IntegrityListCommandTest unit test class
+ *
+ * @author <a href="mailto:cletus@mks.com">Cletus D'Souza</a>
+ * @version $Id: IntegrityListCommandTest.java 1.1 2011/08/29 00:29:59EDT Cletus D'Souza (dsouza) Exp $
+ */
+public class IntegrityListCommandTest
+ extends IntegrityCommandTest
+{
+ /**
+ * Sets up this unit test for execution
+ */
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+ }
+
+ /**
+ * Executes the IntegrityListCommand and validates the result
+ *
+ * @throws Exception
+ */
+ public void testListCommandTest()
+ throws Exception
+ {
+ // Add the recursive parameter to the command's parameters
+ parameters.setString( CommandParameter.RECURSIVE, "true" );
+ // Now, we can execute the list command
+ IntegrityListCommand command = new IntegrityListCommand();
+ command.setLogger( logger );
+ assertResultIsSuccess( command.execute( iRepo, new ScmFileSet( fileSet.getBasedir(), new File(
+ "target/test-execution/" + fileName ) ), parameters ) );
+ }
+}
+