You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2007/02/15 18:44:13 UTC
svn commit: r508033 -
/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Author: brett
Date: Thu Feb 15 09:44:11 2007
New Revision: 508033
URL: http://svn.apache.org/viewvc?view=rev&rev=508033
Log:
handle companyPom being set, but fields being empty
Modified:
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?view=diff&rev=508033&r1=508032&r2=508033
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Thu Feb 15 09:44:11 2007
@@ -58,13 +58,13 @@
<ww:set name="companyPom" value="companyPom"/>
-<c:if test="${empty(companyPom)}">
+<c:if test="${empty(companyPom.groupId) || empty(companyPom.artifactId)}">
<p>
You have not yet specified a company POM. <a href="<ww:url action='editAppearance' />">Select a Company POM</a>
</p>
</c:if>
-<c:if test="${!empty(companyPom)}">
+<c:if test="${!empty(companyPom.groupId) && !empty(companyPom.artifactId)}">
<p>
Your selected company POM is below. If you would like to change the organization name, url or logo, you can
<a href="<ww:url action='editCompanyPom'/>">edit the POM</a>.
@@ -113,4 +113,4 @@
</c:if>
</body>
-</html>
\ No newline at end of file
+</html>
Re: svn commit: r508033 - /maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Posted by Stephane Nicoll <st...@gmail.com>.
On 2/18/07, Brett Porter <br...@apache.org> wrote:
> No, I don't think so - I wonder if it is using the wrong local
> repository?
Dunno. How can I know which repo it's using?
Stéphane
>
> I used the Maven builder helper to obtain it, which should use the
> same location.
>
> - Brett
>
> On 16/02/2007, at 10:33 PM, Stephane Nicoll wrote:
>
> > I have also the following situation for the company pom.
> >
> > My company pom is: com.foo foo-parent. I have the v4 version of this
> > pom in the local repository used by continuum.
> >
> > continuum keeps on displaying that the company pom does not exist. Is
> > this fix related?
> >
> > Thanks,
> > Stéphane
> >
> > On 2/15/07, brett@apache.org <br...@apache.org> wrote:
> >> Author: brett
> >> Date: Thu Feb 15 09:44:11 2007
> >> New Revision: 508033
> >>
> >> URL: http://svn.apache.org/viewvc?view=rev&rev=508033
> >> Log:
> >> handle companyPom being set, but fields being empty
> >>
> >> Modified:
> >> maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
> >> jsp/admin/appearance.jsp
> >>
> >> Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/
> >> WEB-INF/jsp/admin/appearance.jsp
> >> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-
> >> webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?
> >> view=diff&rev=508033&r1=508032&r2=508033
> >> =====================================================================
> >> =========
> >> --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
> >> jsp/admin/appearance.jsp (original)
> >> +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
> >> jsp/admin/appearance.jsp Thu Feb 15 09:44:11 2007
> >> @@ -58,13 +58,13 @@
> >>
> >> <ww:set name="companyPom" value="companyPom"/>
> >>
> >> -<c:if test="${empty(companyPom)}">
> >> +<c:if test="${empty(companyPom.groupId) || empty
> >> (companyPom.artifactId)}">
> >> <p>
> >> You have not yet specified a company POM. <a href="<ww:url
> >> action='editAppearance' />">Select a Company POM</a>
> >> </p>
> >> </c:if>
> >>
> >> -<c:if test="${!empty(companyPom)}">
> >> +<c:if test="${!empty(companyPom.groupId) && !empty
> >> (companyPom.artifactId)}">
> >> <p>
> >> Your selected company POM is below. If you would like to
> >> change the organization name, url or logo, you can
> >> <a href="<ww:url action='editCompanyPom'/>">edit the POM</a>.
> >> @@ -113,4 +113,4 @@
> >> </c:if>
> >> </body>
> >>
> >> -</html>
> >> \ No newline at end of file
> >> +</html>
> >>
> >>
> >>
>
Re: svn commit: r508033 - /maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Posted by Brett Porter <br...@apache.org>.
No, I don't think so - I wonder if it is using the wrong local
repository?
I used the Maven builder helper to obtain it, which should use the
same location.
- Brett
On 16/02/2007, at 10:33 PM, Stephane Nicoll wrote:
> I have also the following situation for the company pom.
>
> My company pom is: com.foo foo-parent. I have the v4 version of this
> pom in the local repository used by continuum.
>
> continuum keeps on displaying that the company pom does not exist. Is
> this fix related?
>
> Thanks,
> Stéphane
>
> On 2/15/07, brett@apache.org <br...@apache.org> wrote:
>> Author: brett
>> Date: Thu Feb 15 09:44:11 2007
>> New Revision: 508033
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=508033
>> Log:
>> handle companyPom being set, but fields being empty
>>
>> Modified:
>> maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
>> jsp/admin/appearance.jsp
>>
>> Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/
>> WEB-INF/jsp/admin/appearance.jsp
>> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-
>> webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?
>> view=diff&rev=508033&r1=508032&r2=508033
>> =====================================================================
>> =========
>> --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
>> jsp/admin/appearance.jsp (original)
>> +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
>> jsp/admin/appearance.jsp Thu Feb 15 09:44:11 2007
>> @@ -58,13 +58,13 @@
>>
>> <ww:set name="companyPom" value="companyPom"/>
>>
>> -<c:if test="${empty(companyPom)}">
>> +<c:if test="${empty(companyPom.groupId) || empty
>> (companyPom.artifactId)}">
>> <p>
>> You have not yet specified a company POM. <a href="<ww:url
>> action='editAppearance' />">Select a Company POM</a>
>> </p>
>> </c:if>
>>
>> -<c:if test="${!empty(companyPom)}">
>> +<c:if test="${!empty(companyPom.groupId) && !empty
>> (companyPom.artifactId)}">
>> <p>
>> Your selected company POM is below. If you would like to
>> change the organization name, url or logo, you can
>> <a href="<ww:url action='editCompanyPom'/>">edit the POM</a>.
>> @@ -113,4 +113,4 @@
>> </c:if>
>> </body>
>>
>> -</html>
>> \ No newline at end of file
>> +</html>
>>
>>
>>
Re: svn commit: r508033 - /maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
Posted by Stephane Nicoll <st...@gmail.com>.
I have also the following situation for the company pom.
My company pom is: com.foo foo-parent. I have the v4 version of this
pom in the local repository used by continuum.
continuum keeps on displaying that the company pom does not exist. Is
this fix related?
Thanks,
Stéphane
On 2/15/07, brett@apache.org <br...@apache.org> wrote:
> Author: brett
> Date: Thu Feb 15 09:44:11 2007
> New Revision: 508033
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=508033
> Log:
> handle companyPom being set, but fields being empty
>
> Modified:
> maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
>
> Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?view=diff&rev=508033&r1=508032&r2=508033
> ==============================================================================
> --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
> +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Thu Feb 15 09:44:11 2007
> @@ -58,13 +58,13 @@
>
> <ww:set name="companyPom" value="companyPom"/>
>
> -<c:if test="${empty(companyPom)}">
> +<c:if test="${empty(companyPom.groupId) || empty(companyPom.artifactId)}">
> <p>
> You have not yet specified a company POM. <a href="<ww:url action='editAppearance' />">Select a Company POM</a>
> </p>
> </c:if>
>
> -<c:if test="${!empty(companyPom)}">
> +<c:if test="${!empty(companyPom.groupId) && !empty(companyPom.artifactId)}">
> <p>
> Your selected company POM is below. If you would like to change the organization name, url or logo, you can
> <a href="<ww:url action='editCompanyPom'/>">edit the POM</a>.
> @@ -113,4 +113,4 @@
> </c:if>
> </body>
>
> -</html>
> \ No newline at end of file
> +</html>
>
>
>