Author: olamy
Date: Tue Sep 4 08:33:03 2012
New Revision: 1380485
URL: http://svn.apache.org/viewvc?rev=1380485&view=rev
Log:
[SCM-693] scmsvn add method to check if remote url exist.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.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
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java?rev=1380485&r1=1380484&r2=1380485&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
Tue Sep 4 08:33:03 2012
@@ -19,10 +19,6 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -51,6 +47,10 @@ import org.apache.maven.scm.repository.S
import org.apache.maven.scm.repository.UnknownRepositoryStructure;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* SCM Provider for Subversion
*
@@ -75,13 +75,17 @@ public abstract class AbstractSvnScmProv
// ScmProvider Implementation
// ----------------------------------------------------------------------
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getScmSpecificFilename()
{
return ".svn";
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public ScmProviderRepository makeProviderScmRepository( String
scmSpecificUrl, char delimiter )
throws ScmRepositoryException
{
@@ -95,7 +99,9 @@ public abstract class AbstractSvnScmProv
return result.repository;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
@@ -128,7 +134,9 @@ public abstract class AbstractSvnScmProv
protected abstract String getRepositoryURL( File path )
throws ScmException;
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public List<String> validateScmUrl( String scmSpecificUrl, char delimiter )
{
List<String> messages = new ArrayList<String>();
@@ -143,7 +151,9 @@ public abstract class AbstractSvnScmProv
return messages;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getScmType()
{
return "svn";
@@ -245,7 +255,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getAddCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public AddScmResult add( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
throws ScmException
{
@@ -254,7 +266,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getBranchCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected BranchScmResult branch( ScmProviderRepository repository,
ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -264,7 +278,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getChangeLogCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public ChangeLogScmResult changelog( ScmProviderRepository repository,
ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -274,7 +290,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getCheckInCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public CheckInScmResult checkin( ScmProviderRepository repository,
ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -284,7 +302,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getCheckOutCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public CheckOutScmResult checkout( ScmProviderRepository repository,
ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -294,7 +314,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getDiffCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public DiffScmResult diff( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
throws ScmException
{
@@ -303,7 +325,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getExportCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected ExportScmResult export( ScmProviderRepository repository,
ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -313,7 +337,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getRemoveCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public RemoveScmResult remove( ScmProviderRepository repository,
ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -322,7 +348,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getStatusCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public StatusScmResult status( ScmProviderRepository repository,
ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -331,7 +359,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getTagCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public TagScmResult tag( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
throws ScmException
{
@@ -340,7 +370,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getUpdateCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public UpdateScmResult update( ScmProviderRepository repository,
ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -358,7 +390,9 @@ public abstract class AbstractSvnScmProv
protected abstract SvnCommand getListCommand();
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public ListScmResult list( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
throws ScmException
{
@@ -377,7 +411,9 @@ public abstract class AbstractSvnScmProv
return (InfoScmResult) executeCommand( cmd, repository, fileSet,
parameters );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected BlameScmResult blame( ScmProviderRepository repository,
ScmFileSet fileSet, CommandParameters parameters )
throws ScmException
{
@@ -385,10 +421,12 @@ public abstract class AbstractSvnScmProv
return (BlameScmResult) executeCommand( cmd, repository, fileSet,
parameters );
}
-
+
protected abstract SvnCommand getBlameCommand();
-
- /** {@inheritDoc} */
+
+ /**
+ * {@inheritDoc}
+ */
public MkdirScmResult mkdir( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
throws ScmException
{
@@ -396,6 +434,9 @@ public abstract class AbstractSvnScmProv
return (MkdirScmResult) executeCommand( cmd, repository, fileSet,
parameters );
}
-
- protected abstract SvnCommand getMkdirCommand();
+
+ protected abstract SvnCommand getMkdirCommand();
+
+ public abstract boolean remoteUrlExist( ScmProviderRepository repository,
CommandParameters parameters )
+ throws ScmException;
}
Modified:
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
URL:
http://svn.apache.org/viewvc/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?rev=1380485&r1=1380484&r2=1380485&view=diff
==============================================================================
---
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
(original)
+++
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
Tue Sep 4 08:33:03 2012
@@ -200,4 +200,12 @@ public class SvnExeScmProvider
SvnRemoteInfoCommand svnRemoteInfoCommand = new SvnRemoteInfoCommand();
return svnRemoteInfoCommand.executeRemoteInfoCommand( repository,
fileSet, parameters );
}
+
+ @Override
+ public boolean remoteUrlExist( ScmProviderRepository repository,
CommandParameters parameters )
+ throws ScmException
+ {
+ SvnRemoteInfoCommand svnRemoteInfoCommand = new SvnRemoteInfoCommand();
+ return svnRemoteInfoCommand.remoteUrlExist( repository, parameters );
+ }
}
