Author: hlship
Date: Sun Mar 2 16:02:05 2008
New Revision: 632886
URL: http://svn.apache.org/viewvc?rev=632886&view=rev
Log:
TAPESTRY-1890: Allow Tapestry applications to NOT autoload modules from library
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java?rev=632886&r1=632885&r2=632886&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java
Sun Mar 2 16:02:05 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -38,6 +38,12 @@
* The TapestryFilter is responsible for intercepting all requests into the
web application. It identifies the requests
* that are relevant to Tapestry, and lets the servlet container handle the
rest. It is also responsible for
* initializing Tapestry.
+ * <p/>
+ * <p/>
+ * The application is configured via context-level init parameters.
+ * <p/>
+ * <dl> <dt> tapestry.app-package</dt> <dd> The application package (used to
search for pages, components, etc.)</dd>
+ * </dl>
*/
public class TapestryFilter implements Filter
{
@@ -50,9 +56,8 @@
private HttpServletRequestHandler _handler;
/**
- * Initializes the filter using the [EMAIL PROTECTED]
TapestryAppInitializer}. The application package is defined by the
- * <code>tapestry.app-package</code> context init parameter and the
application name is the capitalization of the
- * filter name (as specified in web.xml).
+ * Initializes the filter using the [EMAIL PROTECTED]
TapestryAppInitializer}. The application name is the capitalization of
+ * the filter name (as specified in web.xml).
*/
public final void init(FilterConfig filterConfig) throws ServletException
{
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java?rev=632886&r1=632885&r2=632886&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java
Sun Mar 2 16:02:05 2008
@@ -25,6 +25,11 @@
public static final String TAPESTRY_APP_PACKAGE_PARAM =
"tapestry.app-package";
/**
+ * Turns off loading of default modules (as driven by JAR file Manifest
entries).
+ */
+ public static final String DISABLE_DEFAULT_MODULES_PARAM =
"tapestry.disable-default-modules";
+
+ /**
* The application mode, generally "servlet", used to select the correct
contributions to the [EMAIL PROTECTED] Alias}
* service.
*/
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java?rev=632886&r1=632885&r2=632886&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
Sun Mar 2 16:02:05 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -63,12 +63,17 @@
String appPackage =
_appProvider.valueForSymbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM);
+
_appName = appName;
_aliasMode = aliasMode;
_startTime = System.currentTimeMillis();
- IOCUtilities.addDefaultModules(_builder);
+
+ if
(!Boolean.parseBoolean(appProvider.valueForSymbol(InternalConstants.DISABLE_DEFAULT_MODULES_PARAM)))
+ {
+ IOCUtilities.addDefaultModules(_builder);
+ }
// This gets added automatically.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt?rev=632886&r1=632885&r2=632886&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt Sun Mar 2
16:02:05 2008
@@ -10,6 +10,10 @@
New And Of Note
+ * It is now possible to override the built-in display and edit blocks for
data types.
+
+ * Tapestry now supports "Index" pages at the root or in sub-folders.
+
* Tapestry pages may now be {{{guide/secure.html}secured for access only via
HTTPS}}.
* Added the
{{{ref/org/apache/tapestry/corelib/components/FormFragment.html}FormFragment}}
component
