You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2011/02/03 12:49:12 UTC
svn commit: r1066788 - in /tiles/sandbox/trunk:
tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/
tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/
tiles-request/...
Author: apetrelli
Date: Thu Feb 3 11:49:11 2011
New Revision: 1066788
URL: http://svn.apache.org/viewvc?rev=1066788&view=rev
Log:
TILESSB-38
Fixed tiles-request-freemarker code style.
Modified one servlet name in tiles-request-freemarker.
Using Jetty 7 embedded to run Selenium tests, so you don't have to install Tomcat.
Added:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/package-info.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/package-info.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/package-info.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableLoaderFreemarkerServlet.java
- copied, changed from r1058082, tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/TilesFreemarkerServlet.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/package-info.java
Removed:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/TilesFreemarkerServlet.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/package.html
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestException.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletException.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/AttributeValueFreemarkerServlet.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererBuilder.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableFactory.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/EnvironmentScopeMapTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestExceptionTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtilTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletExceptionTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java
tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java Thu Feb 3 11:49:11 2011
@@ -45,6 +45,9 @@ import freemarker.ext.servlet.HttpReques
*/
public class FreemarkerRequest extends AbstractViewRequest {
+ /**
+ * The natively available scopes. In fact, only "page".
+ */
private static final String[] SCOPES = {"page"};
/**
@@ -52,6 +55,9 @@ public class FreemarkerRequest extends A
*/
private Environment env;
+ /**
+ * The page scope map.
+ */
private Map<String, Object> pageScope;
/**
@@ -59,6 +65,13 @@ public class FreemarkerRequest extends A
*/
private transient Object[] requestObjects;
+ /**
+ * Creates a new Freemarker request.
+ *
+ * @param applicationContext The application context.
+ * @param env The Freemarker's environment object.
+ * @return A new request.
+ */
public static FreemarkerRequest createServletFreemarkerRequest(
ApplicationContext applicationContext, Environment env) {
HttpRequestHashModel requestModel = FreemarkerRequestUtil
@@ -100,6 +113,11 @@ public class FreemarkerRequest extends A
return env.getLocale();
}
+ /**
+ * Returns the page scope.
+ *
+ * @return The page scope.
+ */
public Map<String, Object> getPageScope() {
if (pageScope == null) {
pageScope = new EnvironmentScopeMap(env);
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestException.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestException.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestException.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestException.java Thu Feb 3 11:49:11 2011
@@ -1,20 +1,64 @@
+/*
+ * $Id$
+ *
+ * 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.request.freemarker;
import org.apache.tiles.request.RequestException;
+/**
+ * Thrown when a Freemarker request fails.
+ *
+ * @version $Rev$ $Date$
+ */
public class FreemarkerRequestException extends RequestException {
+ /**
+ * Constructor.
+ */
public FreemarkerRequestException() {
}
+ /**
+ * Constructor.
+ *
+ * @param message The detail message.
+ */
public FreemarkerRequestException(String message) {
super(message);
}
+ /**
+ * Constructor.
+ *
+ * @param cause The cause to be wrapped.
+ */
public FreemarkerRequestException(Throwable cause) {
super(cause);
}
+ /**
+ * Constructor.
+ *
+ * @param message The detail message.
+ * @param cause The cause to be wrapped.
+ */
public FreemarkerRequestException(String message, Throwable cause) {
super(message, cause);
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java Thu Feb 3 11:49:11 2011
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * 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.request.freemarker;
import org.apache.tiles.request.ApplicationContext;
@@ -9,8 +29,16 @@ import freemarker.ext.servlet.HttpReques
import freemarker.ext.servlet.ServletContextHashModel;
import freemarker.template.TemplateModelException;
+/**
+ * Utilities to work with Freemarker requests.
+ *
+ * @version $Rev$ $Date$
+ */
public final class FreemarkerRequestUtil {
+ /**
+ * Constructor.
+ */
private FreemarkerRequestUtil() {
}
@@ -50,6 +78,14 @@ public final class FreemarkerRequestUtil
}
}
+ /**
+ * Returns the application context. It must be
+ * first saved creating an {@link ApplicationContext} and using
+ * {@link org.apache.tiles.request.util.ApplicationAccess#register(ApplicationContext)}.
+ *
+ * @param env The Freemarker environment.
+ * @return The
+ */
public static ApplicationContext getApplicationContext(
Environment env) {
return ServletUtil
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletException.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletException.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletException.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletException.java Thu Feb 3 11:49:11 2011
@@ -1,21 +1,65 @@
+/*
+ * $Id$
+ *
+ * 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.request.freemarker;
import org.apache.tiles.request.NotAvailableFeatureException;
+/**
+ * Thrown when a the Freemarker servlet is not available.
+ *
+ * @version $Rev$ $Date$
+ */
public class NotAvailableFreemarkerServletException extends
NotAvailableFeatureException {
+ /**
+ * Constructor.
+ */
public NotAvailableFreemarkerServletException() {
}
+ /**
+ * Constructor.
+ *
+ * @param message The detail message.
+ */
public NotAvailableFreemarkerServletException(String message) {
super(message);
}
+ /**
+ * Constructor.
+ *
+ * @param e The cause to be wrapped.
+ */
public NotAvailableFreemarkerServletException(Throwable e) {
super(e);
}
+ /**
+ * Constructor.
+ *
+ * @param message The detail message.
+ * @param e The cause to be wrapped.
+ */
public NotAvailableFreemarkerServletException(String message, Throwable e) {
super(message, e);
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java Thu Feb 3 11:49:11 2011
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * 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.request.freemarker.extractor;
import java.util.Enumeration;
@@ -11,10 +31,23 @@ import freemarker.template.TemplateModel
import freemarker.template.TemplateModelException;
import freemarker.template.utility.DeepUnwrap;
+/**
+ * Extract attributes from {@link Environment} objects as a scope.
+ *
+ * @version $Rev$ $Date$
+ */
public class EnvironmentScopeExtractor implements AttributeExtractor {
+ /**
+ * The environment.
+ */
private Environment request;
+ /**
+ * Constructor.
+ *
+ * @param request The environment.
+ */
public EnvironmentScopeExtractor(Environment request) {
this.request = request;
}
Added: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/package-info.java?rev=1066788&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/package-info.java (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/extractor/package-info.java Thu Feb 3 11:49:11 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z 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.
+ */
+/**
+ * Extractors to get information from Freemarker objects.
+ */
+package org.apache.tiles.request.freemarker.extractor;
Added: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/package-info.java?rev=1066788&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/package-info.java (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/package-info.java Thu Feb 3 11:49:11 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z 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.
+ */
+/**
+ * Support for Freemarker's Environment as a request.
+ */
+package org.apache.tiles.request.freemarker;
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/AttributeValueFreemarkerServlet.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/AttributeValueFreemarkerServlet.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/AttributeValueFreemarkerServlet.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/AttributeValueFreemarkerServlet.java Thu Feb 3 11:49:11 2011
@@ -1,14 +1,37 @@
+/*
+ * $Id$
+ *
+ * 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.request.freemarker.render;
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.request.freemarker.servlet.TilesFreemarkerServlet;
+import org.apache.tiles.request.freemarker.servlet.SharedVariableLoaderFreemarkerServlet;
/**
- * Extends {@link TilesFreemarkerServlet} to use the attribute value as the template name.
+ * Extends {@link SharedVariableLoaderFreemarkerServlet} to use the attribute value as the template name.
*/
-public class AttributeValueFreemarkerServlet extends TilesFreemarkerServlet {
+public class AttributeValueFreemarkerServlet extends SharedVariableLoaderFreemarkerServlet {
+ /**
+ * The serial UID.
+ */
private static final long serialVersionUID = 5412169082301451211L;
/**
@@ -31,4 +54,4 @@ public class AttributeValueFreemarkerSer
protected String requestUrlToTemplatePath(HttpServletRequest request) {
return valueHolder.get();
}
-}
\ No newline at end of file
+}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRenderer.java Thu Feb 3 11:49:11 2011
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRes
import org.apache.tiles.request.Request;
import org.apache.tiles.request.freemarker.FreemarkerRequestException;
-import org.apache.tiles.request.freemarker.servlet.TilesFreemarkerServlet;
import org.apache.tiles.request.render.CannotRenderException;
import org.apache.tiles.request.render.TypeDetectingRenderer;
import org.apache.tiles.request.servlet.ExternalWriterHttpServletResponse;
@@ -38,7 +37,7 @@ import org.apache.tiles.request.servlet.
/**
* FreeMarker renderer for rendering FreeMarker templates as Tiles attributes.
* It is only usable under a Servlet environment, because it uses
- * {@link TilesFreemarkerServlet} internally to forward the request.<br/>
+ * {@link AttributeValueFreemarkerServlet} internally to forward the request.<br/>
* To initialize it correctly, call {@link #setParameter(String, String)} for all the
* parameters that you want to set, and then call {@link #commit()}.
*
@@ -52,6 +51,11 @@ public class FreemarkerRenderer implemen
*/
private AttributeValueFreemarkerServlet servlet;
+ /**
+ * Constructor.
+ *
+ * @param servlet The servlet to use.
+ */
public FreemarkerRenderer(AttributeValueFreemarkerServlet servlet) {
this.servlet = servlet;
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererBuilder.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererBuilder.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererBuilder.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererBuilder.java Thu Feb 3 11:49:11 2011
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * 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.request.freemarker.render;
import java.util.HashMap;
@@ -8,7 +28,12 @@ import javax.servlet.ServletException;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.freemarker.FreemarkerRequestException;
-public class FreemarkerRendererBuilder {
+/**
+ * Builds instances of {@link FreemarkerRenderer}.
+ *
+ * @version $Rev$ $Date$
+ */
+public final class FreemarkerRendererBuilder {
/**
* The initialization parameters.
@@ -22,9 +47,17 @@ public class FreemarkerRendererBuilder {
*/
private ApplicationContext applicationContext;
+ /**
+ * Constructor.
+ */
private FreemarkerRendererBuilder() {
}
+ /**
+ * Creates a new instance of this class.
+ *
+ * @return A new instance of the builder.
+ */
public static FreemarkerRendererBuilder createInstance() {
return new FreemarkerRendererBuilder();
}
@@ -34,7 +67,7 @@ public class FreemarkerRendererBuilder {
*
* @param key The name of the parameter.
* @param value The value of the parameter.
- * @since 2.2.0
+ * @return This object.
*/
public FreemarkerRendererBuilder setParameter(String key, String value) {
params.put(key, value);
@@ -45,13 +78,18 @@ public class FreemarkerRendererBuilder {
* Sets the application context.
*
* @param applicationContext The application context.
- * @since 3.0.0
+ * @return This object.
*/
public FreemarkerRendererBuilder setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
return this;
}
+ /**
+ * Creates a new {@link FreemarkerRenderer} with the given configuration.
+ *
+ * @return A new Freemarker renderer.
+ */
public FreemarkerRenderer build() {
AttributeValueFreemarkerServlet servlet = new AttributeValueFreemarkerServlet();
try {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/InitParamsServletConfig.java Thu Feb 3 11:49:11 2011
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * 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.request.freemarker.render;
import java.util.Enumeration;
@@ -31,6 +51,12 @@ public class InitParamsServletConfig imp
*/
private ApplicationContext applicationContext;
+ /**
+ * Constructor.
+ *
+ * @param params Configuration parameters.
+ * @param applicationContext The application context.
+ */
public InitParamsServletConfig(Map<String, String> params, ApplicationContext applicationContext) {
this.params = params;
this.applicationContext = applicationContext;
@@ -56,4 +82,4 @@ public class InitParamsServletConfig imp
public String getServletName() {
return "FreeMarker Attribute Renderer";
}
-}
\ No newline at end of file
+}
Added: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/package-info.java?rev=1066788&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/package-info.java (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/render/package-info.java Thu Feb 3 11:49:11 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z 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.
+ */
+/**
+ * Rendering of Freemarker templates.
+ */
+package org.apache.tiles.request.freemarker.render;
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableFactory.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableFactory.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableFactory.java Thu Feb 3 11:49:11 2011
@@ -1,8 +1,38 @@
+/*
+ * $Id$
+ *
+ * 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.request.freemarker.servlet;
import freemarker.template.TemplateModel;
+/**
+ * It is an object that can create a shared variable, as a template model.
+ *
+ * @version $Rev$ $Date$
+ */
public interface SharedVariableFactory {
+ /**
+ * Creates a new shared variable.
+ *
+ * @return The shared variable.
+ */
TemplateModel create();
}
Copied: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableLoaderFreemarkerServlet.java (from r1058082, tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/TilesFreemarkerServlet.java)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableLoaderFreemarkerServlet.java?p2=tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableLoaderFreemarkerServlet.java&p1=tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/TilesFreemarkerServlet.java&r1=1058082&r2=1066788&rev=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/TilesFreemarkerServlet.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/SharedVariableLoaderFreemarkerServlet.java Thu Feb 3 11:49:11 2011
@@ -41,21 +41,33 @@ import freemarker.template.Configuration
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class TilesFreemarkerServlet extends FreemarkerServlet {
+public class SharedVariableLoaderFreemarkerServlet extends FreemarkerServlet {
+ /**
+ * The serial UID.
+ */
private static final long serialVersionUID = 4301098067909854507L;
- public static String CUSTOM_SHARED_VARIABLE_FACTORIES_INIT_PARAM =
+ /**
+ * The init parameter under which the factories will be put. The value of the parameter
+ * must be a semicolon (;) separated list of couples, each member of the couple must
+ * be separated by commas (,).
+ */
+ public static final String CUSTOM_SHARED_VARIABLE_FACTORIES_INIT_PARAM =
"org.apache.tiles.request.freemarker.CUSTOM_SHARED_VARIABLE_FACTORIES";
- private Map<String, SharedVariableFactory> name2variableFactory = new LinkedHashMap<String, SharedVariableFactory>();
+ /**
+ * Maps a name of a shared variable to its factory.
+ */
+ private Map<String, SharedVariableFactory> name2variableFactory =
+ new LinkedHashMap<String, SharedVariableFactory>();
@Override
public void init(ServletConfig config) throws ServletException {
String param = config.getInitParameter(CUSTOM_SHARED_VARIABLE_FACTORIES_INIT_PARAM);
if (param != null) {
String[] couples = param.split("\\s*;\\s*");
- for (int i=0; i < couples.length; i++) {
+ for (int i = 0; i < couples.length; i++) {
String[] couple = couples[i].split("\\s*,\\s*");
if (couple == null || couple.length != 2) {
throw new ServletException(
@@ -69,6 +81,12 @@ public class TilesFreemarkerServlet exte
super.init(new ExcludingParameterServletConfig(config));
}
+ /**
+ * Adds anew shared variable factory in a manual way.
+ *
+ * @param variableName The name of the shared variable.
+ * @param factory The shared variable factory.
+ */
public void addSharedVariableFactory(String variableName, SharedVariableFactory factory) {
name2variableFactory.put(variableName, factory);
}
@@ -91,10 +109,23 @@ public class TilesFreemarkerServlet exte
return new WebappClassTemplateLoader(getServletContext());
}
+ /**
+ * Servlet configuration that excludes some parameters. It is useful to adapt to
+ * FreemarkerServlet behaviour, because it gets angry if it sees some extra
+ * parameters that it does not recognize.
+ */
private class ExcludingParameterServletConfig implements ServletConfig {
+ /**
+ * The servlet configuration.
+ */
private ServletConfig config;
+ /**
+ * Constructor.
+ *
+ * @param config The servlet configuration.
+ */
public ExcludingParameterServletConfig(ServletConfig config) {
this.config = config;
}
@@ -125,12 +156,28 @@ public class TilesFreemarkerServlet exte
}
+ /**
+ * An enumeration that skip just
+ * {@link SharedVariableLoaderFreemarkerServlet#CUSTOM_SHARED_VARIABLE_FACTORIES_INIT_PARAM},
+ * again not to let the FreemarkerServlet be angry about it.
+ */
private static class SkippingEnumeration implements Enumeration<String> {
+ /**
+ * The original enumeration.
+ */
private Enumeration<String> enumeration;
+ /**
+ * The next element.
+ */
private String next = null;
+ /**
+ * Constructor.
+ *
+ * @param enumeration The original enumeration.
+ */
public SkippingEnumeration(Enumeration<String> enumeration) {
this.enumeration = enumeration;
updateNextElement();
@@ -148,11 +195,20 @@ public class TilesFreemarkerServlet exte
return retValue;
}
+ /**
+ * Updates the next element that will be passed.
+ */
private void updateNextElement() {
String value = null;
- while (this.enumeration.hasMoreElements()
- && (value = this.enumeration.nextElement())
- .equals(CUSTOM_SHARED_VARIABLE_FACTORIES_INIT_PARAM));
+ boolean done = false;
+ while (this.enumeration.hasMoreElements() && !done) {
+ value = this.enumeration.nextElement();
+ if (value.equals(CUSTOM_SHARED_VARIABLE_FACTORIES_INIT_PARAM)) {
+ value = null;
+ } else {
+ done = true;
+ }
+ }
next = value;
}
Added: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/package-info.java?rev=1066788&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/package-info.java (added)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/request/freemarker/servlet/package-info.java Thu Feb 3 11:49:11 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z 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.
+ */
+/**
+ * Servlets for easy addition of shared variables.
+ */
+package org.apache.tiles.request.freemarker.servlet;
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/EnvironmentScopeMapTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/EnvironmentScopeMapTest.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/EnvironmentScopeMapTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/EnvironmentScopeMapTest.java Thu Feb 3 11:49:11 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.request.freemarker;
@@ -57,7 +74,7 @@ public class EnvironmentScopeMapTest {
* @throws TemplateModelException If something goes wrong.
*/
@SuppressWarnings("unchecked")
- @Test(expected=FreemarkerRequestException.class)
+ @Test(expected = FreemarkerRequestException.class)
public void testKeySetException() throws TemplateModelException {
Template template = createMock(Template.class);
TemplateHashModelEx model = createMock(TemplateHashModelEx.class);
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestExceptionTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestExceptionTest.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestExceptionTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestExceptionTest.java Thu Feb 3 11:49:11 2011
@@ -64,7 +64,7 @@ public class FreemarkerRequestExceptionT
}
/**
- * Test method for {@link FreemarkerRequestException#FreemarkerRequestException(java.lang.String, java.lang.Throwable)}.
+ * Test method for {@link FreemarkerRequestException#FreemarkerRequestException(String, Throwable)}.
*/
@Test
public void testFreemarkerRequestExceptionStringThrowable() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestTest.java Thu Feb 3 11:49:11 2011
@@ -212,8 +212,6 @@ public class FreemarkerRequestTest {
/**
* Tests {@link FreemarkerRequest#getPrintWriter()}.
- *
- * @throws IOException If something goes wrong.
*/
@Test
public void testGetPrintWriter() {
@@ -228,8 +226,6 @@ public class FreemarkerRequestTest {
/**
* Tests {@link FreemarkerRequest#getPrintWriter()}.
- *
- * @throws IOException If something goes wrong.
*/
@Test
public void testGetPrintWriterPrintWriter() {
@@ -252,8 +248,6 @@ public class FreemarkerRequestTest {
/**
* Tests {@link FreemarkerRequest#getWriter()}.
- *
- * @throws IOException If something goes wrong.
*/
@Test
public void testGetWriter() {
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtilTest.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtilTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtilTest.java Thu Feb 3 11:49:11 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.request.freemarker;
@@ -16,7 +33,6 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.freemarker.FreemarkerRequestUtil;
import org.apache.tiles.request.util.ApplicationAccess;
import org.junit.Before;
import org.junit.Test;
@@ -72,7 +88,7 @@ public class FreemarkerRequestUtilTest {
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.FreemarkerRequestUtil#getRequestHashModel(freemarker.core.Environment)}.
+ * Test method for {@link FreemarkerRequestUtil#getRequestHashModel(freemarker.core.Environment)}.
* @throws TemplateModelException If something goes wrong.
*/
@Test
@@ -92,10 +108,10 @@ public class FreemarkerRequestUtilTest {
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.FreemarkerRequestUtil#getRequestHashModel(freemarker.core.Environment)}.
+ * Test method for {@link FreemarkerRequestUtil#getRequestHashModel(freemarker.core.Environment)}.
* @throws TemplateModelException If something goes wrong.
*/
- @Test(expected=NotAvailableFreemarkerServletException.class)
+ @Test(expected = NotAvailableFreemarkerServletException.class)
public void testGetRequestHashModelException() throws TemplateModelException {
HttpServletRequest request = createMock(HttpServletRequest.class);
ObjectWrapper objectWrapper = createMock(ObjectWrapper.class);
@@ -115,7 +131,7 @@ public class FreemarkerRequestUtilTest {
/**
- * Test method for {@link org.apache.tiles.request.freemarker.FreemarkerRequestUtil
+ * Test method for {@link FreemarkerRequestUtil
* #getServletContextHashModel(freemarker.core.Environment)}.
* @throws TemplateModelException If something goes wrong.
*/
@@ -139,11 +155,11 @@ public class FreemarkerRequestUtilTest {
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.FreemarkerRequestUtil
+ * Test method for {@link FreemarkerRequestUtil
* #getServletContextHashModel(freemarker.core.Environment)}.
* @throws TemplateModelException If something goes wrong.
*/
- @Test(expected=NotAvailableFreemarkerServletException.class)
+ @Test(expected = NotAvailableFreemarkerServletException.class)
public void testGetServletContextHashModelException() throws TemplateModelException {
GenericServlet servlet = createMock(GenericServlet.class);
ObjectWrapper objectWrapper = createMock(ObjectWrapper.class);
@@ -163,7 +179,7 @@ public class FreemarkerRequestUtilTest {
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.FreemarkerRequestUtil
+ * Test method for {@link FreemarkerRequestUtil
* #getApplicationContext(Environment)}.
* @throws TemplateModelException If something goes wrong.
*/
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletExceptionTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletExceptionTest.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletExceptionTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/NotAvailableFreemarkerServletExceptionTest.java Thu Feb 3 11:49:11 2011
@@ -43,7 +43,7 @@ public class NotAvailableFreemarkerServl
}
/**
- * Test method for {@link NotAvailableFreemarkerServletException#NotAvailableFreemarkerServletException(java.lang.String)}.
+ * Test method for {@link NotAvailableFreemarkerServletException#NotAvailableFreemarkerServletException(String)}.
*/
@Test
public void testNotAvailableFreemarkerServletExceptionString() {
@@ -53,7 +53,7 @@ public class NotAvailableFreemarkerServl
}
/**
- * Test method for {@link NotAvailableFreemarkerServletException#NotAvailableFreemarkerServletException(java.lang.Throwable)}.
+ * Test method for {@link NotAvailableFreemarkerServletException#NotAvailableFreemarkerServletException(Throwable)}.
*/
@Test
public void testNotAvailableFreemarkerServletExceptionThrowable() {
@@ -64,12 +64,14 @@ public class NotAvailableFreemarkerServl
}
/**
- * Test method for {@link NotAvailableFreemarkerServletException#NotAvailableFreemarkerServletException(java.lang.String, java.lang.Throwable)}.
+ * Test method for
+ * {@link NotAvailableFreemarkerServletException#NotAvailableFreemarkerServletException(String, Throwable)}.
*/
@Test
public void testNotAvailableFreemarkerServletExceptionStringThrowable() {
Throwable cause = new Throwable();
- NotAvailableFreemarkerServletException exception = new NotAvailableFreemarkerServletException("my message", cause);
+ NotAvailableFreemarkerServletException exception =
+ new NotAvailableFreemarkerServletException("my message", cause);
assertEquals("my message", exception.getMessage());
assertEquals(cause, exception.getCause());
}
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractorTest.java Thu Feb 3 11:49:11 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.request.freemarker.extractor;
@@ -35,7 +52,7 @@ import freemarker.template.TemplateScala
public class EnvironmentScopeExtractorTest {
/**
- * Test method for {@link org.apache.tiles.request.freemarker.extractor.EnvironmentScopeExtractor#removeValue(java.lang.String)}.
+ * Test method for {@link EnvironmentScopeExtractor#removeValue(java.lang.String)}.
* @throws TemplateModelException If something goes wrong.
*/
@Test
@@ -61,7 +78,7 @@ public class EnvironmentScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.extractor.EnvironmentScopeExtractor#getKeys()}.
+ * Test method for {@link EnvironmentScopeExtractor#getKeys()}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -82,16 +99,16 @@ public class EnvironmentScopeExtractorTe
replay(template, model, valueModel, configuration, names, namesIt);
Environment env = new Environment(template, model, writer);
EnvironmentScopeExtractor extractor = new EnvironmentScopeExtractor(env);
- assertEquals(namesIt, ((IteratorEnumeration) extractor.getKeys()).getIterator());
+ assertEquals(namesIt, ((IteratorEnumeration<String>) extractor.getKeys()).getIterator());
verify(template, model, valueModel, configuration, names, namesIt);
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.extractor.EnvironmentScopeExtractor#getKeys()}.
+ * Test method for {@link EnvironmentScopeExtractor#getKeys()}.
* @throws TemplateModelException If something goes wrong.
*/
@SuppressWarnings("unchecked")
- @Test(expected=FreemarkerRequestException.class)
+ @Test(expected = FreemarkerRequestException.class)
public void testGetKeysException() throws TemplateModelException {
Template template = createMock(Template.class);
TemplateHashModelEx model = createMock(TemplateHashModelEx.class);
@@ -117,7 +134,7 @@ public class EnvironmentScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.extractor.EnvironmentScopeExtractor#getValue(java.lang.String)}.
+ * Test method for {@link EnvironmentScopeExtractor#getValue(java.lang.String)}.
* @throws TemplateModelException If something goes wrong.
*/
@Test
@@ -141,7 +158,7 @@ public class EnvironmentScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.extractor.EnvironmentScopeExtractor#getValue(java.lang.String)}.
+ * Test method for {@link EnvironmentScopeExtractor#getValue(java.lang.String)}.
* @throws TemplateModelException If something goes wrong.
*/
@Test
@@ -166,10 +183,10 @@ public class EnvironmentScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.extractor.EnvironmentScopeExtractor#getValue(java.lang.String)}.
+ * Test method for {@link EnvironmentScopeExtractor#getValue(java.lang.String)}.
* @throws TemplateModelException If something goes wrong.
*/
- @Test(expected=FreemarkerRequestException.class)
+ @Test(expected = FreemarkerRequestException.class)
public void testGetValueException() throws TemplateModelException {
Template template = createMock(Template.class);
TemplateHashModel model = createMock(TemplateHashModel.class);
@@ -192,7 +209,7 @@ public class EnvironmentScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.extractor.EnvironmentScopeExtractor#setValue(java.lang.String, java.lang.Object)}.
+ * Test method for {@link EnvironmentScopeExtractor#setValue(java.lang.String, java.lang.Object)}.
* @throws TemplateModelException If something goes wrong.
*/
@Test
@@ -217,10 +234,10 @@ public class EnvironmentScopeExtractorTe
}
/**
- * Test method for {@link org.apache.tiles.request.freemarker.extractor.EnvironmentScopeExtractor#setValue(java.lang.String, java.lang.Object)}.
+ * Test method for {@link EnvironmentScopeExtractor#setValue(java.lang.String, java.lang.Object)}.
* @throws TemplateModelException If something goes wrong.
*/
- @Test(expected=FreemarkerRequestException.class)
+ @Test(expected = FreemarkerRequestException.class)
public void testSetValueException() throws TemplateModelException {
Template template = createMock(Template.class);
TemplateHashModel model = createMock(TemplateHashModel.class);
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererTest.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererTest.java (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-freemarker/src/test/java/org/apache/tiles/request/freemarker/render/FreemarkerRendererTest.java Thu Feb 3 11:49:11 2011
@@ -37,8 +37,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.freemarker.render.FreemarkerRenderer;
-import org.apache.tiles.request.freemarker.render.FreemarkerRendererBuilder;
import org.apache.tiles.request.render.CannotRenderException;
import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.apache.tiles.request.servlet.ServletRequest;
@@ -57,21 +55,42 @@ import freemarker.template.ObjectWrapper
*/
public class FreemarkerRendererTest {
+ /**
+ * The attribute name of the application model.
+ */
private static final String ATTR_APPLICATION_MODEL =
".freemarker.Application";
+ /**
+ * The attribute name of the JSP taglibs model.
+ */
private static final String ATTR_JSP_TAGLIBS_MODEL =
".freemarker.JspTaglibs";
+ /**
+ * The attribute name of the request model.
+ */
private static final String ATTR_REQUEST_MODEL = ".freemarker.Request";
+ /**
+ * The attribute name of the request parameters model.
+ */
private static final String ATTR_REQUEST_PARAMETERS_MODEL =
".freemarker.RequestParameters";
+ /**
+ * The renderer to test.
+ */
private FreemarkerRenderer renderer;
+ /**
+ * The application context.
+ */
private ApplicationContext applicationContext;
+ /**
+ * The servlet context.
+ */
private ServletContext servletContext;
/**
@@ -164,7 +183,7 @@ public class FreemarkerRendererTest {
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
*/
- @Test(expected=CannotRenderException.class)
+ @Test(expected = CannotRenderException.class)
public void testRenderException1() throws IOException, ServletException {
ApplicationContext applicationContext = createMock(ServletApplicationContext.class);
ServletContext servletContext = createMock(ServletContext.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java Thu Feb 3 11:49:11 2011
@@ -77,7 +77,7 @@ import org.apache.tiles.request.Applicat
import org.apache.tiles.request.Request;
import org.apache.tiles.request.freemarker.render.FreemarkerRenderer;
import org.apache.tiles.request.freemarker.render.FreemarkerRendererBuilder;
-import org.apache.tiles.request.freemarker.servlet.TilesFreemarkerServlet;
+import org.apache.tiles.request.freemarker.servlet.SharedVariableLoaderFreemarkerServlet;
import org.apache.tiles.request.render.BasicRendererFactory;
import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
@@ -143,7 +143,7 @@ public class CompleteAutoloadTilesContai
.setParameter("default_encoding", "ISO-8859-1")
.setParameter("number_format", "0.##########")
.setParameter(
- TilesFreemarkerServlet.CUSTOM_SHARED_VARIABLE_FACTORIES_INIT_PARAM,
+ SharedVariableLoaderFreemarkerServlet.CUSTOM_SHARED_VARIABLE_FACTORIES_INIT_PARAM,
"tiles," + TilesSharedVariableFactory.class.getName())
.build();
rendererFactory.registerRenderer(FREEMARKER_RENDERER_NAME, freemarkerRenderer);
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml Thu Feb 3 11:49:11 2011
@@ -153,17 +153,12 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0.1-beta-3</version>
+ <version>1.0.5</version>
<configuration>
<container>
- <containerId>tomcat6x</containerId>
- <home>${cargo.tomcat6x.home}</home>
- <log>${project.build.directory}/tomcat6x.log</log>
- <output>${project.build.directory}/tomcat6x.out</output>
+ <containerId>jetty7x</containerId>
+ <type>embedded</type>
</container>
- <configuration>
- <home>${project.build.directory}/tomcat6x</home>
- </configuration>
</configuration>
</plugin>
</plugins>
@@ -247,28 +242,23 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <configuration>
+ <configuration>
<container>
- <containerId>tomcat6x</containerId>
- <home>${cargo.tomcat6x.home}</home>
- <log>${project.build.directory}/tomcat6x.log</log>
- <output>${project.build.directory}/tomcat6x.out</output>
+ <containerId>jetty7x</containerId>
+ <type>embedded</type>
</container>
<wait>false</wait>
- <configuration>
- <home>${project.build.directory}/tomcat6x</home>
- </configuration>
</configuration>
<executions>
<execution>
- <id>start-tomcat</id>
+ <id>start-container</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
- <id>stop-tomcat</id>
+ <id>stop-container</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=1066788&r1=1066787&r2=1066788&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml Thu Feb 3 11:49:11 2011
@@ -81,8 +81,8 @@
<!-- Standard Action Servlet Configuration -->
<servlet>
<servlet-name>freemarker</servlet-name>
- <servlet-class>org.apache.tiles.request.freemarker.servlet.TilesFreemarkerServlet</servlet-class>
-
+ <servlet-class>org.apache.tiles.request.freemarker.servlet.SharedVariableLoaderFreemarkerServlet</servlet-class>
+
<!-- FreemarkerServlet settings: -->
<init-param>
<param-name>TemplatePath</param-name>
@@ -96,7 +96,7 @@
<param-name>ContentType</param-name>
<param-value>text/html</param-value>
</init-param>
-
+
<!-- FreeMarker settings: -->
<init-param>
<param-name>template_update_delay</param-name>
@@ -114,14 +114,14 @@
<param-name>org.apache.tiles.request.freemarker.CUSTOM_SHARED_VARIABLE_FACTORIES</param-name>
<param-value>tiles,org.apache.tiles.freemarker.TilesSharedVariableFactory</param-value>
</init-param>
-
+
<load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>velocity</servlet-name>
<servlet-class>org.apache.velocity.tools.view.VelocityViewServlet</servlet-class>
-
+
<!--
Unless you plan to put your tools.xml and velocity.properties under
different folders or give them different names, then these two
@@ -132,7 +132,7 @@
<param-name>org.apache.velocity.toolbox</param-name>
<param-value>/WEB-INF/tools.xml</param-value>
</init-param>
-
+
<init-param>
<param-name>org.apache.velocity.properties</param-name>
<param-value>/WEB-INF/velocity.properties</param-value>