craigmcc 02/03/22 16:08:01
Modified: conf/share struts-config_1_1.dtd
src/share/org/apache/struts/config DataSourceConfig.java
MessageResourcesConfig.java
Log:
Remove references to o.a.s.action.Action which will make these two config
classes non-Serializable.
Revision Changes Path
1.16 +3 -3 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- struts-config_1_1.dtd 16 Mar 2002 01:08:01 -0000 1.15
+++ struts-config_1_1.dtd 23 Mar 2002 00:08:01 -0000 1.16
@@ -11,7 +11,7 @@
"-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
- $Id: struts-config_1_1.dtd,v 1.15 2002/03/16 01:08:01 craigmcc Exp $
+ $Id: struts-config_1_1.dtd,v 1.16 2002/03/23 00:08:01 craigmcc Exp $
-->
@@ -125,7 +125,7 @@
<!ELEMENT data-source (set-property*)>
<!ATTLIST data-source id ID #IMPLIED>
<!ATTLIST data-source className %ClassName; #IMPLIED>
-<!ATTLIST data-source key %AttributeName; #IMPLIED>
+<!ATTLIST data-source key %AttributeName;
"org.apache.struts.action.DATA_SOURCE">
<!ATTLIST data-source type %ClassName; #IMPLIED>
@@ -494,7 +494,7 @@
<!ATTLIST message-resources id ID #IMPLIED>
<!ATTLIST message-resources className %ClassName; #IMPLIED>
<!ATTLIST message-resources factory %ClassName; #IMPLIED>
-<!ATTLIST message-resources key %AttributeName; #IMPLIED>
+<!ATTLIST message-resources key %AttributeName;
"org.apache.struts.action.MESSAGE">
<!ATTLIST message-resources null %Boolean; #IMPLIED>
<!ATTLIST message-resources parameter CDATA #REQUIRED>
1.5 +5 -6
jakarta-struts/src/share/org/apache/struts/config/DataSourceConfig.java
Index: DataSourceConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/DataSourceConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DataSourceConfig.java 23 Feb 2002 23:53:29 -0000 1.4
+++ DataSourceConfig.java 23 Mar 2002 00:08:01 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/DataSourceConfig.java,v
1.4 2002/02/23 23:53:29 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/23 23:53:29 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/DataSourceConfig.java,v
1.5 2002/03/23 00:08:01 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/03/23 00:08:01 $
*
* ====================================================================
*
@@ -67,7 +67,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.struts.action.Action;
/**
@@ -80,7 +79,7 @@
* of them may be ignored by custom data source implementations.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2002/02/23 23:53:29 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/23 00:08:01 $
* @since Struts 1.1
*/
@@ -104,7 +103,7 @@
* The servlet context attribute key under which this data source
* is stored and made available.
*/
- protected String key = Action.DATA_SOURCE_KEY;
+ protected String key = null;
public String getKey() {
return (this.key);
1.5 +5 -6
jakarta-struts/src/share/org/apache/struts/config/MessageResourcesConfig.java
Index: MessageResourcesConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/MessageResourcesConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MessageResourcesConfig.java 23 Feb 2002 23:53:29 -0000 1.4
+++ MessageResourcesConfig.java 23 Mar 2002 00:08:01 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/MessageResourcesConfig.java,v
1.4 2002/02/23 23:53:29 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/23 23:53:29 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/MessageResourcesConfig.java,v
1.5 2002/03/23 00:08:01 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/03/23 00:08:01 $
*
* ====================================================================
*
@@ -64,7 +64,6 @@
import java.io.Serializable;
-import org.apache.struts.action.Action;
/**
@@ -73,7 +72,7 @@
* configuration file.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2002/02/23 23:53:29 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/23 00:08:01 $
* @since Struts 1.1
*/
@@ -115,7 +114,7 @@
* The servlet context attributes key under which this MessageResources
* instance is stored.
*/
- protected String key = Action.MESSAGES_KEY;
+ protected String key = null;
public String getKey() {
return (this.key);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
