Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 93544 invoked from network); 23 Dec 2005 08:17:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Dec 2005 08:17:52 -0000 Received: (qmail 79909 invoked by uid 500); 23 Dec 2005 08:17:52 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 79885 invoked by uid 500); 23 Dec 2005 08:17:51 -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 79874 invoked by uid 99); 23 Dec 2005 08:17:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2005 00:17:51 -0800 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; Fri, 23 Dec 2005 00:17:49 -0800 Received: (qmail 93471 invoked by uid 65534); 23 Dec 2005 08:17:29 -0000 Message-ID: <20051223081729.93470.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358766 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ProjectEditAction.java resources/localization/Continuum.properties webapp/projectEdit.jsp Date: Fri, 23 Dec 2005 08:17:28 -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: Fri Dec 23 00:17:20 2005 New Revision: 358766 URL: http://svn.apache.org/viewcvs?rev=358766&view=rev Log: Fix project edition Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties maven/continuum/trunk/continuum-webapp/src/main/webapp/projectEdit.jsp Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=358766&r1=358765&r2=358766&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Fri Dec 23 00:17:20 2005 @@ -50,25 +50,34 @@ public String execute() { - Project p = new Project(); + try + { + project = getProject( projectId ); + } + catch ( ContinuumException e ) + { + addActionMessage( "Can't get project informations (id=" + projectId + ") : " + e.getMessage() ); + + e.printStackTrace(); - p.setId( projectId ); + return ERROR; + } - p.setName( name ); + project.setName( name ); - p.setVersion( version ); + project.setVersion( version ); - p.setScmUrl( scmUrl ); + project.setScmUrl( scmUrl ); - p.setScmUsername( scmUsername ); + project.setScmUsername( scmUsername ); - p.setScmPassword( scmPassword ); + project.setScmPassword( scmPassword ); - p.setScmTag( scmTag ); + project.setScmTag( scmTag ); try { - continuum.updateProject( p ); + continuum.updateProject( project ); } catch ( ContinuumException e ) { @@ -97,6 +106,18 @@ return ERROR; } + name = project.getName(); + + version = project.getVersion(); + + scmUrl = project.getScmUrl(); + + scmUsername = project.getScmUsername(); + + scmPassword = project.getScmPassword(); + + scmTag = project.getScmTag(); + return INPUT; } @@ -116,29 +137,59 @@ this.projectId = projectId; } - public void setProjectName( String name ) + public String getName() + { + return name; + } + + public void setName( String name ) { this.name = name; } + public String getVersion() + { + return version; + } + public void setVersion( String version ) { this.version = version; } + public String getScmUrl() + { + return scmUrl; + } + public void setScmUrl( String scmUrl ) { this.scmUrl = scmUrl; } + public String getScmUsername() + { + return scmUsername; + } + public void setScmUsername( String scmUsername ) { this.scmUsername = scmUsername; } - public void setPassword( String scmPassword ) + public String getScmPassword() + { + return scmPassword; + } + + public void setScmPassword( String scmPassword ) { this.scmPassword = scmPassword; + } + + public String getScmTag() + { + return scmTag; } public void setScmTag( String scmTag ) Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=358766&r1=358765&r2=358766&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Fri Dec 23 00:17:20 2005 @@ -11,6 +11,7 @@ edit = Edit delete = Delete save = Save +add = Add // ---------------------------------------------------------------------- // Page: Top Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectEdit.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectEdit.jsp?rev=358766&r1=358765&r2=358766&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectEdit.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectEdit.jsp Fri Dec 23 00:17:20 2005 @@ -11,12 +11,12 @@
"/> - - - - - - + + + + + +