You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/07/11 20:35:53 UTC
svn commit: r1360343 - in /tiles/request/branches/TREQ_1_0_X: ./ assembly/
src/site/apt/dev/
tiles-request-api/src/main/java/org/apache/tiles/request/locale/
tiles-request-api/src/test/java/org/apache/tiles/request/locale/
tiles-request-api/src/test/ja...
Author: nlebas
Date: Wed Jul 11 18:35:52 2012
New Revision: 1360343
URL: http://svn.apache.org/viewvc?rev=1360343&view=rev
Log:
merged from trunk
Added:
tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java
- copied unchanged from r1360337, tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java
tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/test/java/org/apache/tiles/request/render/PublisherRendererTest.java
- copied unchanged from r1360337, tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/PublisherRendererTest.java
Modified:
tiles/request/branches/TREQ_1_0_X/ (props changed)
tiles/request/branches/TREQ_1_0_X/assembly/pom.xml
tiles/request/branches/TREQ_1_0_X/pom.xml
tiles/request/branches/TREQ_1_0_X/src/site/apt/dev/release.apt
tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/main/java/org/apache/tiles/request/locale/URLApplicationResource.java
tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java
tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java
tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java
tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java
tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java
tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java
tiles/request/branches/TREQ_1_0_X/tiles-request-portlet/ (props changed)
tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/ (props changed)
tiles/request/branches/TREQ_1_0_X/tiles-request-servlet-wildcard/ (props changed)
tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java
tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java
Propchange: tiles/request/branches/TREQ_1_0_X/
------------------------------------------------------------------------------
svn:mergeinfo = /tiles/request/trunk:1334196-1360337
Modified: tiles/request/branches/TREQ_1_0_X/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/assembly/pom.xml?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/assembly/pom.xml (original)
+++ tiles/request/branches/TREQ_1_0_X/assembly/pom.xml Wed Jul 11 18:35:52 2012
@@ -52,6 +52,13 @@
</configuration>
</plugin>
</plugins>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
</build>
<profiles>
<profile>
@@ -129,7 +136,7 @@
<includes>**</includes>
<toDir>${project.version}</toDir>
<serverId>tiles.build</serverId>
- <url>scp://people.apache.org/www/people.apache.org/builds/tiles</url>
+ <url>scp://people.apache.org/www/people.apache.org/builds/tiles/request</url>
</configuration>
</execution>
</executions>
Modified: tiles/request/branches/TREQ_1_0_X/pom.xml
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/pom.xml?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/pom.xml (original)
+++ tiles/request/branches/TREQ_1_0_X/pom.xml Wed Jul 11 18:35:52 2012
@@ -35,9 +35,9 @@ under the License.
<description>Request abstraction for various request and template technologies</description>
<url>http://tiles.apache.org/tiles-request/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tiles/request/branches/TREQ_1_0_X</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tiles/request/branches/TREQ_1_0_X</developerConnection>
- <url>http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/tiles/request/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tiles/request/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewvc/tiles/request/trunk/</url>
</scm>
<issueManagement>
<system>JIRA</system>
@@ -163,7 +163,7 @@ under the License.
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-autotag-core-runtime</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<optional>true</optional>
</dependency>
<dependency>
Modified: tiles/request/branches/TREQ_1_0_X/src/site/apt/dev/release.apt
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/src/site/apt/dev/release.apt?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/src/site/apt/dev/release.apt (original)
+++ tiles/request/branches/TREQ_1_0_X/src/site/apt/dev/release.apt Wed Jul 11 18:35:52 2012
@@ -136,8 +136,10 @@ mvn release:prepare -Dusername=YOUR_SVN_
-----------------------------------
The plugin interactively will ask you the version to release, the Subversion
- tag to use and the next snapshot version. It is reccomended to use the tag:
- <<tiles-X.X.X>>.
+ tag to use and the next snapshot version. It is recommended to use the tag:
+ <<tiles-request-X.X.X>>.
+
+ See also {{{http://www.apache.org/dev/publishing-maven-artifacts.html}the recommendations of the ASF}}.
* Perform the Release
@@ -146,6 +148,8 @@ mvn release:prepare -Dusername=YOUR_SVN_
-----------------------------------
mvn release:perform
-----------------------------------
+
+ It should compile and test everything, build and upload the artifacts and the website for the project.
* Close the staging repository
@@ -168,32 +172,11 @@ mvn release:perform
Note the repository URL, you will need this in your vote email.
-* Digest and upload assemblies
+* Verify the uploaded assemblies
- * Go into the release assembly target directory:
-
------------------------------------
-cd target/checkout/assembly/target/assembly/out
------------------------------------
-
- * Create MD5 and SHA1 files for each files (including ASC files). You can do
- it with this simple shell script:
-
------------------------------------
-#!/bin/sh
-
-for fileitem in *
-do
- openssl md5 < $fileitem > $fileitem.md5
- openssl sha1 < $fileitem > $fileitem.sha1
-done
------------------------------------
-
- * Upload everything to the build site:
-
------------------------------------
-scp * user@people.apache.org:/www/people.apache.org/builds/tiles/${version}
------------------------------------
+ * go to the destination directory on people.apache.org (cd /www/people.apache.org/builds/tiles/request/${version}).
+
+ * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1).
* Release the JIRA version
@@ -208,12 +191,12 @@ scp * user@people.apache.org:/www/people
In <<developers mailing list>> send an announcement for the test build:
-----------------------------------
-Subject: [ANNOUNCE] Tiles ${version} test build available
+Subject: [ANNOUNCE] Tiles Request ${version} test build available
-The test build of Tiles ${version} is available.
+The test build of Tiles Request ${version} is available.
-No determination as to the quality ('alpha,' 'beta,' or 'GA') of Tiles
+No determination as to the quality ('alpha,' 'beta,' or 'GA') of Tiles Request
${version} has been made, and at this time it is simply a "test build". We
welcome any comments you may have, and will take all feedback into
account if a quality vote is called for this build.
@@ -224,7 +207,7 @@ Release notes:
Distribution:
- * http://people.apache.org/builds/tiles/${version}/
+ * http://people.apache.org/builds/tiles/request/${version}/
Maven 2 staging repository:
@@ -240,9 +223,9 @@ within the next couple of days.
<<developers mailing list>>.
-----------------------------------
-Subject: [VOTE] ${version} Release Quality
+Subject: [VOTE] Tiles Request ${version} Release Quality
-The Tiles ${version} test build has been available since ${testBuildDate}.
+The Tiles Request ${version} test build has been available since ${testBuildDate}.
Release notes:
@@ -250,7 +233,7 @@ Release notes:
Distribution:
- * http://people.apache.org/builds/tiles/${version}/
+ * http://people.apache.org/builds/tiles/request/${version}/
Maven 2 staging repository:
@@ -294,9 +277,9 @@ three binding +1s and more +1s than -1s.
-------------------------------------------
ssh user@people.apache.org
-cd /www/people.apache.org/builds/tiles/${version}
-mkdir /www/www.apache.org/dist/tiles/v${version}/
-cp * /www/www.apache.org/dist/tiles/v${version}/
+cd /www/people.apache.org/builds/tiles/request/${version}
+mkdir /www/www.apache.org/dist/tiles/request/v${version}/
+cp * /www/www.apache.org/dist/tiles/request/v${version}/
-------------------------------------------
** Update the site
@@ -322,23 +305,23 @@ mvn site:deploy
list>>:
--------------------------------------
-Subject: [ANNOUNCE] Tiles ${version} ${quality} released
+Subject: [ANNOUNCE] Tiles Request ${version} ${quality} released
-The Apache Tiles team is pleased to announce the release of Tiles ${version}
+The Apache Request Tiles team is pleased to announce the release of Tiles ${version}
${quality}.
-Tiles ${version} is available in a binary and a source distribution.
+Tiles Request ${version} is available in a binary and a source distribution.
http://tiles.apache.org/download.html
It is also available in the central Maven repository under Group ID
"org.apache.tiles".
-The 2.0.x series of the Apache Tiles framework has a minimum
+The 1.0.x series of the Apache Tiles Request framework has a minimum
requirement of the following specification versions:
-* Java Servlet 2.4 and JavaServer Pages (JSP) 2.0
-* Java Standard Edition (Java SE) 1.5
+* Java Servlet 2.5 and JavaServer Pages (JSP) 2.1
+* Java Standard Edition (Java SE) 1.6
The release notes are available online at:
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/main/java/org/apache/tiles/request/locale/URLApplicationResource.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/main/java/org/apache/tiles/request/locale/URLApplicationResource.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/main/java/org/apache/tiles/request/locale/URLApplicationResource.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/main/java/org/apache/tiles/request/locale/URLApplicationResource.java Wed Jul 11 18:35:52 2012
@@ -46,7 +46,7 @@ public class URLApplicationResource exte
/**
* Creates a URLApplicationResource for the specified path that can be accessed through the specified URL.
- *
+ *
* @param localePath the path including localization.
* @param url the URL where the contents can be found.
*/
@@ -60,16 +60,16 @@ public class URLApplicationResource exte
/**
* Creates a URLApplicationResource for the specified path that can be accessed through the specified URL.
- *
+ *
* @param path the path excluding localization.
* @param locale the Locale.
* @param url the URL where the contents can be found.
*/
public URLApplicationResource(String path, Locale locale, URL url) throws MalformedURLException {
super(path, locale);
- this.url = new URL(url, getLocalePath());
+ this.url = url;
if ("file".equals(url.getProtocol())) {
- file = new File(this.url.getPath());
+ file = new File(url.getPath());
}
}
@@ -104,4 +104,12 @@ public class URLApplicationResource exte
public String toString() {
return "Resource " + getLocalePath() + " at " + url.toString();
}
+
+ protected URL getURL(){
+ return url;
+ }
+
+ protected File getFile(){
+ return file;
+ }
}
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java Wed Jul 11 18:35:52 2012
@@ -36,7 +36,7 @@ import freemarker.template.TemplateModel
/**
* A Runtime for implementing a Freemarker Template Directive.
*/
-public class FreemarkerAutotagRuntime implements AutotagRuntime, TemplateDirectiveModel {
+public class FreemarkerAutotagRuntime implements AutotagRuntime<Request>, TemplateDirectiveModel {
private Environment env;
private TemplateDirectiveBody body;
@@ -65,7 +65,7 @@ public class FreemarkerAutotagRuntime im
/** {@inheritDoc} */
@Override
- public Object getParameter(String name, Object defaultValue) {
- return FreemarkerUtil.getAsObject((TemplateModel)params.get(name), defaultValue);
+ public <T> T getParameter(String name, Class<T> type, T defaultValue) {
+ return FreemarkerUtil.getAsObject((TemplateModel)params.get(name), type, defaultValue);
}
}
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java Wed Jul 11 18:35:52 2012
@@ -46,11 +46,12 @@ public final class FreemarkerUtil {
* model, or null if not specified.
* @return The unwrapped object.
*/
- public static Object getAsObject(TemplateModel model, Object defaultValue) {
+ public static <T> T getAsObject(TemplateModel model, Class<T> type, T defaultValue) {
try {
- Object retValue = defaultValue;
+ T retValue = defaultValue;
if (model != null) {
- Object value = DeepUnwrap.unwrap(model);
+ @SuppressWarnings("unchecked")
+ T value = (T) DeepUnwrap.unwrap(model);
if (value != null) {
retValue = value;
}
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntimeTest.java Wed Jul 11 18:35:52 2012
@@ -147,10 +147,10 @@ public class FreemarkerAutotagRuntimeTes
replay(model, params, body);
FreemarkerAutotagRuntime runtime = new FreemarkerAutotagRuntime();
runtime.execute(env, params, new TemplateModel[0], body);
- Object notnullParam = runtime.getParameter("notnullParam", null);
- Object nullParam = runtime.getParameter("nullParam", null);
- Object notnullParamDefault = runtime.getParameter("notnullParam", new Integer(24));
- Object nullParamDefault = runtime.getParameter("nullParam", new Integer(24));
+ Object notnullParam = runtime.getParameter("notnullParam", Object.class, null);
+ Object nullParam = runtime.getParameter("nullParam", Object.class, null);
+ int notnullParamDefault = runtime.getParameter("notnullParam", Integer.class, new Integer(24));
+ int nullParamDefault = runtime.getParameter("nullParam", Integer.class, new Integer(24));
assertEquals(42, notnullParam);
assertEquals(null, nullParam);
assertEquals(42, notnullParamDefault);
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtilTest.java Wed Jul 11 18:35:52 2012
@@ -62,7 +62,7 @@ public class FreemarkerUtilTest {
new Environment(template, rootDataModel, out);
replay(model);
- assertEquals(new Integer(42), FreemarkerUtil.getAsObject(model, new Integer(1)));
+ assertEquals(new Integer(42), FreemarkerUtil.getAsObject(model, Integer.class, new Integer(1)));
verify(template, rootDataModel, out, model);
}
@@ -81,7 +81,7 @@ public class FreemarkerUtilTest {
replay(template, rootDataModel, out);
new Environment(template, rootDataModel, out);
- assertEquals(new Integer(1), FreemarkerUtil.getAsObject(null, new Integer(1)));
+ assertEquals(new Integer(1), FreemarkerUtil.getAsObject(null, Integer.class, new Integer(1)));
verify(template, rootDataModel, out);
}
@@ -104,7 +104,7 @@ public class FreemarkerUtilTest {
replay(model);
try {
- assertEquals(new Integer(42), FreemarkerUtil.getAsObject(model, new Integer(1)));
+ assertEquals(new Integer(42), FreemarkerUtil.getAsObject(model, Integer.class, new Integer(1)));
} finally {
verify(template, rootDataModel, out, model);
}
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java Wed Jul 11 18:35:52 2012
@@ -31,7 +31,7 @@ import org.apache.tiles.request.jsp.JspR
/**
* A Runtime for implementing JSP tag libraries.
*/
-public class JspAutotagRuntime extends SimpleTagSupport implements AutotagRuntime {
+public class JspAutotagRuntime extends SimpleTagSupport implements AutotagRuntime<Request> {
/** {@inheritDoc} */
@Override
public void doTag() {
@@ -55,7 +55,7 @@ public class JspAutotagRuntime extends S
/** {@inheritDoc} */
@Override
- public Object getParameter(String name, Object defaultValue) {
+ public <T> T getParameter(String name, Class<T> type, T defaultValue) {
throw new UnsupportedOperationException("the parameters are injected into the tag itself, no need to fetch them");
}
}
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-jsp/src/test/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntimeTest.java Wed Jul 11 18:35:52 2012
@@ -94,7 +94,7 @@ public class JspAutotagRuntimeTest {
runtime.setJspContext(jspContext);
runtime.setParent(parent);
runtime.doTag();
- runtime.getParameter("test", null);
+ runtime.getParameter("test", Object.class, null);
verify(jspBody, jspContext, parent);
}
}
Propchange: tiles/request/branches/TREQ_1_0_X/tiles-request-portlet/
------------------------------------------------------------------------------
Merged /tiles/request/trunk/tiles-request-portlet:r1334196-1360337
Propchange: tiles/request/branches/TREQ_1_0_X/tiles-request-portlet-wildcard/
------------------------------------------------------------------------------
Merged /tiles/request/trunk/tiles-request-portlet-wildcard:r1334196-1360337
Propchange: tiles/request/branches/TREQ_1_0_X/tiles-request-servlet-wildcard/
------------------------------------------------------------------------------
Merged /tiles/request/trunk/tiles-request-servlet-wildcard:r1334196-1360337
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java Wed Jul 11 18:35:52 2012
@@ -40,7 +40,7 @@ import org.apache.velocity.tools.view.Vi
/**
* A Runtime for implementing Velocity Directives.
*/
-public class VelocityAutotagRuntime extends Directive implements AutotagRuntime {
+public class VelocityAutotagRuntime extends Directive implements AutotagRuntime<Request> {
private InternalContextAdapter context;
private Writer writer;
private Node node;
@@ -70,12 +70,12 @@ public class VelocityAutotagRuntime exte
/** {@inheritDoc} */
@Override
@SuppressWarnings("unchecked")
- public Object getParameter(String name, Object defaultValue) {
+ public <T> T getParameter(String name, Class<T> type, T defaultValue) {
if (params == null) {
ASTMap astMap = (ASTMap) node.jjtGetChild(0);
params = (Map<String, Object>) astMap.value(context);
}
- Object result = params.get(name);
+ T result = (T) params.get(name);
if (result == null) {
result = defaultValue;
}
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java?rev=1360343&r1=1360342&r2=1360343&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-velocity/src/test/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntimeTest.java Wed Jul 11 18:35:52 2012
@@ -97,10 +97,10 @@ public class VelocityAutotagRuntimeTest
replay(context, writer, node, astMap, params);
VelocityAutotagRuntime runtime = new VelocityAutotagRuntime();
runtime.render(context, writer, node);
- Object notnullParam = runtime.getParameter("notnullParam", null);
- Object nullParam = runtime.getParameter("nullParam", null);
- Object notnullParamDefault = runtime.getParameter("notnullParam", new Integer(24));
- Object nullParamDefault = runtime.getParameter("nullParam", new Integer(24));
+ Object notnullParam = runtime.getParameter("notnullParam", Object.class, null);
+ Object nullParam = runtime.getParameter("nullParam", Object.class, null);
+ int notnullParamDefault = runtime.getParameter("notnullParam", Integer.class, new Integer(24));
+ int nullParamDefault = runtime.getParameter("nullParam", Integer.class, new Integer(24));
assertEquals(42, notnullParam);
assertEquals(null, nullParam);
assertEquals(42, notnullParamDefault);