haul 2002/08/11 10:50:12
Modified: src/scratchpad/src/org/apache/cocoon/matching/modular Tag:
cocoon_2_0_3_branch CachingWildcardMatcher.java
WildcardMatcher.java
Log:
<action dev="CH" type="update">
Sync modules and related components with HEAD.
</action>
Revision Changes Path
No revision
No revision
1.1.2.1 +3 -6
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/matching/modular/Attic/CachingWildcardMatcher.java
Index: CachingWildcardMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/matching/modular/Attic/CachingWildcardMatcher.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- CachingWildcardMatcher.java 15 Mar 2002 15:18:44 -0000 1.1
+++ CachingWildcardMatcher.java 11 Aug 2002 17:50:12 -0000 1.1.2.1
@@ -62,8 +62,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.environment.ObjectModelHelper;
-
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.matching.AbstractWildcardMatcher;
@@ -197,8 +195,7 @@
// thus we still have a reference to it
try {
if (this.input != null) {
- result = this.input.getAttribute(paramName, this.inputConf,
-
ObjectModelHelper.getRequest(objectModel));
+ result = this.input.getAttribute(paramName, this.inputConf,
objectModel);
}
} catch (Exception e) {
if (getLogger().isWarnEnabled())
@@ -217,7 +214,7 @@
iput = (InputModule) iputSelector.select(inputName);
}
if (iput != null) {
- result = iput.getAttribute(paramName, this.inputConf,
ObjectModelHelper.getRequest(objectModel));
+ result = iput.getAttribute(paramName, this.inputConf,
objectModel);
}
} catch (Exception e) {
if (getLogger().isWarnEnabled())
1.1.2.1 +2 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/matching/modular/Attic/WildcardMatcher.java
Index: WildcardMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/matching/modular/Attic/WildcardMatcher.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- WildcardMatcher.java 15 Mar 2002 15:18:44 -0000 1.1
+++ WildcardMatcher.java 11 Aug 2002 17:50:12 -0000 1.1.2.1
@@ -59,8 +59,6 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.cocoon.environment.ObjectModelHelper;
-
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.matching.AbstractWildcardMatcher;
@@ -143,8 +141,7 @@
input = (InputModule) inputSelector.select(inputName);
}
if (input != null) {
- result = input.getAttribute(paramName, this.inputConf,
-
ObjectModelHelper.getRequest(objectModel));
+ result = input.getAttribute(paramName, this.inputConf, objectModel);
}
} catch (Exception e) {
if (getLogger().isWarnEnabled())
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
