haul 02/05/28 06:42:11
Modified: src/java/org/apache/cocoon/matching/modular
CachingWildcardMatcher.java WildcardMatcher.java
Log:
Changed modules from using the request object to using objectModel instead. This
entails some larger modifications to the modular database actions as they used
to inherit the setColumn method which doesn't work anymore. Some code has been put
to a utility class and the modular datbase action are now no subclass of the
original ones anymore.
Revision Changes Path
1.2 +3 -6
xml-cocoon2/src/java/org/apache/cocoon/matching/modular/CachingWildcardMatcher.java
Index: CachingWildcardMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/modular/CachingWildcardMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CachingWildcardMatcher.java 15 Mar 2002 15:18:44 -0000 1.1
+++ CachingWildcardMatcher.java 28 May 2002 13:42:10 -0000 1.2
@@ -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;
@@ -83,7 +81,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: CachingWildcardMatcher.java,v 1.1 2002/03/15 15:18:44 haul Exp
$
+ * @version CVS $Id: CachingWildcardMatcher.java,v 1.2 2002/05/28 13:42:10 haul Exp
$
*/
public class CachingWildcardMatcher extends AbstractWildcardMatcher
implements Configurable, Initializable, Composable, Disposable
@@ -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.2 +2 -5
xml-cocoon2/src/java/org/apache/cocoon/matching/modular/WildcardMatcher.java
Index: WildcardMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/modular/WildcardMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WildcardMatcher.java 15 Mar 2002 15:18:44 -0000 1.1
+++ WildcardMatcher.java 28 May 2002 13:42:10 -0000 1.2
@@ -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;
@@ -80,7 +78,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: WildcardMatcher.java,v 1.1 2002/03/15 15:18:44 haul Exp $
+ * @version CVS $Id: WildcardMatcher.java,v 1.2 2002/05/28 13:42:10 haul Exp $
*/
public class WildcardMatcher extends AbstractWildcardMatcher
implements Configurable, Composable
@@ -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]
