Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 26780 invoked from network); 15 Oct 2005 20:45:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Oct 2005 20:45:08 -0000 Received: (qmail 7698 invoked by uid 500); 15 Oct 2005 20:45:07 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 7673 invoked by uid 500); 15 Oct 2005 20:45:07 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 7662 invoked by uid 99); 15 Oct 2005 20:45:07 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 15 Oct 2005 13:45:07 -0700 Received: (qmail 26731 invoked by uid 65534); 15 Oct 2005 20:44:46 -0000 Message-ID: <20051015204446.26728.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r321486 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/scm/ continuum-model/src/main/mdo/ continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ continuum-web/src/main/resources/forms/ continu... Date: Sat, 15 Oct 2005 20:44:45 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Sat Oct 15 13:44:42 2005 New Revision: 321486 URL: http://svn.apache.org/viewcvs?rev=321486&view=rev Log: [CONTINUUM-345] Ability to configure username/password external to scm url connection Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=321486&r1=321485&r2=321486&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java Sat Oct 15 13:44:42 2005 @@ -27,6 +27,7 @@ import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.apache.maven.scm.command.update.UpdateScmResult; import org.apache.maven.scm.manager.ScmManager; +import org.apache.maven.scm.manager.NoSuchScmProviderException; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.scm.repository.ScmRepositoryException; import org.codehaus.plexus.logging.AbstractLogEnabled; @@ -67,7 +68,7 @@ getLogger().info( "Checking out project: '" + project.getName() + "', " + "id: '" + project.getId() + "' " + "to '" + workingDirectory + "'." ); - ScmRepository repository = scmManager.makeScmRepository( project.getScmUrl() ); + ScmRepository repository = getScmRepositorty( project ); ScmResult result; @@ -164,7 +165,7 @@ workingDirectory.getAbsolutePath() + ")." ); } - ScmRepository repository = scmManager.makeScmRepository( project.getScmUrl() ); + ScmRepository repository = getScmRepositorty( project ); String tag = null; @@ -208,6 +209,28 @@ // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- + + private ScmRepository getScmRepositorty( Project project ) + throws ScmRepositoryException, NoSuchScmProviderException + { + ScmRepository repository = scmManager.makeScmRepository( project.getScmUrl() ); + + if ( project.getScmUsername() != null ) + { + repository.getProviderRepository().setUser( project.getScmUsername() ); + + if ( project.getScmPassword() != null ) + { + repository.getProviderRepository().setPassword( project.getScmPassword() ); + } + else + { + repository.getProviderRepository().setPassword( "" ); + } + } + + return repository; + } private ScmResult convertScmResult( CheckOutScmResult scmResult ) { Modified: maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo?rev=321486&r1=321485&r2=321486&view=diff ============================================================================== --- maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo (original) +++ maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Sat Oct 15 13:44:42 2005 @@ -113,6 +113,16 @@ String + scmUsername + 1.0.0+ + String + + + scmPassword + 1.0.0+ + String + + version 1.0.0+ String Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java?rev=321486&r1=321485&r2=321486&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java (original) +++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java Sat Oct 15 13:44:42 2005 @@ -150,7 +150,10 @@ data = Ognl.getValue( element.getExpression(), item ); - return data.toString(); + if ( data != null ) + { + return data.toString(); + } } catch ( OgnlException e ) { Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml?rev=321486&r1=321485&r2=321486&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml Sat Oct 15 13:44:42 2005 @@ -39,6 +39,20 @@ scmUrl + projectScmUsername + + + text + scmUsername + + + projectScmPassword + + + text + scmPassword + + project.type Modified: maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties?rev=321486&r1=321485&r2=321486&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties Sat Oct 15 13:44:42 2005 @@ -42,6 +42,12 @@ projectScmUrl.error = You must provide an scm url projectScmUrl.message = Enter the Maven SCM URL +projectScmUsername.label = Scm Username +projectScmUsername.message = Enter the scm username + +projectScmPassword.label = Scm Password +projectScmPassword.message = Enter the scm password + project.version.label = Version project.version.error = You must provide a version project.version.message = Enter the version of the project