Author: apetrelli
Date: Wed Jul 29 18:40:18 2009
New Revision: 799005
URL: http://svn.apache.org/viewvc?rev=799005&view=rev
Log:
TILES-443
New version of the container factory.
Added initializer and listener.
Added:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/factory/
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/factory/CompleteAutoloadTilesContainerFactory.java
- copied, changed from r798669,
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/factory/CompleteAutoloadTilesContainerFactory.java
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/startup/
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/startup/CompleteAutoloadTilesInitializer.java
(with props)
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/startup/
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/startup/CompleteAutoloadTilesListener.java
(with props)
Removed:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/factory/
Modified:
tiles/framework/trunk/tiles-extras/pom.xml
Modified: tiles/framework/trunk/tiles-extras/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-extras/pom.xml?rev=799005&r1=799004&r2=799005&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-extras/pom.xml (original)
+++ tiles/framework/trunk/tiles-extras/pom.xml Wed Jul 29 18:40:18 2009
@@ -95,6 +95,13 @@
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>2.0.11</version>
Copied:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/factory/CompleteAutoloadTilesContainerFactory.java
(from r798669,
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/factory/CompleteAutoloadTilesContainerFactory.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/factory/CompleteAutoloadTilesContainerFactory.java?p2=tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/factory/CompleteAutoloadTilesContainerFactory.java&p1=tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/factory/CompleteAutoloadTilesContainerFactory.java&r1=798669&r2=799005&rev=799005&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/factory/CompleteAutoloadTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/factory/CompleteAutoloadTilesContainerFactory.java
Wed Jul 29 18:40:18 2009
@@ -1,8 +1,28 @@
-package org.apache.tiles.extras.factory;
+/*
+ * $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.extras.complete.factory;
import java.io.IOException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -59,10 +79,27 @@
import org.apache.tiles.jsp.evaluator.el.JspExpressionFactoryFactory;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
+import org.apache.tiles.util.URLUtil;
import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
import org.mvel2.integration.VariableResolverFactory;
+/**
+ * Tiles container factory that:
+ * <ul>
+ * <li>create supporting objects for Velocity and FreeMarker;</li>
+ * <li>create renderers for Velocity and FreeMarker templates;</li>
+ * <li>allows using EL, MVEL and OGNL as attribute expressions;</li>
+ * <li>allows using Wildcards and Regular Expressions in definition names;</li>
+ * <li>loads Tiles 1.x definition files;</li>
+ * <li>loads all the definition files that have the "tiles*.xml" pattern under
+ * <code>/WEB-INF</code> directory (and subdirectories) and under
+ * <code>META-INF</code> directories (and subdirectories) in every jar.</li>
+ * </ul>
+ *
+ * @version $Rev$ $Date$
+ * @since 2.2.0
+ */
public class CompleteAutoloadTilesContainerFactory extends
BasicTilesContainerFactory {
/** {...@inheritdoc} */
@@ -151,25 +188,16 @@
@Override
protected List<URL> getSourceURLs(TilesApplicationContext
applicationContext,
TilesRequestContextFactory contextFactory) {
- List<URL> urls = new ArrayList<URL>();
try {
Set<URL> urlSet = applicationContext
.getResources("/WEB-INF/**/tiles*.xml");
urlSet.addAll(applicationContext
.getResources("classpath*:META-INF/**/tiles*.xml"));
- List<URL> filteredUrls = new ArrayList<URL>();
- for (URL url : urlSet) {
- String externalForm = url.toExternalForm();
- if (externalForm.indexOf('_', externalForm.lastIndexOf("/")) <
0) {
- filteredUrls.add(url);
- }
- }
- urls = filteredUrls;
+ return URLUtil.filterLocalizedTilesDefinitionURLs(urlSet);
} catch (IOException e) {
throw new DefinitionsFactoryException(
"Cannot load definition URLs", e);
}
- return urls;
}
/** {...@inheritdoc} */
Added:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/startup/CompleteAutoloadTilesInitializer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/startup/CompleteAutoloadTilesInitializer.java?rev=799005&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/startup/CompleteAutoloadTilesInitializer.java
(added)
+++
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/startup/CompleteAutoloadTilesInitializer.java
Wed Jul 29 18:40:18 2009
@@ -0,0 +1,57 @@
+/*
+ * $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.extras.complete.startup;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tiles.TilesApplicationContext;
+import
org.apache.tiles.extras.complete.factory.CompleteAutoloadTilesContainerFactory;
+import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import
org.apache.tiles.servlet.context.wildcard.WildcardServletTilesApplicationContext;
+import org.apache.tiles.startup.AbstractTilesInitializer;
+
+/**
+ * This initializer uses {...@link WildcardServletTilesApplicationContext} to
+ * retrieve resources using Ant-style patterns and creates a
+ * {...@link CompleteAutoloadTilesContainerFactory} to load all new features of
+ * Tiles at once.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.2.0
+ */
+public class CompleteAutoloadTilesInitializer extends AbstractTilesInitializer
{
+
+ /** {...@inheritdoc} */
+ @Override
+ protected TilesApplicationContext createTilesApplicationContext(
+ TilesApplicationContext preliminaryContext) {
+ return new WildcardServletTilesApplicationContext(
+ (ServletContext) preliminaryContext.getContext());
+ }
+
+ /** {...@inheritdoc} */
+ @Override
+ protected AbstractTilesContainerFactory createContainerFactory(
+ TilesApplicationContext context) {
+ return new CompleteAutoloadTilesContainerFactory();
+ }
+}
Propchange:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/startup/CompleteAutoloadTilesInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/startup/CompleteAutoloadTilesInitializer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/startup/CompleteAutoloadTilesListener.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/startup/CompleteAutoloadTilesListener.java?rev=799005&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/startup/CompleteAutoloadTilesListener.java
(added)
+++
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/startup/CompleteAutoloadTilesListener.java
Wed Jul 29 18:40:18 2009
@@ -0,0 +1,42 @@
+/*
+ * $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.extras.complete.web.startup;
+
+import
org.apache.tiles.extras.complete.startup.CompleteAutoloadTilesInitializer;
+import org.apache.tiles.startup.TilesInitializer;
+import org.apache.tiles.web.startup.AbstractTilesListener;
+
+/**
+ * Tiles listener that executes {...@link CompleteAutoloadTilesInitializer}.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.2.0
+ */
+public class CompleteAutoloadTilesListener extends AbstractTilesListener {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected TilesInitializer createTilesInitializer() {
+ return new CompleteAutoloadTilesInitializer();
+ }
+
+}
Propchange:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/startup/CompleteAutoloadTilesListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-extras/src/main/java/org/apache/tiles/extras/complete/web/startup/CompleteAutoloadTilesListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
