Mailing-List: contact dev-help@continuum.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@continuum.apache.org
Received-SPF: pass (athena.apache.org: domain of emmanuel.venisse@gmail.com
 designates 64.233.182.190 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:in-reply-to:mime-version
         :content-type:references;
        b=WWDPLZknu94DIFKGFTCwxHF8DJ+keOblcHr9ClhrBglrjLZbpkCaPE0ALyPf90U+A3
         +5OsVe75DG/CfZFqlzR3yIap5Ita0AfkDqCoBllBnOjjS71/mwDbKg6f4GWrzeyut3I/
         YbehlHlDvGcTSsQQXCoFGoWVU2zaTYjm/2gKg=
Message-ID: <f345f3480807220144s63b9adbar83220de8788d574e@mail.gmail.com>
Date: Tue, 22 Jul 2008 10:44:07 +0200
From: "Emmanuel Venisse" <emmanuel.venisse@gmail.com>
To: dev@continuum.apache.org
Subject: Re: svn commit: r678249 - in
 /continuum/trunk/continuum-webapp/src/main:
 java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
 resources/localization/Continuum.properties
 webapp/WEB-INF/jsp/projectGroupSummary.jsp
In-Reply-To: <20080720045500.A0D992388A0F@eris.apache.org>
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----=_Part_57152_21879951.1216716247662"
References: <20080720045500.A0D992388A0F@eris.apache.org>

------=_Part_57152_21879951.1216716247662
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

On Sun, Jul 20, 2008 at 6:54 AM, <oching@apache.org> wrote:

> Author: oching
> Date: Sat Jul 19 21:54:59 2008
> New Revision: 678249
>
> URL: http://svn.apache.org/viewvc?rev=678249&view=rev
> Log:
> [CONTINUUM-801]
> -show the project's homepage url in the project group summary
>
> Modified:
>
>  continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
>
>  continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
>
>  continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
>
> Modified:
> continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=678249&r1=678248&r2=678249&view=diff
>
> ==============================================================================
> ---
> continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
> (original)
> +++
> continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
> Sat Jul 19 21:54:59 2008
> @@ -111,6 +111,8 @@
>     private int buildDefinitionId;
>
>     private String preferredExecutor = "maven2";
> +
> +    private String url;
>
>     public String summary()
>         throws ContinuumException
> @@ -177,6 +179,11 @@
>                     {
>                         nbShellProjects += 1;
>                     }
> +
> +                    if( p.getId() == 1 )
> +                    {
> +                       url = p.getUrl();
> +                    }


I don't think this test is correct.
It will work only for the first project added in Continuum ;)

Emmanuel


>
>                 }
>
>                 int nbActualPreferredProject = nbMaven2Projects;
> @@ -847,4 +854,14 @@
>     {
>         return preferredExecutor;
>     }
> +
> +       public String getUrl()
> +       {
> +               return url;
> +       }
> +
> +       public void setUrl(String url)
> +       {
> +               this.url = url;
> +       }
>  }
>
> Modified:
> continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=678249&r1=678248&r2=678249&view=diff
>
> ==============================================================================
> ---
> continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
> (original)
> +++
> continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
> Sat Jul 19 21:54:59 2008
> @@ -153,6 +153,7 @@
>  projectGroup.name.label = Project Group Name
>  projectGroup.groupId.label = Project Group Id
>  projectGroup.description.label = Description
> +projectGroup.url.label = Homepage Url
>  projectGroup.projects.title = Member Projects
>  projectGroup.tab.summary = Project Group Summary
>  projectGroup.tab.members = Members
>
> Modified:
> continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=678249&r1=678248&r2=678249&view=diff
>
> ==============================================================================
> ---
> continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
> (original)
> +++
> continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
> Sat Jul 19 21:54:59 2008
> @@ -88,6 +88,10 @@
>         <c1:data label="%{getText('projectGroup.name.label')}"
> name="projectGroup.name"/>
>         <c1:data label="%{getText('projectGroup.groupId.label')}"
> name="projectGroup.groupId"/>
>         <c1:data label="%{getText('projectGroup.description.label')}"
> name="projectGroup.description"/>
> +        <c:if test="${url != null}">
> +            <ww:url id="projectHomepageUrl" value="${url}"
> includeContext="false" includeParams="none"/>
> +               <c1:data label="%{getText('projectGroup.url.label')}"
> name="url" valueLink="%{'${projectHomepageUrl}'}"/>
> +        </c:if>
>       </table>
>     </div>
>
>
>
>

------=_Part_57152_21879951.1216716247662--