Author: apetrelli
Date: Mon Sep 28 15:51:32 2009
New Revision: 819608
URL: http://svn.apache.org/viewvc?rev=819608&view=rev
Log:
TILES-467
First modularization: moving classes to modules and used ModularTilesListener.
Added:
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
- copied, changed from r819379,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
- copied, changed from r819391,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
(with props)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
- copied unchanged from r819379,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/
- copied from r819379,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/renderer/
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
- copied, changed from r819379,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/definition/dao/LocaleDbDefinitionDAO.java
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
- copied, changed from r819379,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java
- copied, changed from r819391,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
(with props)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java
- copied, changed from r819391,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF
Removed:
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/META-INF/
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/definition/dao/
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/package.html
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/renderer/
Modified:
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml
tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml
tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml
tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml?rev=819608&r1=819607&r2=819608&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml Mon Sep 28
15:51:32 2009
@@ -32,6 +32,27 @@
<artifactId>tiles-test-alt</artifactId>
<name>Tiles - Test webapp alternate configuration</name>
<description>Alternate configuration for the test webapp.</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${tiles.manifestfile}</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+
<Tiles-Initializer>org.apache.tiles.test.alt.TestAlternateTilesInitializer</Tiles-Initializer>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
Copied:
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
(from r819379,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java?p2=tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java&p1=tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java&r1=819379&r2=819608&rev=819608&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
Mon Sep 28 15:51:32 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.test.factory;
+package org.apache.tiles.test.alt;
import java.io.IOException;
import java.net.URL;
@@ -32,6 +32,7 @@
import org.apache.tiles.definition.dao.BaseLocaleUrlDefinitionDAO;
import org.apache.tiles.definition.dao.CachingLocaleUrlDefinitionDAO;
import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.test.factory.TestTilesContainerFactory;
/**
* Test alternate Tiles container factory to customize Tiles behaviour.
Copied:
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
(from r819391,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java?p2=tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java&p1=tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java&r1=819391&r2=819608&rev=819608&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
Mon Sep 28 15:51:32 2009
@@ -1,16 +1,15 @@
-package org.apache.tiles.test.listener;
+package org.apache.tiles.test.alt;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.startup.AbstractTilesInitializer;
-import org.apache.tiles.test.factory.TestAlternateTilesContainerFactory;
/**
* Test Tiles initializer for Tiles initialization of the alternate container.
*
* @version $Rev$ $Date$
*/
-class TestAlternateTilesInitializer extends AbstractTilesInitializer {
+public class TestAlternateTilesInitializer extends AbstractTilesInitializer {
/** {...@inheritdoc} */
@Override
Added:
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html?rev=819608&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
(added)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
Mon Sep 28 15:51:32 2009
@@ -0,0 +1,30 @@
+<!--
+/*
+ * $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.
+ */
+-->
+<html>
+<head>
+ <title>Alternate configuration for Tiles test webapp</title>
+</head>
+<body>
+An alternate configuration of the Tiles test webapp.
+</body>
+</html>
\ No newline at end of file
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF?rev=819608&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF
(added)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF
Mon Sep 28 15:51:32 2009
@@ -0,0 +1,31 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: 1.6.0_16 (Sun Microsystems Inc.)
+Built-By: antonio
+Build-Jdk: 1.6.0_16
+Specification-Title: Tiles - Test webapp alternate configuration
+Specification-Version: 2.2.1-SNAPSHOT
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Tiles - Test webapp alternate configuration
+Implementation-Version: 2.2.1-SNAPSHOT
+Implementation-Vendor-Id: org.apache
+Implementation-Vendor: Apache Software Foundation
+Tiles-Initializer: org.apache.tiles.test.alt.TestAlternateTilesInitial
+ izer
+Export-Package: org.apache.tiles.test.alt;version="2.2.1.SNAPSHOT"
+Tool: Bnd-0.0.311
+Bundle-Name: Tiles - Test webapp alternate configuration
+Bundle-Vendor: Apache Software Foundation
+Bundle-Version: 2.2.1.SNAPSHOT
+Bnd-LastModified: 1254151613654
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Alternate configuration for the test webapp.
+Import-Package: org.apache.tiles,org.apache.tiles.context,org.apache.t
+ iles.definition,org.apache.tiles.definition.dao,org.apache.tiles.fact
+ ory,org.apache.tiles.locale,org.apache.tiles.startup,org.apache.tiles
+ .test.alt;version="2.2",org.apache.tiles.test.factory
+Bundle-SymbolicName: org.apache.tiles-test-alt
+Bundle-DocURL: http://tiles.apache.org/framework/tiles-test-pom/tiles-
+ test-alt
+
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml?rev=819608&r1=819607&r2=819608&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml Mon Sep 28
15:51:32 2009
@@ -1,4 +1,28 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<?xml version="1.0"?>
+<!--
+/*
+ * $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.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>tiles-test-pom</artifactId>
@@ -10,4 +34,11 @@
<version>2.2.1-SNAPSHOT</version>
<name>Tiles - Test webapp common classes</name>
<description>Common classes between modules of the test webapp.</description>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tiles-extras</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml?rev=819608&r1=819607&r2=819608&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml Mon Sep 28
15:51:32 2009
@@ -38,5 +38,36 @@
<artifactId>tiles-test-common</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.5.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${tiles.manifestfile}</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+
<Tiles-Initializer>org.apache.tiles.test.db.TestDbTilesInitializer</Tiles-Initializer>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Copied:
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
(from r819379,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/definition/dao/LocaleDbDefinitionDAO.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java?p2=tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java&p1=tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/definition/dao/LocaleDbDefinitionDAO.java&r1=819379&r2=819608&rev=819608&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/definition/dao/LocaleDbDefinitionDAO.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
Mon Sep 28 15:51:32 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.test.definition.dao;
+package org.apache.tiles.test.db;
import java.sql.ResultSet;
import java.sql.SQLException;
Copied:
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
(from r819379,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java?p2=tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java&p1=tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java&r1=819379&r2=819608&rev=819608&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
Mon Sep 28 15:51:32 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.test.factory;
+package org.apache.tiles.test.db;
import java.util.List;
import java.util.Locale;
@@ -34,7 +34,6 @@
import org.apache.tiles.factory.BasicTilesContainerFactory;
import
org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory;
import org.apache.tiles.locale.LocaleResolver;
-import org.apache.tiles.test.definition.dao.LocaleDbDefinitionDAO;
import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
Copied:
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java
(from r819391,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java?p2=tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java&p1=tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java&r1=819391&r2=819608&rev=819608&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java
Mon Sep 28 15:51:32 2009
@@ -1,16 +1,15 @@
-package org.apache.tiles.test.listener;
+package org.apache.tiles.test.db;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
import org.apache.tiles.startup.AbstractTilesInitializer;
-import org.apache.tiles.test.factory.TestDbTilesContainerFactory;
/**
* Test Tiles initializer for Tiles initialization of the db-based container.
*
* @version $Rev$ $Date$
*/
-class TestDbTilesInitializer extends AbstractTilesInitializer {
+public class TestDbTilesInitializer extends AbstractTilesInitializer {
/** {...@inheritdoc} */
@Override
Added:
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html?rev=819608&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
(added)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
Mon Sep 28 15:51:32 2009
@@ -0,0 +1,30 @@
+<!--
+/*
+ * $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.
+ */
+-->
+<html>
+<head>
+ <title>DB configuration for Tiles test webapp</title>
+</head>
+<body>
+A configuration based on a DBMS of the Tiles test webapp.
+</body>
+</html>
\ No newline at end of file
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF?rev=819608&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF
(added)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF
Mon Sep 28 15:51:32 2009
@@ -0,0 +1,32 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: 1.6.0_16 (Sun Microsystems Inc.)
+Built-By: antonio
+Build-Jdk: 1.6.0_16
+Specification-Title: Tiles - Test webapp database configuration
+Specification-Version: 2.2.1-SNAPSHOT
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Tiles - Test webapp database configuration
+Implementation-Version: 2.2.1-SNAPSHOT
+Implementation-Vendor-Id: org.apache
+Implementation-Vendor: Apache Software Foundation
+Tiles-Initializer: org.apache.tiles.test.db.TestDbTilesInitializer
+Export-Package: org.apache.tiles.test.db;version="2.2.1.SNAPSHOT"
+Tool: Bnd-0.0.311
+Bundle-Name: Tiles - Test webapp database configuration
+Bundle-Vendor: Apache Software Foundation
+Bundle-Version: 2.2.1.SNAPSHOT
+Bnd-LastModified: 1254151614318
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Tiles configuration that uses a database.
+Import-Package: javax.sql,org.apache.tiles,org.apache.tiles.context,or
+ g.apache.tiles.definition,org.apache.tiles.definition.dao,org.apache.
+ tiles.factory,org.apache.tiles.freemarker.context,org.apache.tiles.lo
+ cale,org.apache.tiles.test.db;version="2.2",org.apache.tiles.util,org
+ .apache.tiles.velocity.context,org.springframework.jdbc.core,org.spri
+ ngframework.jdbc.core.support
+Bundle-SymbolicName: org.apache.tiles-test-db
+Bundle-DocURL: http://tiles.apache.org/framework/tiles-test-pom/tiles-
+ test-db
+
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml?rev=819608&r1=819607&r2=819608&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml Mon Sep 28 15:51:32
2009
@@ -39,6 +39,11 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tiles-test-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tiles-test-alt</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -134,6 +139,15 @@
</includes>
</resource>
</webResources>
+ <archive>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+
<Tiles-Initializer>org.apache.tiles.test.init.TestTilesInitializer</Tiles-Initializer>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
<plugin>
Copied:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java
(from r819391,
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java?p2=tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java&p1=tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java&r1=819391&r2=819608&rev=819608&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java
Mon Sep 28 15:51:32 2009
@@ -1,4 +1,4 @@
-package org.apache.tiles.test.listener;
+package org.apache.tiles.test.init;
import javax.servlet.ServletContext;
@@ -13,7 +13,7 @@
*
* @version $Rev$ $Date$
*/
-class TestTilesListenerInitializer extends AbstractTilesInitializer {
+public class TestTilesInitializer extends AbstractTilesInitializer {
/** {...@inheritdoc} */
@Override
Added:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF?rev=819608&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF
(added)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF
Mon Sep 28 15:51:32 2009
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: antonio
+Build-Jdk: 1.6.0_16
+Specification-Title: Tiles - Apps - Test
+Specification-Version: 2.2.1-SNAPSHOT
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Tiles - Apps - Test
+Implementation-Version: 2.2.1-SNAPSHOT
+Implementation-Vendor-Id: org.apache.tiles
+Implementation-Vendor: Apache Software Foundation
+Tiles-Initializer: org.apache.tiles.test.init.TestTilesInitializer
+
Modified:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=819608&r1=819607&r2=819608&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
Mon Sep 28 15:51:32 2009
@@ -34,13 +34,7 @@
<listener-class>org.apache.tiles.test.init.InitContextListener</listener-class>
</listener>
<listener>
-
<listener-class>org.apache.tiles.test.listener.TestTilesListener</listener-class>
- </listener>
- <listener>
-
<listener-class>org.apache.tiles.test.listener.TestAlternateTilesListener</listener-class>
- </listener>
- <listener>
-
<listener-class>org.apache.tiles.test.listener.TestDbTilesListener</listener-class>
+
<listener-class>org.apache.tiles.extras.module.ModularTilesListener</listener-class>
</listener>
<filter>
<filter-name>Tiles Decoration Filter</filter-name>
