jholmes 2002/10/18 08:27:43
Modified: conf/share struts-config_1_1.dtd
doc news.xml
doc/proposals release-plan-1.1b2.xml
doc/userGuide building_controller.xml
release-notes-1.1-b2.xml
src/example/org/apache/struts/webapp/example/memory
MemoryDatabasePlugIn.java
src/share/org/apache/struts/action ActionServlet.java
src/share/org/apache/struts/actions LocalStrings.properties
src/share/org/apache/struts/tiles DefinitionsUtil.java
TilesPlugin.java TilesRequestProcessor.java
src/share/org/apache/struts/util RequestUtils.java
src/test/org/apache/struts/mock TestMockBase.java
src/test/org/apache/struts/util TestRequestUtils.java
web/example/WEB-INF struts-config.xml
Log:
changed remaining sub-app references to "module". thanks for the patch
PR: Bugzilla #13753
Revision Changes Path
1.31 +2 -2 jakarta-struts/conf/share/struts-config_1_1.dtd
Index: struts-config_1_1.dtd
===================================================================
RCS file: /home/cvs/jakarta-struts/conf/share/struts-config_1_1.dtd,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- struts-config_1_1.dtd 2 Oct 2002 03:51:56 -0000 1.30
+++ struts-config_1_1.dtd 18 Oct 2002 15:27:41 -0000 1.31
@@ -521,7 +521,7 @@
custom tags using it is mapped to a context-relative URL
of the corresponding resource. This value may consist of
any combination of the following:
- - "$A" - Replaced by the app prefix of this subapp
+ - "$A" - Replaced by the app prefix of this module
- "$P" - Replaced by the value of the "page" attribute
- "$$" - Causes a literal dollar sign to be rendered
- "$x" - (Where "x" is any character not defined above)
1.18 +2 -2 jakarta-struts/doc/news.xml
Index: news.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/news.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- news.xml 30 Aug 2002 20:57:12 -0000 1.17
+++ news.xml 18 Oct 2002 15:27:41 -0000 1.18
@@ -532,8 +532,8 @@
What's new in v2.0:
</p>
<ul>
-<li>Supports Struts 1.1 features - Manages multiple sub-apps on multiple
Storyboards, declarative exception handling, dynamic FormBeans, etc.</li>
-<li>Enhanced Zoomable Storyboards - Manages each sub-app on its own Storyboard with
cross sub-application connectivities. Supports zooming, snap-to-grid, auto-alignment
and multiple segements paths.</li>
+<li>Supports Struts 1.1 features - Manages multiple modules on multiple
Storyboards, declarative exception handling, dynamic FormBeans, etc.</li>
+<li>Enhanced Zoomable Storyboards - Manages each module on its own Storyboard with
cross module connectivities. Supports zooming, snap-to-grid, auto-alignment and
multiple segements paths.</li>
<li>Built-in JSP source editor with syntax-highlighting - Automatic two-way
synchronization between the editors and the Storyboards.</li>
<li>Auto file synchronization - Detects external modifications of the JSPs.</li>
<li>Inspector and Cross Referencing Tool - Allows quick viewing and modifying
attributes of the elements and provide powerful cross-referencing facility.</li>
1.2 +2 -2 jakarta-struts/doc/proposals/release-plan-1.1b2.xml
Index: release-plan-1.1b2.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/proposals/release-plan-1.1b2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- release-plan-1.1b2.xml 8 Aug 2002 06:17:45 -0000 1.1
+++ release-plan-1.1b2.xml 18 Oct 2002 15:27:42 -0000 1.2
@@ -121,7 +121,7 @@
</tr>
<tr>
<td width="75">10348</td>
- <td>Validator is not available under sub-application</td>
+ <td>Validator is not available under module</td>
</tr>
<tr>
<td width="75">10349</td>
1.35 +7 -7 jakarta-struts/doc/userGuide/building_controller.xml
Index: building_controller.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/building_controller.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- building_controller.xml 16 Oct 2002 19:39:06 -0000 1.34
+++ building_controller.xml 18 Oct 2002 15:27:42 -0000 1.35
@@ -658,7 +658,7 @@
<p>
Struts has builtin support for internationalization (I18N).
You can define one or more <code><message-resources></code> elements
- for your webapp; sub-applications can define their own resource bundles.
+ for your webapp; modules can define their own resource bundles.
Different bundles can be used simultaneously in your application, the
'key' attribute is used to specify the desired bundle.
</p>
@@ -1117,7 +1117,7 @@
Back in Struts 1.0, a few "boot-strap" options were placed in the web.xml
file,
and the bulk of the configuration was done in a single struts-config.xml
file.
Obviously, this wasn't ideal for a team environment, since multiple users
had
- to share the same configuration file. Sub-applications to the rescue!
+ to share the same configuration file. Modules to the rescue!
</p>
<p>
With the advent of modules, a given module has it's
@@ -1132,12 +1132,12 @@
In struts 1.0, you listed your configuration file as an initialization
parameter
to the action servlet in web.xml. This is still done in 1.1, but it's
augmented
a little. In order to tell the Struts machinery about your different
- sub-applications, you specify multiple config initialization parameters,
with a
+ modules, you specify multiple config initialization parameters, with a
slight twist. You'll still use "config" to tell the action servlet about
your
- "default" sub-application, however, for each additional sub-application,
you will
+ "default" module, however, for each additional module, you will
list an initialization parameter named "config/module", where module is
the name
- of your sub-application (this gets used when determining which URIs fall
under a
- given sub-application, so choose something meaningful!). For example:
+ of your module (this gets used when determining which URIs fall under a
+ given module, so choose something meaningful!). For example:
</p>
<pre>
...
@@ -1168,7 +1168,7 @@
Fronting your pages with actions is <i>essential</i> when using modules,
since doing so is the only way you involve the controller in the request
-- and
you want to! The controller puts the application configuration in the
request,
- which makes available all of your sub-application-specific configuration
data (including
+ which makes available all of your module-specific configuration data
(including
which plug-ins you are using, message resources, datasources, etc).
</p>
<p>
1.4 +1 -1 jakarta-struts/doc/userGuide/release-notes-1.1-b2.xml
Index: release-notes-1.1-b2.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/release-notes-1.1-b2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- release-notes-1.1-b2.xml 13 Aug 2002 16:28:49 -0000 1.3
+++ release-notes-1.1-b2.xml 18 Oct 2002 15:27:42 -0000 1.4
@@ -617,7 +617,7 @@
(<a
href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10191";>#10191</a>)
</li>
<li>Validator does not work with Struts application modules other than
- the default module (or sub-app).
+ the default module.
(<a
href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10348";>#10348</a>)
</li>
<li>Validator does not successfully validate empty date fields.
1.4 +6 -6
jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
Index: MemoryDatabasePlugIn.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryDatabasePlugIn.java 15 Jun 2002 23:12:31 -0000 1.3
+++ MemoryDatabasePlugIn.java 18 Oct 2002 15:27:42 -0000 1.4
@@ -106,7 +106,7 @@
/**
- * The application configuration for our owning sub-application.
+ * The application configuration for our owning module.
*/
private ApplicationConfig config = null;
@@ -179,7 +179,7 @@
* Initialize and load our initial database from persistent storage.
*
* @param servlet The ActionServlet for this web application
- * @param config The ApplicationConfig for our owning sub-application
+ * @param config The ApplicationConfig for our owning module
*
* @exception ServletException if we cannot configure ourselves correctly
*/
1.121 +5 -5
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ActionServlet.java 22 Sep 2002 05:46:51 -0000 1.120
+++ ActionServlet.java 18 Oct 2002 15:27:42 -0000 1.121
@@ -727,7 +727,7 @@
* Gracefully terminate use of the data source associated with this
* application (if any).
*
- * @deprecated Will no longer be required with multi-module support
+ * @deprecated Will no longer be required with module support
*/
protected void destroyDataSources() {
1.5 +1 -1
jakarta-struts/src/share/org/apache/struts/actions/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/actions/LocalStrings.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings.properties 20 Sep 2002 04:28:43 -0000 1.4
+++ LocalStrings.properties 18 Oct 2002 15:27:42 -0000 1.5
@@ -8,5 +8,5 @@
forward.rd=Cannot create request dispatcher for path {0}
include.path=No context-relative URI specified via the 'parameter' attribute
include.rd=Cannot create request dispatcher for path {0}
-switch.prefix=Invalid sub-application prefix {0} was specified
+switch.prefix=Invalid module prefix {0} was specified
switch.required=Switch requires both 'prefix' and 'page' request parameters
1.5 +4 -4
jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsUtil.java
Index: DefinitionsUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefinitionsUtil.java 10 Oct 2002 16:32:27 -0000 1.4
+++ DefinitionsUtil.java 18 Oct 2002 15:27:42 -0000 1.5
@@ -441,7 +441,7 @@
/**
* Create FactoryConfig and initialize it from web.xml.
*
- * @param servletConfig ServletConfig for the sub-application with which
+ * @param servletConfig ServletConfig for the module with which
* this plug in is associated
* @exception DefinitionsFactoryException if this <code>PlugIn</code> cannot
* be successfully initialized
1.5 +11 -11
jakarta-struts/src/share/org/apache/struts/tiles/TilesPlugin.java
Index: TilesPlugin.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesPlugin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TilesPlugin.java 10 Oct 2002 16:32:27 -0000 1.4
+++ TilesPlugin.java 18 Oct 2002 15:27:42 -0000 1.5
@@ -111,12 +111,12 @@
protected DefinitionsFactory definitionFactory;
/**
- * <p>Receive notification that the specified sub-applicaiton is being
+ * <p>Receive notification that the specified module is being
* started up.</p>
*
- * @param servlet ActionServlet that is managing all the sub-applications
+ * @param servlet ActionServlet that is managing all the modules
* in this web application
- * @param config ApplicationConfig for the sub-application with which
+ * @param config ApplicationConfig for the module with which
* this plug in is associated
*
* @exception ServletException if this <code>PlugIn</code> cannot
@@ -170,9 +170,9 @@
/**
* Create FactoryConfig and initialize it from web.xml and struts-config.xml.
*
- * @param servlet ActionServlet that is managing all the sub-applications
+ * @param servlet ActionServlet that is managing all the modules
* in this web application
- * @param config ApplicationConfig for the sub-application with which
+ * @param config ApplicationConfig for the module with which
* this plug in is associated
* @exception ServletException if this <code>PlugIn</code> cannot
* be successfully initialized
@@ -214,9 +214,9 @@
* Find original properties set in the struts PlugInConfig object.
* First, need to find the index of this plugin. Then retrieve array of configs
* and then the object for this plugin.
- * @param servlet ActionServlet that is managing all the sub-applications
+ * @param servlet ActionServlet that is managing all the modules
* in this web application
- * @param config ApplicationConfig for the sub-application with which
+ * @param config ApplicationConfig for the module with which
* this plug in is associated
*
* @exception ServletException if this <code>PlugIn</code> cannot
@@ -252,7 +252,7 @@
* appropriate TilesRequestProcessor class. If no, set processor class to
* TilesRequestProcessor
*
- * @param config ApplicationConfig for the sub-application with which
+ * @param config ApplicationConfig for the module with which
* this plug in is associated
* @throws ServletException If an error occur
*/
1.8 +5 -5
jakarta-struts/src/share/org/apache/struts/tiles/TilesRequestProcessor.java
Index: TilesRequestProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesRequestProcessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TilesRequestProcessor.java 10 Oct 2002 16:32:27 -0000 1.7
+++ TilesRequestProcessor.java 18 Oct 2002 15:27:42 -0000 1.8
@@ -114,13 +114,13 @@
*/
protected void initDefinitionsMapping() throws ServletException
{
- // Retrieve and set factory for this subapps
+ // Retrieve and set factory for this modules
definitionsFactory = DefinitionsUtil.getDefinitionsFactory(getServletContext());
if( definitionsFactory == null )
{ // problem !
if(log.isErrorEnabled())
{
- log.error( "Definition Factory not found for subapp '"
+ log.error( "Definition Factory not found for module '"
+ appConfig.getPrefix() + "'. "
+ "Have you declared the appropriate plugin in struts-config.xml ?"
);
}
1.64 +5 -5
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- RequestUtils.java 17 Oct 2002 02:41:59 -0000 1.63
+++ RequestUtils.java 18 Oct 2002 15:27:43 -0000 1.64
@@ -1458,7 +1458,7 @@
while (prefix.equals("") &&
((lastSlash = matchPath.lastIndexOf("/")) != 0)) {
- // We may be in a non-default sub-app. Try to get it's prefix.
+ // We may be in a non-default module. Try to get it's prefix.
matchPath = matchPath.substring(0, lastSlash);
// Match against the list of module prefixes
1.6 +10 -10 jakarta-struts/src/test/org/apache/struts/mock/TestMockBase.java
Index: TestMockBase.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/mock/TestMockBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestMockBase.java 27 Jul 2002 23:26:09 -0000 1.5
+++ TestMockBase.java 18 Oct 2002 15:27:43 -0000 1.6
@@ -138,15 +138,15 @@
response = new MockHttpServletResponse();
page = new MockPageContext(config, request, response);
- // Set up application configurations for our supported subapps
+ // Set up application configurations for our supported modules
setUpDefaultApp();
setUpSecondApp();
// NOTE - we do not initialize the request attribute
- // for the selected subapp so that fallbacks to the
- // default subapp can be tested. To select a subapp,
+ // for the selected module so that fallbacks to the
+ // default module can be tested. To select a module,
// tests should set the request attribute Action.APPLICATION_KEY
- // to the ApplicationConfig instance for the selected subapp
+ // to the ApplicationConfig instance for the selected module
}
@@ -337,13 +337,13 @@
assertEquals("session-->context",
context, session.getServletContext());
- // Validate the configuration for the default subapp
+ // Validate the configuration for the default module
assertNotNull("appConfig is present", appConfig);
assertEquals("context-->appConfig",
appConfig,
context.getAttribute(Action.APPLICATION_KEY));
- // Validate the configuration for the second subapp
+ // Validate the configuration for the second module
assertNotNull("appConfig2 is present", appConfig2);
assertEquals("context-->appConfig2",
appConfig2,
1.12 +30 -30
jakarta-struts/src/test/org/apache/struts/util/TestRequestUtils.java
Index: TestRequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/util/TestRequestUtils.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TestRequestUtils.java 13 Oct 2002 01:59:32 -0000 1.11
+++ TestRequestUtils.java 18 Oct 2002 15:27:43 -0000 1.12
@@ -481,7 +481,7 @@
// ----------------------------------------------------------- computeURL()
- // Default subapp -- Forward only
+ // Default module -- Forward only
public void testComputeURL1a() {
request.setPathElements("/myapp", "/action.do", null, null);
@@ -502,7 +502,7 @@
}
- // Default subapp -- Href only
+ // Default module -- Href only
public void testComputeURL1b() {
request.setPathElements("/myapp", "/action.do", null, null);
@@ -523,7 +523,7 @@
}
- // Default subapp -- Page only
+ // Default module -- Page only
public void testComputeURL1c() {
request.setPathElements("/myapp", "/action.do", null, null);
@@ -544,7 +544,7 @@
}
- // Default subapp -- Forward with pattern
+ // Default module -- Forward with pattern
public void testComputeURL1d() {
appConfig.getControllerConfig().setForwardPattern
@@ -567,7 +567,7 @@
}
- // Default subapp -- Page with pattern
+ // Default module -- Page with pattern
public void testComputeURL1e() {
appConfig.getControllerConfig().setPagePattern
@@ -590,7 +590,7 @@
}
- // Default subapp -- Forward with relative path (non-context-relative)
+ // Default module -- Forward with relative path (non-context-relative)
public void testComputeURL1f() {
request.setPathElements("/myapp", "/action.do", null, null);
@@ -611,7 +611,7 @@
}
- // Default subapp -- Forward with relative path (context-relative)
+ // Default module -- Forward with relative path (context-relative)
public void testComputeURL1g() {
request.setPathElements("/myapp", "/action.do", null, null);
@@ -632,7 +632,7 @@
}
- // Default subapp -- Forward with external path
+ // Default module -- Forward with external path
public void testComputeURL1h() {
request.setPathElements("/myapp", "/action.do", null, null);
@@ -652,7 +652,7 @@
}
- // Second subapp -- Forward only
+ // Second module -- Forward only
public void testComputeURL2a() {
request.setAttribute(Action.APPLICATION_KEY, appConfig2);
@@ -674,7 +674,7 @@
}
- // Second subapp -- Href only
+ // Second module -- Href only
public void testComputeURL2b() {
request.setAttribute(Action.APPLICATION_KEY, appConfig2);
@@ -696,7 +696,7 @@
}
- // Second subapp -- Page only
+ // Second module -- Page only
public void testComputeURL2c() {
request.setAttribute(Action.APPLICATION_KEY, appConfig2);
@@ -718,7 +718,7 @@
}
- // Default subapp -- Forward with pattern
+ // Default module -- Forward with pattern
public void testComputeURL2d() {
request.setAttribute(Action.APPLICATION_KEY, appConfig2);
@@ -742,7 +742,7 @@
}
- // Second subapp -- Page with pattern
+ // Second module -- Page with pattern
public void testComputeURL2e() {
appConfig2.getControllerConfig().setPagePattern
@@ -766,7 +766,7 @@
}
- // Second subapp -- Forward with relative path (non-context-relative)
+ // Second module -- Forward with relative path (non-context-relative)
public void testComputeURL2f() {
request.setAttribute(Action.APPLICATION_KEY, appConfig2);
@@ -788,7 +788,7 @@
}
- // Second subapp -- Forward with relative path (context-relative)
+ // Second module -- Forward with relative path (context-relative)
public void testComputeURL2g() {
request.setAttribute(Action.APPLICATION_KEY, appConfig2);
@@ -810,7 +810,7 @@
}
- // Second subapp -- Forward with external path
+ // Second module -- Forward with external path
public void testComputeURL2h() {
request.setAttribute(Action.APPLICATION_KEY, appConfig2);
@@ -973,7 +973,7 @@
- // Default subapp -- No ActionForm should be created
+ // Default module -- No ActionForm should be created
public void testCreateActionForm1a() {
request.setPathElements("/myapp", "/noform.do", null, null);
@@ -987,7 +987,7 @@
}
- // Second subapp -- No ActionForm should be created
+ // Second module -- No ActionForm should be created
public void testCreateActionForm1b() {
request.setPathElements("/myapp", "/2/noform.do", null, null);
@@ -1001,7 +1001,7 @@
}
- // Default subapp -- Standard ActionForm should be created
+ // Default module -- Standard ActionForm should be created
public void testCreateActionForm2a() {
request.setPathElements("/myapp", "/static.do", null, null);
@@ -1024,7 +1024,7 @@
}
- // Second subapp -- Standard ActionForm should be created
+ // Second module -- Standard ActionForm should be created
public void testCreateActionForm2b() {
request.setPathElements("/myapp", "/2/static.do", null, null);
@@ -1047,7 +1047,7 @@
}
- // Default subapp -- Dynamic ActionForm should be created
+ // Default module -- Dynamic ActionForm should be created
public void testCreateActionForm3a() {
request.setPathElements("/myapp", "/dynamic.do", null, null);
@@ -1070,7 +1070,7 @@
}
- // Second subapp -- Dynamic ActionForm should be created
+ // Second module -- Dynamic ActionForm should be created
public void testCreateActionForm3b() {
request.setPathElements("/myapp", "/2/dynamic2.do", null, null);
@@ -1116,7 +1116,7 @@
// ---------------------------------------------------- selectApplication()
- // Map to the default subapp -- direct
+ // Map to the default module -- direct
public void testSelectApplication1a() {
request.setPathElements("/myapp", "/noform.do", null, null);
@@ -1131,7 +1131,7 @@
}
- // Map to the second webapp -- direct
+ // Map to the second module -- direct
public void testSelectApplication1b() {
request.setPathElements("/myapp", "/2/noform.do", null, null);
@@ -1146,7 +1146,7 @@
}
- // Map to the default subapp -- include
+ // Map to the default module -- include
public void testSelectApplication2a() {
request.setPathElements("/myapp", "/2/noform.do", null, null);
@@ -1163,7 +1163,7 @@
}
- // Map to the second subapp -- include
+ // Map to the second module -- include
public void testSelectApplication2b() {
request.setPathElements("/myapp", "/noform.do", null, null);
1.26 +1 -1 jakarta-struts/web/example/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/struts-config.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- struts-config.xml 27 Jul 2002 18:55:57 -0000 1.25
+++ struts-config.xml 18 Oct 2002 15:27:43 -0000 1.26
@@ -151,7 +151,7 @@
<controller>
<!-- The "input" parameter on "action" elements is the name of a
- local or global "forward" rather than a subapp-relative path -->
+ local or global "forward" rather than a module-relative path -->
<set-property property="inputForward" value="true"/>
</controller>
--
To unsubscribe, e-mail: <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>
