continuum-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Emmanuel Venisse" <emmanuel.veni...@gmail.com>
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
Date Tue, 22 Jul 2008 08:44:07 GMT
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>
>
>
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message