Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 16148 invoked from network); 19 May 2010 09:22:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 May 2010 09:22:32 -0000 Received: (qmail 25785 invoked by uid 500); 19 May 2010 09:22:32 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 25735 invoked by uid 500); 19 May 2010 09:22:30 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 25728 invoked by uid 99); 19 May 2010 09:22:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 May 2010 09:22:30 +0000 X-ASF-Spam-Status: No, hits=-1667.1 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 May 2010 09:22:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B4DC3238899C; Wed, 19 May 2010 09:22:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r946094 - in /continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/localization/ webapp/WEB-INF/jsp/ Date: Wed, 19 May 2010 09:22:07 -0000 To: commits@continuum.apache.org From: oching@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100519092207.B4DC3238899C@eris.apache.org> Author: oching Date: Wed May 19 09:22:06 2010 New Revision: 946094 URL: http://svn.apache.org/viewvc?rev=946094&view=rev Log: replace checkboxes for checkout options when adding m2 projects with radio boxes Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/resources/localization/Continuum.properties continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=946094&r1=946093&r2=946094&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original) +++ continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Wed May 19 09:22:06 2010 @@ -51,10 +51,8 @@ public class AddMavenTwoProjectAction public static final String ERROR_READING_POM_EXCEPTION_MESSAGE = "Error reading POM"; public static final String FILE_SCHEME = "file:/"; - - private boolean nonRecursiveProject; - private boolean checkoutInSingleDirectory; + private String checkoutOption; protected ContinuumProjectBuildingResult doExecute( String pomUrl, int selectedProjectGroup, boolean checkProtocol, boolean scmUseCache ) @@ -105,19 +103,32 @@ public class AddMavenTwoProjectAction throw new ContinuumException( ERROR_READING_POM_EXCEPTION_MESSAGE, e ); } } - - // force set checkoutInCingleDirectory to false if adding the project as non-recursive - if( this.isNonRecursiveProject() ) + + boolean nonRecursiveProject; + boolean checkoutInSingleDirectory; + + if( "checkoutInSingleDirectory".equals( checkoutOption ) ) { - this.setCheckoutInSingleDirectory( false ); + checkoutInSingleDirectory = true; + nonRecursiveProject = false; } - + else if( "nonRecursiveProject".equals( checkoutOption ) ) + { + checkoutInSingleDirectory = false; + nonRecursiveProject = true; + } + else + { + checkoutInSingleDirectory = false; + nonRecursiveProject = false; + } + if ( result == null ) { result = getContinuum().addMavenTwoProject( pomUrl, selectedProjectGroup, checkProtocol, scmUseCache, - !this.isNonRecursiveProject(), + !nonRecursiveProject, this.getBuildDefinitionTemplateId(), - this.isCheckoutInSingleDirectory() ); + checkoutInSingleDirectory ); } AuditLog event = new AuditLog( hidePasswordInUrl( pomUrl ), AuditLogConstants.ADD_M2_PROJECT ); @@ -132,7 +143,7 @@ public class AddMavenTwoProjectAction event.log(); return result; } - + /** * @deprecated Use {@link #getPomFile()} instead */ @@ -164,24 +175,14 @@ public class AddMavenTwoProjectAction { setPomUrl( pomUrl ); } - - public boolean isNonRecursiveProject() - { - return nonRecursiveProject; - } - - public void setNonRecursiveProject( boolean nonRecursiveProject ) - { - this.nonRecursiveProject = nonRecursiveProject; - } - public boolean isCheckoutInSingleDirectory() + public String getCheckoutOption() { - return checkoutInSingleDirectory; + return checkoutOption; } - public void setCheckoutInSingleDirectory( boolean checkoutInSingleDirectory ) + public void setCheckoutOption( String checkoutOption ) { - this.checkoutInSingleDirectory = checkoutInSingleDirectory; + this.checkoutOption = checkoutOption; } } Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/resources/localization/Continuum.properties URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=946094&r1=946093&r2=946094&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/resources/localization/Continuum.properties (original) +++ continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/resources/localization/Continuum.properties Wed May 19 09:22:06 2010 @@ -340,6 +340,7 @@ add.m2.project.nonRecursiveProject = For add.m2.project.buildDefinitionTemplate = Build Definition Template add.m2.project.defaultBuildDefinition = Default add.m2.project.checkoutInSingleDirectory = Checkout multi-module project in single directory +add.m2.project.checkoutInSeparateDirectories = Checkout multi-module project in separate directories # ---------------------------------------------------------------------- # Page: AddProject (ant or shell) Modified: continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?rev=946094&r1=946093&r2=946094&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp (original) +++ continuum/branches/continuum-flat-multi-module-updated/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Wed May 19 09:22:06 2010 @@ -81,8 +81,28 @@ list="projectGroups" listKey="id" listValue="name"/> - - + + + + + + + + + + + + + + + + + + +
+ + +