continuum-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Carlos Sanchez" <car...@apache.org>
Subject Re: svn commit: r446713 - in /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ webapp/
Date Sun, 17 Sep 2006 23:47:16 GMT
next week i'm going to sync bug fixes in both

On 9/17/06, Brett Porter <brett@apache.org> wrote:
> Does this affect trunk too?
>
> - Brett
>
> On 16/09/2006, at 6:04 AM, carlos@apache.org wrote:
>
> > Author: carlos
> > Date: Fri Sep 15 13:04:10 2006
> > New Revision: 446713
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=446713
> > Log:
> > [CONTINUUM-905] Deleting a project build definition by clicking the
> > 'delete' link results in a 404.
> >
> > Added:
> >     maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/webapp/deleteBuildDefinition.jsp   (with props)
> > Modified:
> >     maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/java/org/apache/maven/continuum/web/action/
> > BuildDefinitionAction.java
> >     maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/resources/xwork.xml
> >     maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/webapp/confirmBuildDefinitionRemoval.jsp
> >
> > Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/
> > src/main/java/org/apache/maven/continuum/web/action/
> > BuildDefinitionAction.java
> > URL: http://svn.apache.org/viewvc/maven/continuum/branches/
> > continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/
> > continuum/web/action/BuildDefinitionAction.java?
> > view=diff&rev=446713&r1=446712&r2=446713
> > ======================================================================
> > ========
> > --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/java/org/apache/maven/continuum/web/action/
> > BuildDefinitionAction.java (original)
> > +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/java/org/apache/maven/continuum/web/action/
> > BuildDefinitionAction.java Fri Sep 15 13:04:10 2006
> > @@ -192,7 +192,7 @@
> >      {
> >          if ( confirmed )
> >          {
> > -            getContinuum().removeBuildDefinitionFromProject
> > ( projectGroupId, buildDefinitionId );
> > +            getContinuum().removeBuildDefinitionFromProjectGroup
> > ( projectGroupId, buildDefinitionId );
> >
> >              return SUCCESS;
> >          }
> >
> > Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/
> > src/main/resources/xwork.xml
> > URL: http://svn.apache.org/viewvc/maven/continuum/branches/
> > continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?
> > view=diff&rev=446713&r1=446712&r2=446713
> > ======================================================================
> > ========
> > --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/resources/xwork.xml (original)
> > +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/resources/xwork.xml Fri Sep 15 13:04:10 2006
> > @@ -121,7 +121,7 @@
> >        <result name="success"
> > type="chain">projectGroupBuildDefinition</result>
> >      </action>
> >
> > -    <action name="removeGroupBuildDefinition"
> > class="buildDefinition" method="removeFromGroup">
> > +    <action name="removeGroupBuildDefinition"
> > class="buildDefinition" method="removeFromProjectGroup">
> >        <result name="confirm">confirmBuildDefinitionRemoval.jsp</
> > result>
> >        <result name="success"
> > type="chain">projectGroupBuildDefinition</result>
> >      </action>
> >
> > Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/
> > src/main/webapp/confirmBuildDefinitionRemoval.jsp
> > URL: http://svn.apache.org/viewvc/maven/continuum/branches/
> > continuum-acegi/continuum-webapp/src/main/webapp/
> > confirmBuildDefinitionRemoval.jsp?
> > view=diff&rev=446713&r1=446712&r2=446713
> > ======================================================================
> > ========
> > --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/webapp/confirmBuildDefinitionRemoval.jsp (original)
> > +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/webapp/confirmBuildDefinitionRemoval.jsp Fri Sep 15 13:04:10 2006
> > @@ -19,8 +19,9 @@
> >            </p>
> >          </div>
> >          <div class="functnbar3">
> > -          <ww:form action="removeProjectBuildDefinition">
> > +          <ww:form action="removeGroupBuildDefinition">
> >              <ww:hidden name="buildDefinitionId"/>
> > +            <ww:hidden name="projectGroupId"/>
> >              <ww:hidden name="projectId"/>
> >              <ww:hidden name="confirmed" value="true"/>
> >              <c1:submitcancel value="%{getText('delete')}" cancel="%
> > {getText('cancel')}"/>
> >
> > Added: maven/continuum/branches/continuum-acegi/continuum-webapp/
> > src/main/webapp/deleteBuildDefinition.jsp
> > URL: http://svn.apache.org/viewvc/maven/continuum/branches/
> > continuum-acegi/continuum-webapp/src/main/webapp/
> > deleteBuildDefinition.jsp?view=auto&rev=446713
> > ======================================================================
> > ========
> > --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/webapp/deleteBuildDefinition.jsp (added)
> > +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/
> > main/webapp/deleteBuildDefinition.jsp Fri Sep 15 13:04:10 2006
> > @@ -0,0 +1,31 @@
> > +<%@ taglib uri="/webwork" prefix="ww" %>
> > +<%@ taglib uri="continuum" prefix="c1" %>
> > +<html>
> > +  <ww:i18n name="localization.Continuum">
> > +    <head>
> > +      <title><ww:text name="deleteBuildDefinition.page.title"/></
> > title>
> > +    </head>
> > +    <body>
> > +      <div id="axial" class="h3">
> > +        <h3><ww:text name="deleteBuildDefinition.section.title"/></
> > h3>
> > +        <div class="warningmessage">
> > +          <p>
> > +            <strong>
> > +              <ww:text
> > name="deleteBuildDefinition.confirmation.message">
> > +                     <ww:param><ww:property value="buildDefinitionId"/></
> > ww:param>
> > +               </ww:text>
> > +            </strong>
> > +          </p>
> > +        </div>
> > +        <div class="functnbar3">
> > +          <ww:form action="removeProjectBuildDefinition.action"
> > method="post">
> > +            <ww:hidden name="projectId"/>
> > +            <ww:hidden name="buildDefinitionId"/>
> > +            <ww:hidden name="confirmed" value="true"/>
> > +            <c1:submitcancel value="%{getText('delete')}" cancel="%
> > {getText('cancel')}"/>
> > +          </ww:form>
> > +        </div>
> > +      </div>
> > +    </body>
> > +  </ww:i18n>
> > +</html>
> >
> > Propchange: maven/continuum/branches/continuum-acegi/continuum-
> > webapp/src/main/webapp/deleteBuildDefinition.jsp
> > ----------------------------------------------------------------------
> > --------
> >     svn:eol-style = native
> >
> > Propchange: maven/continuum/branches/continuum-acegi/continuum-
> > webapp/src/main/webapp/deleteBuildDefinition.jsp
> > ----------------------------------------------------------------------
> > --------
> >     svn:keywords = "Author Date Id Revision"
> >
>


-- 
I could give you my word as a Spaniard.
No good. I've known too many Spaniards.
                             -- The Princess Bride

Mime
View raw message