haul 2003/03/07 02:49:19
Modified: src/java/org/apache/cocoon/components/modules/input
SessionAttributeModule.java
RequestParameterModule.java
RequestAttributeModule.java
RawRequestParameterModule.java
HeaderAttributeModule.java DateMetaInputModule.java
DateInputModule.java
Log:
Fix some default configurations
Revision Changes Path
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java
Index: SessionAttributeModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/SessionAttributeModule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SessionAttributeModule.java 31 Jan 2003 22:51:28 -0000 1.6
+++ SessionAttributeModule.java 7 Mar 2003 10:49:18 -0000 1.7
@@ -78,7 +78,7 @@
public Object getAttribute( String name, Configuration modeConf, Map
objectModel )
throws ConfigurationException {
- String pname = name;
+ String pname = this.settings.get("parameter", name);
if ( modeConf != null ) {
pname = modeConf.getAttribute( "parameter", pname );
// preferred
@@ -99,7 +99,7 @@
throws ConfigurationException {
Request request = ObjectModelHelper.getRequest(objectModel);
- String wildcard = name;
+ String wildcard = this.settings.get("parameter", name);
if ( modeConf != null ) {
wildcard = modeConf.getAttribute( "parameter", wildcard );
// preferred
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestParameterModule.java
Index: RequestParameterModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestParameterModule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestParameterModule.java 31 Jan 2003 22:51:28 -0000 1.6
+++ RequestParameterModule.java 7 Mar 2003 10:49:18 -0000 1.7
@@ -79,7 +79,7 @@
public Object getAttribute( String name, Configuration modeConf, Map
objectModel ) throws ConfigurationException {
- String pname = name;
+ String pname = this.settings.get("parameter", name);
if ( modeConf != null ) {
pname = modeConf.getAttribute( "parameter", pname );
// preferred
@@ -99,7 +99,7 @@
throws ConfigurationException {
Request request = ObjectModelHelper.getRequest(objectModel);
- String wildcard = name;
+ String wildcard = this.settings.get("parameter", name);
if ( modeConf != null ) {
wildcard = modeConf.getAttribute( "parameter", wildcard );
// preferred
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestAttributeModule.java
Index: RequestAttributeModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RequestAttributeModule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestAttributeModule.java 31 Jan 2003 22:51:28 -0000 1.6
+++ RequestAttributeModule.java 7 Mar 2003 10:49:18 -0000 1.7
@@ -78,7 +78,7 @@
public Object getAttribute( String name, Configuration modeConf, Map
objectModel )
throws ConfigurationException {
- String pname = name;
+ String pname = this.settings.get("parameter", name);
if ( modeConf != null ) {
pname = modeConf.getAttribute( "parameter", pname );
// preferred
@@ -99,7 +99,7 @@
throws ConfigurationException {
Request request = ObjectModelHelper.getRequest(objectModel);
- String wildcard = name;
+ String wildcard = this.settings.get("parameter",name);
if ( modeConf != null ) {
wildcard = modeConf.getAttribute( "parameter", wildcard );
// preferred
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RawRequestParameterModule.java
Index: RawRequestParameterModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RawRequestParameterModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RawRequestParameterModule.java 31 Jan 2003 22:51:28 -0000 1.2
+++ RawRequestParameterModule.java 7 Mar 2003 10:49:18 -0000 1.3
@@ -76,7 +76,7 @@
public Object getAttribute( String name, Configuration modeConf, Map
objectModel ) throws ConfigurationException {
- String pname = name;
+ String pname = this.settings.get("parameter",name);
if ( modeConf != null ) {
pname = modeConf.getAttribute( "parameter", pname );
// preferred
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/HeaderAttributeModule.java
Index: HeaderAttributeModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/HeaderAttributeModule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HeaderAttributeModule.java 31 Jan 2003 22:51:28 -0000 1.6
+++ HeaderAttributeModule.java 7 Mar 2003 10:49:18 -0000 1.7
@@ -77,7 +77,7 @@
public Object getAttribute( String name, Configuration modeConf, Map
objectModel )
throws ConfigurationException {
- String pname = name;
+ String pname = this.setting.get("parameter",name);
if ( modeConf != null ) {
pname = modeConf.getAttribute( "parameter", pname );
// preferred
@@ -98,7 +98,7 @@
throws ConfigurationException {
Request request = ObjectModelHelper.getRequest(objectModel);
- String wildcard = name;
+ String wildcard = this.settings.get("parameter", name);
if ( modeConf != null ) {
wildcard = modeConf.getAttribute( "parameter", wildcard );
// preferred
1.9 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java
Index: DateMetaInputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DateMetaInputModule.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DateMetaInputModule.java 21 Feb 2003 13:59:23 -0000 1.8
+++ DateMetaInputModule.java 7 Mar 2003 10:49:18 -0000 1.9
@@ -102,13 +102,13 @@
Configuration mConf = null;
String inputName=null;
String parameter=name;
- String format=null;
+ String format=this.defaultFormat;
DateFormat formatter=null;
if (modeConf!=null) {
mConf = modeConf.getChild("input-module");
inputName =
modeConf.getChild("input-module").getAttribute("name",null);
parameter = modeConf.getAttribute("parameter",parameter);
- format = modeConf.getAttribute("format",this.defaultFormat);
+ format = modeConf.getAttribute("format",format);
// preferred:
parameter = modeConf.getChild("parameter").getValue(parameter);
format = modeConf.getChild("format").getValue(format);
1.10 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java
Index: DateInputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DateInputModule.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DateInputModule.java 21 Feb 2003 13:59:23 -0000 1.9
+++ DateInputModule.java 7 Mar 2003 10:49:18 -0000 1.10
@@ -78,9 +78,9 @@
public Object getAttribute( String name, Configuration modeConf, Map
objectModel ) throws ConfigurationException {
- String format = null;
+ String format = (String) this.settings.get("format",null);
if (modeConf != null) {
- format = modeConf.getAttribute("format", (String)
this.settings.get("format",null));
+ format = modeConf.getAttribute("format", format);
// this is preferred:
format = modeConf.getChild("format").getValue(format);
}
