haul 2003/01/15 08:15:36
Modified: src/java/org/apache/cocoon/components/modules/input Tag:
cocoon_2_0_3_branch AbstractJXPathModule.java
AbstractMetaModule.java DigestMetaModule.java
JXPathMetaModule.java RandomNumberModule.java
Log:
backport cleanups and small fixes from 2.1
Revision Changes Path
No revision
No revision
1.3.2.5 +5 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractJXPathModule.java
Index: AbstractJXPathModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractJXPathModule.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- AbstractJXPathModule.java 16 Dec 2002 14:56:30 -0000 1.3.2.4
+++ AbstractJXPathModule.java 15 Jan 2003 16:15:35 -0000 1.3.2.5
@@ -215,11 +215,11 @@
}
- public Object getAttribute(String name, Configuration modeConf,
- Map objectModel)
+ public Object getAttribute(String name, Configuration modeConf, Map objectModel)
throws ConfigurationException {
Object contextObj = getContextObject(modeConf, objectModel);
+ if (contextObj == null) return null;
try {
JXPathContext jxContext = JXPathContext.newContext(contextObj);
setupExtensions(jxContext, modeConf);
@@ -238,6 +238,7 @@
throws ConfigurationException {
Object contextObj = getContextObject(modeConf, objectModel);
+ if (contextObj == null) return null;
try {
JXPathBeanInfo info = JXPathIntrospector.getBeanInfo(
contextObj.getClass());
@@ -261,6 +262,7 @@
throws ConfigurationException {
Object contextObj = getContextObject(modeConf, objectModel);
+ if (contextObj == null) return null;
try {
JXPathContext jxContext = JXPathContext.newContext(contextObj);
List values = new LinkedList();
1.3.2.4 +4 -5
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
Index: AbstractMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- AbstractMetaModule.java 19 Dec 2002 11:24:29 -0000 1.3.2.3
+++ AbstractMetaModule.java 15 Jan 2003 16:15:35 -0000 1.3.2.4
@@ -51,17 +51,16 @@
package org.apache.cocoon.components.modules.input;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.thread.ThreadSafe;
-
-import java.util.Iterator;
-import java.util.Map;
/**
* AbstractMetaModule gives you the infrastructure for easily
1.4.4.3 +20 -12
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java
Index: DigestMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -u -r1.4.4.2 -r1.4.4.3
--- DigestMetaModule.java 19 Dec 2002 11:24:29 -0000 1.4.4.2
+++ DigestMetaModule.java 15 Jan 2003 16:15:35 -0000 1.4.4.3
@@ -107,18 +107,23 @@
// default vs dynamic
Configuration inputConfig = null;
String inputName=null;
+ String algorithm = this.defaultAlgorithm;
+ String provider = this.defaultProvider;
+ String salt = this.defaultSalt;
+ boolean encode = this.defaultEncode;
if (modeConf!=null) {
inputName =
modeConf.getChild("input-module").getAttribute("name",null);
if (inputName != null) {
inputConfig = modeConf.getChild("input-module");
}
+ // read necessary parameters
+ algorithm = modeConf.getAttribute("algorithm", algorithm);
+ provider = modeConf.getAttribute("provider" , provider );
+ salt = modeConf.getAttribute("salt" , salt );
+ encode = modeConf.getAttributeAsBoolean("encode" , encode );
}
- // read necessary parameters
- String algorithm = modeConf.getAttribute("algorithm",this.defaultAlgorithm);
- String provider = modeConf.getAttribute("provider" ,this.defaultProvider );
- String salt = modeConf.getAttribute("salt" ,this.defaultSalt );
- boolean encode = modeConf.getAttributeAsBoolean("encode"
,this.defaultEncode );
+
Object result = null;
@@ -204,18 +209,21 @@
// default vs dynamic
Configuration inputConfig = null;
String inputName=null;
+ String algorithm = this.defaultAlgorithm;
+ String provider = this.defaultProvider;
+ String salt = this.defaultSalt;
+ boolean encode = this.defaultEncode;
if (modeConf!=null) {
inputName =
modeConf.getChild("input-module").getAttribute("name",null);
if (inputName != null) {
inputConfig = modeConf.getChild("input-module");
}
+ // read necessary parameters
+ algorithm = modeConf.getAttribute("algorithm", algorithm);
+ provider = modeConf.getAttribute("provider" , provider );
+ salt = modeConf.getAttribute("salt" , salt );
+ encode = modeConf.getAttributeAsBoolean("encode" , encode );
}
-
- // read necessary parameters
- String algorithm = modeConf.getAttribute("algorithm",this.defaultAlgorithm);
- String provider = modeConf.getAttribute("provider" ,this.defaultProvider );
- String salt = modeConf.getAttribute("salt" ,this.defaultSalt );
- boolean encode = modeConf.getAttributeAsBoolean("encode"
,this.defaultEncode );
Object[] values = getValues(name, objectModel,
this.input, this.defaultInput, this.inputConf,
1.1.2.5 +4 -1
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
Index: JXPathMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- JXPathMetaModule.java 19 Dec 2002 11:24:29 -0000 1.1.2.4
+++ JXPathMetaModule.java 15 Jan 2003 16:15:35 -0000 1.1.2.5
@@ -238,6 +238,7 @@
throws ConfigurationException {
Object contextObj = getContextObject(modeConf, objectModel);
+ if (contextObj == null) return null;
try {
JXPathContext jxContext = JXPathContext.newContext(contextObj);
setupExtensions(jxContext, modeConf);
@@ -258,6 +259,7 @@
throws ConfigurationException {
Object contextObj = getContextObject(modeConf, objectModel);
+ if (contextObj == null) return null;
try {
JXPathBeanInfo info = JXPathIntrospector.getBeanInfo(
contextObj.getClass());
@@ -281,6 +283,7 @@
throws ConfigurationException {
Object contextObj = getContextObject(modeConf, objectModel);
+ if (contextObj == null) return null;
try {
JXPathContext jxContext = JXPathContext.newContext(contextObj);
List values = new LinkedList();
1.2.4.2 +6 -7
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RandomNumberModule.java
Index: RandomNumberModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/RandomNumberModule.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- RandomNumberModule.java 17 Nov 2002 19:12:49 -0000 1.2.4.1
+++ RandomNumberModule.java 15 Jan 2003 16:15:35 -0000 1.2.4.2
@@ -51,16 +51,15 @@
package org.apache.cocoon.components.modules.input;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
-import java.util.StringTokenizer;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.thread.ThreadSafe;
/**
* RandomNumberModule returns a random number as string.
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
