diff -Nru tiles-2.2.1/debian/changelog tiles-2.2.2/debian/changelog --- tiles-2.2.1/debian/changelog 2010-10-26 16:15:25.000000000 +0200 +++ tiles-2.2.2/debian/changelog 2010-10-26 16:14:01.000000000 +0200 @@ -1,3 +1,22 @@ +tiles (2.2.2-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #666788). Remaining changes: + - Build-depend/suggest libmvel2-java instead of libmvel-java. + + -- Angel Abad Tue, 26 Oct 2010 16:13:58 +0200 + +tiles (2.2.2-1) unstable; urgency=low + + [ Torsten Werner ] + * Change maintainers into Maintainers. + + [ Damien Raude-Morvan ] + * New upstream bugfix release. + * Bump Standards-Version to 3.9.0: no changes needed. + * Use 3.0 (quilt) format. + + -- Damien Raude-Morvan Thu, 01 Jul 2010 01:12:16 +0200 + tiles (2.2.1-2ubuntu1) maverick; urgency=low * Build-depend/suggest libmvel2-java instead of libmvel-java. @@ -60,3 +79,4 @@ * debian/build.xml: remove Javadoc API of Portlet module (build disabled) -- Damien Raude-Morvan Sat, 21 Mar 2009 22:35:52 +0100 + diff -Nru tiles-2.2.1/debian/control tiles-2.2.2/debian/control --- tiles-2.2.1/debian/control 2010-10-26 16:15:25.000000000 +0200 +++ tiles-2.2.2/debian/control 2010-10-26 16:09:32.000000000 +0200 @@ -1,13 +1,14 @@ Source: tiles Section: java Priority: optional -Maintainer: Debian Java maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Damien Raude-Morvan Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper Build-Depends-Indep: libcommons-digester-java, libslf4j-java, libognl-java, libservlet2.5-java, libtomcat6-java, libspring-core-2.5-java, libspring-web-2.5-java, libfreemarker-java, maven-repo-helper, libmvel2-java -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tiles/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tiles/ Homepage: http://tiles.apache.org/ diff -Nru tiles-2.2.1/debian/source/format tiles-2.2.2/debian/source/format --- tiles-2.2.1/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ tiles-2.2.2/debian/source/format 2010-09-30 00:20:41.000000000 +0200 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru tiles-2.2.1/NOTICE.txt tiles-2.2.2/NOTICE.txt --- tiles-2.2.1/NOTICE.txt 2009-10-14 13:08:10.000000000 +0200 +++ tiles-2.2.2/NOTICE.txt 2010-06-17 20:31:47.000000000 +0200 @@ -1,5 +1,5 @@ Apache Tiles - Copyright 1999-2009 The Apache Software Foundation + Copyright 1999-2010 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff -Nru tiles-2.2.1/src/assembly/pom.xml tiles-2.2.2/src/assembly/pom.xml --- tiles-2.2.1/src/assembly/pom.xml 2009-10-14 13:08:01.000000000 +0200 +++ tiles-2.2.2/src/assembly/pom.xml 2010-06-17 20:31:36.000000000 +0200 @@ -1,6 +1,6 @@ @@ -223,6 +217,7 @@ org.codehaus.mojo rat-maven-plugin + 1.0-alpha-3 pom.xml @@ -260,9 +255,14 @@ + maven-install-plugin + + true + + + org.apache.maven.plugins maven-gpg-plugin - 1.0-alpha-4 sign-artifacts @@ -276,7 +276,6 @@ org.apache.maven.plugins maven-source-plugin - 2.1 attach-source @@ -328,29 +327,4 @@ - - - - apache.snapshots - http://people.apache.org/repo/m2-snapshot-repository - - true - - - true - - - - - - apache.snapshots - http://people.apache.org/repo/m2-snapshot-repository/ - - true - - - false - - - \ No hay ningún carácter de nueva línea al final del archivo diff -Nru tiles-2.2.1/src/src/site/apt/config-reference.apt tiles-2.2.2/src/src/site/apt/config-reference.apt --- tiles-2.2.1/src/src/site/apt/config-reference.apt 2009-10-14 13:08:05.000000000 +0200 +++ tiles-2.2.2/src/src/site/apt/config-reference.apt 2010-06-17 20:31:41.000000000 +0200 @@ -1,4 +1,4 @@ -~~ $Id: config-reference.apt 798090 2009-07-27 10:01:47Z apetrelli $ +~~ $Id: config-reference.apt 831448 2009-10-30 20:39:52Z apetrelli $ ~~ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file diff -Nru tiles-2.2.1/src/src/site/apt/dev/release.apt tiles-2.2.2/src/src/site/apt/dev/release.apt --- tiles-2.2.1/src/src/site/apt/dev/release.apt 2009-10-14 13:08:05.000000000 +0200 +++ tiles-2.2.2/src/src/site/apt/dev/release.apt 2010-06-17 20:31:41.000000000 +0200 @@ -1,4 +1,4 @@ -~~ $Id: release.apt 797970 2009-07-26 18:24:53Z apetrelli $ +~~ $Id: release.apt 950449 2010-06-02 09:32:59Z apetrelli $ ~~ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file @@ -50,8 +50,8 @@ * Create and publish your GPG key To create a GPG key, follow the - {{{http://maven.apache.org/developers/release/pmc-gpg-keys.html}guidelines}} - from Maven team. Include it in: + {{{http://www.apache.org/dev/openpgp.html}guidelines}}. + Include it in: ------------------------------------- https://svn.apache.org/repos/asf/tiles/site/KEYS @@ -65,13 +65,13 @@ * Generate your SSH key (in this case we will use DSA encryption): --------------------------------- -ssh-keygen -t dsa +ssh-keygen -t rsa --------------------------------- * Copy your public key to the server: -------------------------------------- -scp ~/.ssh/id_dsa.pub user@people.apache.org:.ssh/authorized_keys +scp ~/.ssh/id_rsa.pub user@people.apache.org:.ssh/authorized_keys -------------------------------------- * Try to login: @@ -82,16 +82,51 @@ If it does not ask you a password, everything is ok. -Repeatable operations +* Modify <<>> - These steps must be performed <> release. + Your <<>> must be modified to allow deployment. + + This is the minimal configuration, obviously if you already have a <<>> file, + you must edit it: -* Remove snapshot repositories +--------------------------- + + + + apache-site + YOUR_APACHE_USERNAME + 664 + 775 + + + apache.snapshots.https + YOUR_APACHE_USERNAME + YOUR_APACHE_PASSWORD + + + apache.releases.https + YOUR_APACHE_USERNAME + YOUR_APACHE_PASSWORD + + + + + release + + YOUR_SECRET_PHRASE + + + + + +--------------------------- + +Repeatable operations - Snapshot repositories (for libraries and plugins) should be removed from the - main POM before a release. The problem is that a system behind a corporate - firewall/white list cannot access to the snapshot repository URL, thus giving - an error. + These steps must be performed <> release. * Prepare the release tag @@ -106,20 +141,35 @@ tag to use and the next snapshot version. It is reccomended to use the tag: <>. -* Check-out and install the release - - Due to an {{{https://issues.apache.org/struts/browse/TILES-149}open bug}}, it - is needed to check out and install, through <<>>, the tag; - otherwise the release process fails. - * Perform the Release To perform the release, i.e. creating and deploying Maven artifacts, use: ----------------------------------- -mvn -Prelease -Darguments="-Prelease" release:perform +mvn release:perform ----------------------------------- +* Close the staging repository + + Login to {{{https://repository.apache.org using} Nexus repository}} your Apache LDAP credentials. + Click on "Staging". Then click on "tiles" in the list of repositories. + In the panel below you should see an open repository that is linked to your username and ip. + Right click on this repository and select "Close". + This will close the repository from future deployments and make it available for others to view. + If you are staging multiple releases together, skip this step until you have staged everything. + Enter the name and version of the artifact being released in the "Description" field and then click "Close". + This will make it easier to identify it later. + +* Verify the staged artifacts + + If you click on your repository, a tree view will appear below. + You can then browse the contents to ensure the artifacts are as you expect them. + Pay particular attention to the existence of *.asc (signature) files. + If the you don't like the content of the repository, right click your repository and choose "Drop". + You can then rollback your release and repeat the process. + + Note the repository URL, you will need this in your vote email. + * Digest and upload assemblies * Go into the release assembly target directory: @@ -180,7 +230,7 @@ Maven 2 staging repository: - * http://people.apache.org/builds/tiles/${version}/m2-staging-repository/ + * https://repository.apache.org/content/repositories/tiles-[YOUR REPOSITORY ID]/ A vote regarding the quality of this test build will be initiated within the next couple of days. @@ -206,7 +256,7 @@ Maven 2 staging repository: - * http://people.apache.org/builds/tiles/${version}/m2-staging-repository/ + * https://repository.apache.org/content/repositories/tiles-[YOUR REPOSITORY ID]/ If you have had a chance to review the test build, please respond with a vote on its quality: @@ -227,17 +277,19 @@ After a vote is finished, and it has been decided that is <>, there is the need of a post-vote process. -** Move artifacts +** Promote staged artifacts + + Once the release is deemed fit for public consumption it can be transfered to a production repository where it will be available to all users. + + Login to {{{https://repository.apache.org}Nexus repository}} again. + Click on "Staging" and then on the repository with id "tiles-staging". + Find your closed staging repository, right click on it and choose "Promote". + Select the "Releases" repository and click "Promote". - * Move Maven artifacts to the rsync repository. To do it there is an - {{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-stage-plugin/}<>}} - to help in the process (WARNING: not tested yet!). - Merge the staging repository with the rsync repository: - ------------------------------------------- -mvn stage:copy -Dsource="http://people.apache.org/builds/tiles/${version}/m2-staging-repository/" --Dtarget="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository" -Dversion=${version} ------------------------------------------- + Next click on "Repositories", select the "Releases" repository + and validate that your artifacts exist as you expect them. + +** Move assemblies * Move assemblies to the Apache distribution mirrors: @@ -249,12 +301,6 @@ cp * /www/www.apache.org/dist/tiles/v${version}/ ------------------------------------------- - * Upload the <<>> file to the Apache mirrors: - -------------------------------------------- -scp KEYS user@people.apache.org:/www/www.apache.org/dist/tiles/v${version}/ -------------------------------------------- - ** Update the site * Wait 24 hours to let the mirror sync to the release and then update the @@ -304,4 +350,4 @@ the user list, or, if appropriate, file a ticket with JIRA. -------------------------------------- - <> \ No hay ningún carácter de nueva línea al final del archivo + <> diff -Nru tiles-2.2.1/src/src/site/apt/getting_started.apt tiles-2.2.2/src/src/site/apt/getting_started.apt --- tiles-2.2.1/src/src/site/apt/getting_started.apt 2009-10-14 13:08:05.000000000 +0200 +++ tiles-2.2.2/src/src/site/apt/getting_started.apt 2010-06-17 20:31:41.000000000 +0200 @@ -1,4 +1,4 @@ -~~ $Id: getting_started.apt 798090 2009-07-27 10:01:47Z apetrelli $ +~~ $Id: getting_started.apt 831448 2009-10-30 20:39:52Z apetrelli $ ~~ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file diff -Nru tiles-2.2.1/src/src/site/apt/security/security-bulletin-1.apt tiles-2.2.2/src/src/site/apt/security/security-bulletin-1.apt --- tiles-2.2.1/src/src/site/apt/security/security-bulletin-1.apt 2009-10-14 13:08:05.000000000 +0200 +++ tiles-2.2.2/src/src/site/apt/security/security-bulletin-1.apt 2010-06-17 20:31:41.000000000 +0200 @@ -1,4 +1,4 @@ -~~ $Id: security-bulletin-1.apt 782137 2009-06-05 21:18:52Z apetrelli $ +~~ $Id: security-bulletin-1.apt 940000 2010-05-01 12:46:53Z mck $ ~~ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file @@ -39,7 +39,7 @@ *-------------------------+-----------+ | Affected Software | Tiles 2.1.0/2.1.1 (Tiles 2.0.x versions are safe) | *-------------------------+-----------+ -| Original JIRA Ticket | {{{https://issues.apache.org/struts/browse/TILES-351}TILES-351}} | +| Original JIRA Ticket | {{{https://issues.apache.org/jira/browse/TILES-351}TILES-351}} | *-------------------------+-----------+ | Reporter | Antonio Petrelli (Tiles PMC member) | *-------------------------+-----------+ diff -Nru tiles-2.2.1/src/src/site/apt/selenium.apt tiles-2.2.2/src/src/site/apt/selenium.apt --- tiles-2.2.1/src/src/site/apt/selenium.apt 2009-10-14 13:08:05.000000000 +0200 +++ tiles-2.2.2/src/src/site/apt/selenium.apt 2010-06-17 20:31:41.000000000 +0200 @@ -1,4 +1,4 @@ -~~ $Id: selenium.apt 693560 2008-09-09 18:54:13Z apetrelli $ +~~ $Id: selenium.apt 831448 2009-10-30 20:39:52Z apetrelli $ ~~ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file @@ -48,6 +48,35 @@ {{{http://www.openqa.org/selenium-ide/} http://www.openqa.org/selenium-ide/}}. +* Run Selenium tests the easy way + + To run Selenium tests you need to add a configuration parameter in your <<>> file. + +------------------------------ + +... + + ... + + run-selenium + + /tomcat/installation/directory + + + ... + + +------------------------------ + + After that, if you have Firefox installed, you can launch Selenium tests in the command line: + +------------------------------ +mvn verity -Prun-selenium +------------------------------ + * Package <> the webapp with the 'selenium' profile activated. diff -Nru tiles-2.2.1/src/src/site/apt/tutorial/integration/velocity.apt tiles-2.2.2/src/src/site/apt/tutorial/integration/velocity.apt --- tiles-2.2.1/src/src/site/apt/tutorial/integration/velocity.apt 2009-10-14 13:08:04.000000000 +0200 +++ tiles-2.2.2/src/src/site/apt/tutorial/integration/velocity.apt 2010-06-17 20:31:41.000000000 +0200 @@ -1,4 +1,4 @@ -~~ $Id: velocity.apt 782137 2009-06-05 21:18:52Z apetrelli $ +~~ $Id: velocity.apt 931637 2010-04-07 18:31:09Z apetrelli $ ~~ ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file @@ -35,6 +35,21 @@ * Add <<>> and <<>> files to your application. + * Add this code in you <<>> file: + +---------------------------------- +userdirective=org.apache.tiles.velocity.template.AddAttributeDirective,\ + org.apache.tiles.velocity.template.AddListAttributeDirective,\ + org.apache.tiles.velocity.template.DefinitionDirective,\ + org.apache.tiles.velocity.template.GetAsStringDirective,\ + org.apache.tiles.velocity.template.ImportAttributeDirective,\ + org.apache.tiles.velocity.template.InsertAttributeDirective,\ + org.apache.tiles.velocity.template.InsertDefinitionDirective,\ + org.apache.tiles.velocity.template.InsertTemplateDirective,\ + org.apache.tiles.velocity.template.PutAttributeDirective,\ + org.apache.tiles.velocity.template.PutListAttributeDirective +---------------------------------- + * To access ".vm" files from HTTP requests, add this piece of configuration in <<>> (the parameters can be modified as needed). @@ -57,7 +72,8 @@ ---------------------------------- * To access ".vm" files as attributes, register VelocityAttributeRenderer - this way (only available in a servlet environment): + (only available in a servlet environment), by overriding the registerAttributeRenderers + method in the AbstractTilesContainerFactory implementation being used, like: ---------------------------------- @Override @@ -87,9 +103,9 @@ * Usage in Velocity templates - There are two Velocity tools that will be available to your application: + There are two ways to use Tiles-Velocity integration: - * the <<>> tool, that is a Velocity-style tool: + * the <<>> tool, that is a Velocity-style tool: ---------------------------------- $tilesAlt.startAttributeContext() @@ -109,18 +125,40 @@ $attribute.setRenderer("velocity") $attributeContext.putAttribute("body", $attribute}) -$tilesAlt.renderAttribute($templateAttribute) +$tilesAlt.render($templateAttribute) $tilesAlt.endAttributeContext() ---------------------------------- - * the <<>> tool, that has both Velocity-style methods and directive oriented methods. + * the <<>> directives, that have a tag-like meaning. ---------------------------------- -$tiles.insertTemplate.start({"template":"/page/myTemplate.vm"}) - $tiles.putAttribute({"name":"title", "value":"This is the title."}) - $tiles.putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"}) - $tiles.putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"}) -$tiles.insertTemplate().end() +#tiles_insertTemplate({"template":"/page/myTemplate.vm"}) + #tiles_putAttribute({"name":"title", "value":"This is the title."})#end + #tiles_putAttribute({"name":"header", "value":"/velocity/header.vm", "type":"velocity"})#end + #tiles_putAttribute({"name":"body", "value":"/velocity/body.vm", "type":"velocity"})#end +#end ---------------------------------- - For details about directives see the {{{../../apidocs/index.html}Javadocs}}. + Other <<>> directives are: + + * <<>> - get the value of named attribute as string. + + * <<>> - import the named attribute into the scope of + template context under the (optional) custom name. + + * <<>> - inserts given attribute in the output in its own context. + If this is a string a string is printed, if this is a definition - it is included in the output. + + * <<>> - inserts given attribute in the output. + If this is a string a string is printed, if this is a definition - it is included in the output. You can specify whether + a separate context is created for rendering the definition - in this case variables with duplicate names + will not be inherited from the parent definition + + * <<>> - renders a definition in its own context. + + * <<>> - inserts definition, optionally in the shared context. + + * <<>> - inserts a named page, equivalent to Velocity's <<<#parse>>>. + + + For details about the tool and directives see the {{{../../apidocs/index.html}Javadocs}}. diff -Nru tiles-2.2.1/src/src/site/xdoc/dev/building.xml tiles-2.2.2/src/src/site/xdoc/dev/building.xml --- tiles-2.2.1/src/src/site/xdoc/dev/building.xml 2009-10-14 13:08:05.000000000 +0200 +++ tiles-2.2.2/src/src/site/xdoc/dev/building.xml 2010-06-17 20:31:42.000000000 +0200 @@ -1,7 +1,7 @@ - - - - - - - - - - - - ${reports} - - \ No hay ningún carácter de nueva línea al final del archivo diff -Nru tiles-2.2.1/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java tiles-2.2.2/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java --- tiles-2.2.1/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java 2009-10-14 13:08:09.000000000 +0200 +++ tiles-2.2.2/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java 2010-06-17 20:31:47.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: VelocityUtilTest.java 797765 2009-07-25 13:20:26Z apetrelli $ + * $Id: VelocityUtilTest.java 902965 2010-01-25 20:12:46Z apetrelli $ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -22,18 +22,23 @@ package org.apache.tiles.velocity.context; import static org.apache.tiles.velocity.context.VelocityUtil.*; -import static org.junit.Assert.*; import static org.easymock.EasyMock.*; +import static org.easymock.classextension.EasyMock.*; +import static org.junit.Assert.*; -import java.util.HashMap; +import java.io.IOException; +import java.io.Writer; import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.apache.tiles.ArrayStack; import org.apache.velocity.context.Context; +import org.apache.velocity.context.InternalContextAdapter; +import org.apache.velocity.runtime.parser.node.ASTBlock; +import org.apache.velocity.runtime.parser.node.ASTMap; +import org.apache.velocity.runtime.parser.node.Node; import org.junit.Test; /** @@ -47,11 +52,6 @@ private static final Integer DUMMY_VALUE = new Integer(10); /** - * The parameter stack key. - */ - private static final String PARAMETER_MAP_STACK_KEY = "org.apache.tiles.velocity.PARAMETER_MAP_STACK"; - - /** * Test method for {@link org.apache.tiles.velocity.context.VelocityUtil * #toSimpleBoolean(java.lang.Boolean, boolean)}. */ @@ -67,34 +67,6 @@ /** * Test method for {@link org.apache.tiles.velocity.context.VelocityUtil - * #getParameterStack(org.apache.velocity.context.Context)}. - */ - @Test - public void testGetParameterStack() { - Context velocityContext = createMock(Context.class); - - expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(null); - expect(velocityContext.put(eq(PARAMETER_MAP_STACK_KEY), - isA(ArrayStack.class))).andReturn(null); - replay(velocityContext); - ArrayStack> paramStack = getParameterStack(velocityContext); - assertNotNull(paramStack); - assertEquals(0, paramStack.size()); - verify(velocityContext); - - reset(velocityContext); - - paramStack = new ArrayStack>(); - paramStack.push(new HashMap()); - expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); - - replay(velocityContext); - assertEquals(paramStack, getParameterStack(velocityContext)); - verify(velocityContext); - } - - /** - * Test method for {@link org.apache.tiles.velocity.context.VelocityUtil * #setAttribute(org.apache.velocity.context.Context, javax.servlet.http.HttpServletRequest, * javax.servlet.ServletContext, java.lang.String, java.lang.Object, java.lang.String)}. */ @@ -166,4 +138,86 @@ setAttribute(velocityContext, request, servletContext, "myName", value, "application"); verify(velocityContext, request, servletContext); } + + /** + * Test method for + * {@link VelocityUtil#getBodyAsString(InternalContextAdapter, Node)}. + * + * @throws IOException If something goes wrong. + */ + @Test + public void testGetBodyAsString() throws IOException { + InternalContextAdapter context = createMock(InternalContextAdapter.class); + Node node = createMock(Node.class); + ASTBlock block = new CustomBlock(); + + expect(node.jjtGetChild(1)).andReturn(block); + + replay(context, node); + assertEquals("myBody", VelocityUtil.getBodyAsString(context, node)); + verify(context, node); + } + + /** + * Test method for + * {@link VelocityUtil#evaluateBody(InternalContextAdapter, Writer, Node)}. + * + * @throws IOException If something goes wrong. + */ + @Test + public void testEvaluateBody() throws IOException { + InternalContextAdapter context = createMock(InternalContextAdapter.class); + Node node = createMock(Node.class); + Writer writer = createMock(Writer.class); + ASTBlock block = createMock(ASTBlock.class); + + expect(node.jjtGetChild(1)).andReturn(block); + + replay(context, node, writer); + VelocityUtil.evaluateBody(context, writer, node); + verify(context, node, writer); + } + + /** + * Test method for + * {@link VelocityUtil#getBodyAsString(InternalContextAdapter, Node)}. + */ + @SuppressWarnings("unchecked") + @Test + public void testGetParameters() { + InternalContextAdapter context = createMock(InternalContextAdapter.class); + Node node = createMock(Node.class); + ASTMap block = createMock(ASTMap.class); + Map params = createMock(Map.class); + + expect(node.jjtGetChild(0)).andReturn(block); + expect(block.value(context)).andReturn(params); + + replay(context, node, block, params); + assertEquals(params, VelocityUtil.getParameters(context, node)); + verify(context, node, block, params); + } + + /** + * Custom block to render a specific string. + * + * @version $Rev: 902965 $ $Date: 2010-01-25 21:12:46 +0100 (lun, 25 gen 2010) $ + */ + private static class CustomBlock extends ASTBlock { + + /** + * Constructor. + */ + public CustomBlock() { + super(1); + } + + /** {@inheritDoc} */ + @Override + public boolean render(InternalContextAdapter context, Writer writer) + throws IOException { + writer.write("myBody"); + return true; + } + } } diff -Nru tiles-2.2.1/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/VelocityAttributeRendererTest.java tiles-2.2.2/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/VelocityAttributeRendererTest.java --- tiles-2.2.1/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/VelocityAttributeRendererTest.java 2009-10-14 13:08:09.000000000 +0200 +++ tiles-2.2.2/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/VelocityAttributeRendererTest.java 2010-06-17 20:31:47.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: VelocityAttributeRendererTest.java 821299 2009-10-03 12:15:05Z apetrelli $ + * $Id: VelocityAttributeRendererTest.java 831448 2009-10-30 20:39:52Z apetrelli $ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -28,7 +28,7 @@ /** * Tests {@link VelocityAttributeRenderer}. * - * @version $Rev: 821299 $ $Date: 2009-10-03 14:15:05 +0200 (sab, 03 ott 2009) $ + * @version $Rev: 831448 $ $Date: 2009-10-30 21:39:52 +0100 (ven, 30 ott 2009) $ */ public class VelocityAttributeRendererTest { diff -Nru tiles-2.2.1/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java tiles-2.2.2/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java --- tiles-2.2.1/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java 1970-01-01 01:00:00.000000000 +0100 +++ tiles-2.2.2/src/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java 2010-06-17 20:31:47.000000000 +0200 @@ -0,0 +1,126 @@ +/* + * $Id: AddAttributeDirectiveTest.java 902403 2010-01-23 13:31:17Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tiles.velocity.template; + +import static org.easymock.EasyMock.*; +import static org.easymock.classextension.EasyMock.*; + +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.tiles.ArrayStack; +import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.template.AddAttributeModel; +import org.apache.velocity.context.InternalContextAdapter; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests {@link AddAttributeDirective}. + */ +public class AddAttributeDirectiveTest { + + /** + * The model to test. + */ + private AddAttributeDirective model; + + /** + * The template model. + */ + private AddAttributeModel tModel; + + /** + * Sets up the model to test. + */ + @Before + public void setUp() { + tModel = createMock(AddAttributeModel.class); + model = new AddAttributeDirective(tModel); + } + + /** + * Test method for {@link AddAttributeDirective#start(InternalContextAdapter, + * Writer, Map, HttpServletRequest, HttpServletResponse, ServletContext)}. + */ + @Test + public void testStart() { + HttpServletRequest request = createMock(HttpServletRequest.class); + HttpServletResponse response = createMock(HttpServletResponse.class); + InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); + Map params = createParams(); + ArrayStack