You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by oc...@apache.org on 2011/04/18 14:28:28 UTC
svn commit: r1094529 - in /continuum/trunk:
continuum-webapp/src/main/resources/template/default/a-close.ftl
continuum-webapp/src/main/resources/template/default/a.ftl pom.xml
Author: oching
Date: Mon Apr 18 12:28:28 2011
New Revision: 1094529
URL: http://svn.apache.org/viewvc?rev=1094529&view=rev
Log:
o upgrade to 2.1.8.1, similar to redback trunk
o updated template for anchor to make it work with struts 2.1.8.x
Modified:
continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl
continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl
continuum/trunk/pom.xml
Modified: continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl?rev=1094529&r1=1094528&r2=1094529&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl Mon Apr 18 12:28:28 2011
@@ -1 +1,23 @@
-</a><#rt/>
\ No newline at end of file
+<a<#rt/>
+<#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+</#if>
+<#if parameters.href?if_exists != "">
+ href="${parameters.href}"<#rt/>
+</#if>
+<#if parameters.tabindex??>
+ tabindex="${parameters.tabindex?html}"<#rt/>
+</#if>
+<#if parameters.cssClass??>
+ class="${parameters.cssClass?html}"<#rt/>
+</#if>
+<#if parameters.cssStyle??>
+ style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+<#if parameters.title??>
+ title="${parameters.title?html}"<#rt/>
+</#if>
+<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
+<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
+>${parameters.body}</a>
\ No newline at end of file
Modified: continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl?rev=1094529&r1=1094528&r2=1094529&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl Mon Apr 18 12:28:28 2011
@@ -1,22 +0,0 @@
-<a<#rt/>
-<#if parameters.id?if_exists != "">
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.href?if_exists != "">
- href="${parameters.href}"<#rt/>
-</#if>
-<#if parameters.tabindex?exists>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#if parameters.title?exists>
- title="${parameters.title?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
-<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-><#rt/>
Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1094529&r1=1094528&r2=1094529&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Mon Apr 18 12:28:28 2011
@@ -1709,7 +1709,7 @@ under the License.
<continuumWebappVersion>${project.version}</continuumWebappVersion>
<maven.version>2.0.9</maven.version>
<spring.version>2.5.6</spring.version>
- <struts.version>2.1.8</struts.version>
+ <struts.version>2.1.8.1</struts.version>
<wagon.version>1.0-beta-2</wagon.version>
<maven-scm.version>1.4</maven-scm.version>
<redback.version>1.3-SNAPSHOT</redback.version>
Re: svn commit: r1094529 - in /continuum/trunk: continuum-webapp/src/main/resources/template/default/a-close.ftl
continuum-webapp/src/main/resources/template/default/a.ftl pom.xml
Posted by Deng Ching <oc...@apache.org>.
I'm not sure as well with Continuum, since it has a lot more ftls included
with it compared to Archiva. I tried removing the struts.ui.theme property
in struts.properties last night and most of the pages broke -- some were
missing buttons while others were missing text..
Thanks,
Deng
On Mon, Apr 18, 2011 at 11:22 PM, Brett Porter <br...@apache.org> wrote:
> In Archiva, I removed the custom templates, as the reasons for them
> (performance) seem to no longer be an issue according to the Struts tuning
> guide.
>
> Not sure if Continuum has additional customisations...
>
> On 18/04/2011, at 10:28 PM, oching@apache.org wrote:
>
> > Author: oching
> > Date: Mon Apr 18 12:28:28 2011
> > New Revision: 1094529
> >
> > URL: http://svn.apache.org/viewvc?rev=1094529&view=rev
> > Log:
> > o upgrade to 2.1.8.1, similar to redback trunk
> > o updated template for anchor to make it work with struts 2.1.8.x
> >
> > Modified:
> >
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl
> >
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl
> > continuum/trunk/pom.xml
> >
> > Modified:
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl
> > URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl?rev=1094529&r1=1094528&r2=1094529&view=diff
> >
> ==============================================================================
> > ---
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl
> (original)
> > +++
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl
> Mon Apr 18 12:28:28 2011
> > @@ -1 +1,23 @@
> > -</a><#rt/>
> > \ No newline at end of file
> > +<a<#rt/>
> > +<#if parameters.id?if_exists != "">
> > + id="${parameters.id?html}"<#rt/>
> > +</#if>
> > +<#if parameters.href?if_exists != "">
> > + href="${parameters.href}"<#rt/>
> > +</#if>
> > +<#if parameters.tabindex??>
> > + tabindex="${parameters.tabindex?html}"<#rt/>
> > +</#if>
> > +<#if parameters.cssClass??>
> > + class="${parameters.cssClass?html}"<#rt/>
> > +</#if>
> > +<#if parameters.cssStyle??>
> > + style="${parameters.cssStyle?html}"<#rt/>
> > +</#if>
> > +<#if parameters.title??>
> > + title="${parameters.title?html}"<#rt/>
> > +</#if>
> > +<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
> > +<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
> > +<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
> > +>${parameters.body}</a>
> > \ No newline at end of file
> >
> > Modified:
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl
> > URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl?rev=1094529&r1=1094528&r2=1094529&view=diff
> >
> ==============================================================================
> > ---
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl
> (original)
> > +++
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl
> Mon Apr 18 12:28:28 2011
> > @@ -1,22 +0,0 @@
> > -<a<#rt/>
> > -<#if parameters.id?if_exists != "">
> > - id="${parameters.id?html}"<#rt/>
> > -</#if>
> > -<#if parameters.href?if_exists != "">
> > - href="${parameters.href}"<#rt/>
> > -</#if>
> > -<#if parameters.tabindex?exists>
> > - tabindex="${parameters.tabindex?html}"<#rt/>
> > -</#if>
> > -<#if parameters.cssClass?exists>
> > - class="${parameters.cssClass?html}"<#rt/>
> > -</#if>
> > -<#if parameters.cssStyle?exists>
> > - style="${parameters.cssStyle?html}"<#rt/>
> > -</#if>
> > -<#if parameters.title?exists>
> > - title="${parameters.title?html}"<#rt/>
> > -</#if>
> > -<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
> > -<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
> > -><#rt/>
> >
> > Modified: continuum/trunk/pom.xml
> > URL:
> http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1094529&r1=1094528&r2=1094529&view=diff
> >
> ==============================================================================
> > --- continuum/trunk/pom.xml (original)
> > +++ continuum/trunk/pom.xml Mon Apr 18 12:28:28 2011
> > @@ -1709,7 +1709,7 @@ under the License.
> > <continuumWebappVersion>${project.version}</continuumWebappVersion>
> > <maven.version>2.0.9</maven.version>
> > <spring.version>2.5.6</spring.version>
> > - <struts.version>2.1.8</struts.version>
> > + <struts.version>2.1.8.1</struts.version>
> > <wagon.version>1.0-beta-2</wagon.version>
> > <maven-scm.version>1.4</maven-scm.version>
> > <redback.version>1.3-SNAPSHOT</redback.version>
> >
> >
>
> --
> Brett Porter
> brett@apache.org
> http://brettporter.wordpress.com/
> http://au.linkedin.com/in/brettporter
>
>
>
>
>
Re: svn commit: r1094529 - in /continuum/trunk: continuum-webapp/src/main/resources/template/default/a-close.ftl continuum-webapp/src/main/resources/template/default/a.ftl pom.xml
Posted by Brett Porter <br...@apache.org>.
In Archiva, I removed the custom templates, as the reasons for them (performance) seem to no longer be an issue according to the Struts tuning guide.
Not sure if Continuum has additional customisations...
On 18/04/2011, at 10:28 PM, oching@apache.org wrote:
> Author: oching
> Date: Mon Apr 18 12:28:28 2011
> New Revision: 1094529
>
> URL: http://svn.apache.org/viewvc?rev=1094529&view=rev
> Log:
> o upgrade to 2.1.8.1, similar to redback trunk
> o updated template for anchor to make it work with struts 2.1.8.x
>
> Modified:
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl
> continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl
> continuum/trunk/pom.xml
>
> Modified: continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl
> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl?rev=1094529&r1=1094528&r2=1094529&view=diff
> ==============================================================================
> --- continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl (original)
> +++ continuum/trunk/continuum-webapp/src/main/resources/template/default/a-close.ftl Mon Apr 18 12:28:28 2011
> @@ -1 +1,23 @@
> -</a><#rt/>
> \ No newline at end of file
> +<a<#rt/>
> +<#if parameters.id?if_exists != "">
> + id="${parameters.id?html}"<#rt/>
> +</#if>
> +<#if parameters.href?if_exists != "">
> + href="${parameters.href}"<#rt/>
> +</#if>
> +<#if parameters.tabindex??>
> + tabindex="${parameters.tabindex?html}"<#rt/>
> +</#if>
> +<#if parameters.cssClass??>
> + class="${parameters.cssClass?html}"<#rt/>
> +</#if>
> +<#if parameters.cssStyle??>
> + style="${parameters.cssStyle?html}"<#rt/>
> +</#if>
> +<#if parameters.title??>
> + title="${parameters.title?html}"<#rt/>
> +</#if>
> +<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
> +<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
> +<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
> +>${parameters.body}</a>
> \ No newline at end of file
>
> Modified: continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl
> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl?rev=1094529&r1=1094528&r2=1094529&view=diff
> ==============================================================================
> --- continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl (original)
> +++ continuum/trunk/continuum-webapp/src/main/resources/template/default/a.ftl Mon Apr 18 12:28:28 2011
> @@ -1,22 +0,0 @@
> -<a<#rt/>
> -<#if parameters.id?if_exists != "">
> - id="${parameters.id?html}"<#rt/>
> -</#if>
> -<#if parameters.href?if_exists != "">
> - href="${parameters.href}"<#rt/>
> -</#if>
> -<#if parameters.tabindex?exists>
> - tabindex="${parameters.tabindex?html}"<#rt/>
> -</#if>
> -<#if parameters.cssClass?exists>
> - class="${parameters.cssClass?html}"<#rt/>
> -</#if>
> -<#if parameters.cssStyle?exists>
> - style="${parameters.cssStyle?html}"<#rt/>
> -</#if>
> -<#if parameters.title?exists>
> - title="${parameters.title?html}"<#rt/>
> -</#if>
> -<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
> -<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
> -><#rt/>
>
> Modified: continuum/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1094529&r1=1094528&r2=1094529&view=diff
> ==============================================================================
> --- continuum/trunk/pom.xml (original)
> +++ continuum/trunk/pom.xml Mon Apr 18 12:28:28 2011
> @@ -1709,7 +1709,7 @@ under the License.
> <continuumWebappVersion>${project.version}</continuumWebappVersion>
> <maven.version>2.0.9</maven.version>
> <spring.version>2.5.6</spring.version>
> - <struts.version>2.1.8</struts.version>
> + <struts.version>2.1.8.1</struts.version>
> <wagon.version>1.0-beta-2</wagon.version>
> <maven-scm.version>1.4</maven-scm.version>
> <redback.version>1.3-SNAPSHOT</redback.version>
>
>
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter