rleland 2004/02/01 08:15:33
Modified: src/share/org/apache/struts/action
ActionResources.properties
src/share/org/apache/struts/plugins
ModuleConfigVerifier.java
src/share/org/apache/struts/taglib/bean StrutsTag.java
src/test/org/apache/struts/mock TestMockBase.java
Log:
Doc changes only-
Remove the old wording 'application module', 'application prefix',
and just use 'module' & 'module prefix'. Quite a few of these were left over.
Revision Changes Path
1.13 +1 -1
jakarta-struts/src/share/org/apache/struts/action/ActionResources.properties
Index: ActionResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionResources.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ActionResources.properties 15 Jul 2003 03:43:35 -0000 1.12
+++ ActionResources.properties 1 Feb 2004 16:15:33 -0000 1.13
@@ -8,7 +8,7 @@
configMapping=Configuring mapping for path {0}
configMissing=Missing configuration resource for path {0}
configParse=Parsing error processing resource path {0}
-configVerifying=Verifying ModuleConfig for this application module
+configVerifying=Verifying ModuleConfig for this module
configWebXml=The /WEB-INF/web.xml was not found.
dataSource.destroy=Finalizing application data source {0}
dataSource.init=Initializing application data source {0}
1.7 +6 -6
jakarta-struts/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java
Index: ModuleConfigVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/plugins/ModuleConfigVerifier.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ModuleConfigVerifier.java 13 Jan 2004 12:48:45 -0000 1.6
+++ ModuleConfigVerifier.java 1 Feb 2004 16:15:33 -0000 1.7
@@ -76,7 +76,7 @@
/**
* <p>Convenient implementation of [EMAIL PROTECTED] PlugIn} that performs as many
* verification tests on the information stored in the [EMAIL PROTECTED]
ModuleConfig}
- * for this application module as is practical. Based on the setting of the
+ * for this module as is practical. Based on the setting of the
* <code>fatal</code> property (which defaults to <code>true</code>), the
* detection of any such errors will cause a <code>ServletException</code>
* to be thrown from the <code>init</code> method, which will ultimately
@@ -96,7 +96,7 @@
/**
- * <p>The [EMAIL PROTECTED] ModuleConfig} instance for our application
module.</p>
+ * <p>The [EMAIL PROTECTED] ModuleConfig} instance for our module.</p>
*/
protected ModuleConfig config = null;
1.18 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/bean/StrutsTag.java
Index: StrutsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/StrutsTag.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StrutsTag.java 13 Jan 2004 12:48:46 -0000 1.17
+++ StrutsTag.java 1 Feb 2004 16:15:33 -0000 1.18
@@ -175,7 +175,7 @@
throw e;
}
- // Retrieve our application module configuration information
+ // Retrieve our module configuration information
ModuleConfig config = TagUtils.getInstance().getModuleConfig(pageContext);
// Retrieve the requested object to be exposed
1.15 +5 -5 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TestMockBase.java 13 Jan 2004 12:48:53 -0000 1.14
+++ TestMockBase.java 1 Feb 2004 16:15:33 -0000 1.15
@@ -152,7 +152,7 @@
// NOTE - we do not initialize the request attribute
// 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
+ // tests should set the request attribute Globals.MODULE_KEY
// to the ModuleConfig instance for the selected module
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
