Author: apetrelli
Date: Sun Sep 27 19:59:03 2009
New Revision: 819391
URL: http://svn.apache.org/viewvc?rev=819391&view=rev
Log:
TILES-467
Moved initializers to top level classes.
Added:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java
(with props)
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java
(with props)
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java
(with props)
Modified:
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/TestDbTilesListener.java
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
Added:
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/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java?rev=819391&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java
(added)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java
Sun Sep 27 19:59:03 2009
@@ -0,0 +1,28 @@
+package org.apache.tiles.test.listener;
+
+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 {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected AbstractTilesContainerFactory createContainerFactory(
+ TilesApplicationContext context) {
+ return new TestAlternateTilesContainerFactory();
+ }
+
+ /** {...@inheritdoc} */
+ @Override
+ protected String getContainerKey(
+ TilesApplicationContext applicationContext) {
+ return "alternate";
+ }
+}
\ No newline at end of file
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesInitializer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java?rev=819391&r1=819390&r2=819391&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
Sun Sep 27 19:59:03 2009
@@ -20,11 +20,7 @@
*/
package org.apache.tiles.test.listener;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.factory.AbstractTilesContainerFactory;
-import org.apache.tiles.startup.AbstractTilesInitializer;
import org.apache.tiles.startup.TilesInitializer;
-import org.apache.tiles.test.factory.TestAlternateTilesContainerFactory;
import org.apache.tiles.web.startup.AbstractTilesListener;
/**
@@ -39,24 +35,4 @@
protected TilesInitializer createTilesInitializer() {
return new TestAlternateTilesInitializer();
}
-
- /**
- * Test Tiles initializer for Tiles initialization of the alternate
container.
- */
- private static class TestAlternateTilesInitializer extends
AbstractTilesInitializer {
-
- /** {...@inheritdoc} */
- @Override
- protected AbstractTilesContainerFactory createContainerFactory(
- TilesApplicationContext context) {
- return new TestAlternateTilesContainerFactory();
- }
-
- /** {...@inheritdoc} */
- @Override
- protected String getContainerKey(
- TilesApplicationContext applicationContext) {
- return "alternate";
- }
- }
}
Added:
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/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java?rev=819391&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java
(added)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java
Sun Sep 27 19:59:03 2009
@@ -0,0 +1,28 @@
+package org.apache.tiles.test.listener;
+
+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 {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected AbstractTilesContainerFactory createContainerFactory(
+ TilesApplicationContext context) {
+ return new TestDbTilesContainerFactory();
+ }
+
+ /** {...@inheritdoc} */
+ @Override
+ protected String getContainerKey(
+ TilesApplicationContext applicationContext) {
+ return "db";
+ }
+}
\ No newline at end of file
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesInitializer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java?rev=819391&r1=819390&r2=819391&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
Sun Sep 27 19:59:03 2009
@@ -20,11 +20,7 @@
*/
package org.apache.tiles.test.listener;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.factory.AbstractTilesContainerFactory;
-import org.apache.tiles.startup.AbstractTilesInitializer;
import org.apache.tiles.startup.TilesInitializer;
-import org.apache.tiles.test.factory.TestDbTilesContainerFactory;
import org.apache.tiles.web.startup.AbstractTilesListener;
/**
@@ -39,24 +35,4 @@
protected TilesInitializer createTilesInitializer() {
return new TestDbTilesInitializer();
}
-
- /**
- * Test Tiles initializer for Tiles initialization of the db-based
container.
- */
- private static class TestDbTilesInitializer extends
AbstractTilesInitializer {
-
- /** {...@inheritdoc} */
- @Override
- protected AbstractTilesContainerFactory createContainerFactory(
- TilesApplicationContext context) {
- return new TestDbTilesContainerFactory();
- }
-
- /** {...@inheritdoc} */
- @Override
- protected String getContainerKey(
- TilesApplicationContext applicationContext) {
- return "db";
- }
- }
}
Modified:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java?rev=819391&r1=819390&r2=819391&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
(original)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
Sun Sep 27 19:59:03 2009
@@ -20,14 +20,8 @@
*/
package org.apache.tiles.test.listener;
-import javax.servlet.ServletContext;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.factory.AbstractTilesContainerFactory;
-import
org.apache.tiles.servlet.context.wildcard.WildcardServletTilesApplicationContext;
-import org.apache.tiles.startup.AbstractTilesInitializer;
import org.apache.tiles.startup.TilesInitializer;
-import org.apache.tiles.test.factory.TestTilesContainerFactory;
import org.apache.tiles.web.startup.AbstractTilesListener;
/**
@@ -42,25 +36,4 @@
protected TilesInitializer createTilesInitializer() {
return new TestTilesListenerInitializer();
}
-
- /**
- * Test Tiles initializer for Tiles initialization of the default
container.
- */
- private static class TestTilesListenerInitializer extends
AbstractTilesInitializer {
-
- /** {...@inheritdoc} */
- @Override
- protected AbstractTilesContainerFactory createContainerFactory(
- TilesApplicationContext context) {
- return new TestTilesContainerFactory();
- }
-
- /** {...@inheritdoc} */
- @Override
- protected TilesApplicationContext createTilesApplicationContext(
- TilesApplicationContext preliminaryContext) {
- return new WildcardServletTilesApplicationContext(
- (ServletContext) preliminaryContext.getContext());
- }
- }
}
Added:
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/listener/TestTilesListenerInitializer.java?rev=819391&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java
(added)
+++
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java
Sun Sep 27 19:59:03 2009
@@ -0,0 +1,32 @@
+package org.apache.tiles.test.listener;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import
org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
+import org.apache.tiles.startup.AbstractTilesInitializer;
+import org.apache.tiles.test.factory.TestTilesContainerFactory;
+
+/**
+ * Test Tiles initializer for Tiles initialization of the default container.
+ *
+ * @version $Rev$ $Date$
+ */
+class TestTilesListenerInitializer extends AbstractTilesInitializer {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected AbstractTilesContainerFactory createContainerFactory(
+ TilesApplicationContext context) {
+ return new TestTilesContainerFactory();
+ }
+
+ /** {...@inheritdoc} */
+ @Override
+ protected TilesApplicationContext createTilesApplicationContext(
+ TilesApplicationContext preliminaryContext) {
+ return new WildcardServletTilesApplicationContext(
+ (ServletContext) preliminaryContext.getContext());
+ }
+}
\ No newline at end of file
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListenerInitializer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
