You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/01/02 04:33:10 UTC
svn commit: r123879 - in maven/maven-1/plugins/branches/scm-1.5-branch: . src/main/org/apache/maven/plugins/scm
Author: brett
Date: Sat Jan 1 19:33:09 2005
New Revision: 123879
URL: http://svn.apache.org/viewcvs?view=rev&rev=123879
Log:
`cat ../svn-commit.tmp`
Modified:
maven/maven-1/plugins/branches/scm-1.5-branch/ (props changed)
maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java
maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java?view=diff&rev=123879&p1=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java&r1=123878&p2=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java&r2=123879
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java Sat Jan 1 19:33:09 2005
@@ -63,9 +63,7 @@
public void checkout()
throws Exception
{
- // TODO: can this be shared more?
- Embedder embedder = getEmbedder();
- ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
+ ScmManager scmManager = lookupScmManager();
ScmRepository repository = scmManager.makeScmRepository( url );
String module = repository.getProviderRepository().getModule();
@@ -88,6 +86,14 @@
checkResult( result );
}
+ protected ScmManager lookupScmManager()
+ throws Exception
+ {
+ Embedder embedder = getEmbedder();
+ ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
+ return scmManager;
+ }
+
protected void checkResult( ScmResult result )
throws Exception
{
@@ -105,9 +111,7 @@
public void update()
throws Exception
{
- // TODO: can this be shared more?
- Embedder embedder = getEmbedder();
- ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
+ ScmManager scmManager = lookupScmManager();
ScmRepository repository = scmManager.makeScmRepository( url );
@@ -121,9 +125,7 @@
public void tag()
throws Exception
{
- // TODO: can this be shared more?
- Embedder embedder = getEmbedder();
- ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
+ ScmManager scmManager = lookupScmManager();
ScmRepository repository = scmManager.makeScmRepository( url );
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java?view=diff&rev=123879&p1=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java&r1=123878&p2=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java&r2=123879
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java Sat Jan 1 19:33:09 2005
@@ -37,19 +37,13 @@
public void checkin()
throws Exception
{
- // TODO: can this be shared more?
- Embedder embedder = getEmbedder();
- ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
+ ScmManager scmManager = lookupScmManager();
ScmRepository repository = scmManager.makeScmRepository( getUrl() );
- CheckInScmResult result = scmManager.checkIn( repository,
- new ScmFileSet( new File( getWorkingDirectory() ), getIncludes(),
- getExcludes() ),
+ CheckInScmResult result = scmManager.checkIn( repository, new ScmFileSet( new File( getWorkingDirectory() ),
+ getIncludes(), getExcludes() ),
getTag(), message );
- // TODO: should be this:
- //CheckInScmResult result = scmManager.checkIn( repository, new File( getWorkingDirectory() ), getTag(), message, getIncludes(), getExcludes() );
-
checkResult( result );
}
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java?view=diff&rev=123879&p1=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java&r1=123878&p2=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java&r2=123879
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java Sat Jan 1 19:33:09 2005
@@ -33,9 +33,7 @@
public void status()
throws Exception
{
- // TODO: can this be shared more?
- Embedder embedder = getEmbedder();
- ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
+ ScmManager scmManager = lookupScmManager();
ScmRepository repository = scmManager.makeScmRepository( getUrl() );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org