haul 02/04/28 12:22:03 Modified: src/scratchpad/src/org/apache/cocoon/components/modules/input InputModule.java Added: src/scratchpad/src/org/apache/cocoon/components/modules/input StringConstantModule.java NullInputModule.java RandomNumberModule.java DigestMetaModule.java DateInputModule.java CollectionMetaModule.java Log: More modules Revision Changes Path 1.2 +2 -2 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/input/InputModule.java Index: InputModule.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/input/InputModule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- InputModule.java 15 Mar 2002 15:15:08 -0000 1.1 +++ InputModule.java 28 Apr 2002 19:22:02 -0000 1.2 @@ -60,12 +60,12 @@ import org.apache.avalon.framework.configuration.ConfigurationException; /** - * AttributeModule specifies an interface for components that provide + * InputModule specifies an interface for components that provide * access to individual attributes e.g. request parameters, request * attributes, session attributes &c. * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> - * @version CVS $Id: InputModule.java,v 1.1 2002/03/15 15:15:08 haul Exp $ + * @version CVS $Id: InputModule.java,v 1.2 2002/04/28 19:22:02 haul Exp $ */ public interface InputModule extends Component { 1.1 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/input/StringConstantModule.java Index: StringConstantModule.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact [EMAIL PROTECTED] 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ package org.apache.cocoon.components.modules.input; import java.util.Enumeration; import java.util.List; import java.util.LinkedList; import java.util.StringTokenizer; import org.apache.cocoon.environment.Request; 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; /** * StringConstantModule returns a constant string. * Constant must be the only content of the configuration object. * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> * @version CVS $Id: StringConstantModule.java,v 1.1 2002/04/28 19:22:02 haul Exp $ */ public class StringConstantModule extends AbstractInputModule implements ThreadSafe { final static Enumeration returnNames = new StringTokenizer("stringConstant"); public Object getAttribute( String name, Configuration modeConf, Request request ) throws ConfigurationException { if (modeConf == null) { return null; } else { return modeConf.getValue(); } } public Enumeration getAttributeNames( Configuration modeConf, Request request ) throws ConfigurationException { return StringConstantModule.returnNames; } public Object[] getAttributeValues( String name, Configuration modeConf, Request request ) throws ConfigurationException { List values = new LinkedList(); values.add( this.getAttribute(name, modeConf, request) ); return values.toArray(); } } 1.1 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/input/NullInputModule.java Index: NullInputModule.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact [EMAIL PROTECTED] 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ package org.apache.cocoon.components.modules.input; import java.util.Enumeration; import java.util.List; import java.util.LinkedList; import java.util.StringTokenizer; import org.apache.cocoon.environment.Request; 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; /** * NullInputModule returns a null object. Use this if you wnat to * explicitly forbit a parameter to be filled. E.g. a database column * shall be filled with a default value, your forms never contain that * parameter but you don't want anyone to provide this parameter * manually. * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> * @version CVS $Id: NullInputModule.java,v 1.1 2002/04/28 19:22:02 haul Exp $ */ public class NullInputModule extends AbstractInputModule implements ThreadSafe { public Object getAttribute( String name, Configuration modeConf, Request request ) throws ConfigurationException { return null; } public Enumeration getAttributeNames( Configuration modeConf, Request request ) throws ConfigurationException { return null; } public Object[] getAttributeValues( String name, Configuration modeConf, Request request ) throws ConfigurationException { return null; } } 1.1 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/input/RandomNumberModule.java Index: RandomNumberModule.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact [EMAIL PROTECTED] 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ package org.apache.cocoon.components.modules.input; import java.util.Enumeration; import java.util.List; import java.util.LinkedList; import java.util.StringTokenizer; import org.apache.cocoon.environment.Request; 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. * Configuration through attributes of root node: "min", "max" setting * range of random number. Defaults to "0" and "9999999999" * respectively. * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> * @version CVS $Id: RandomNumberModule.java,v 1.1 2002/04/28 19:22:02 haul Exp $ */ public class RandomNumberModule extends AbstractInputModule implements ThreadSafe { final static Enumeration returnNames = new StringTokenizer("stringConstant"); public Object getAttribute( String name, Configuration modeConf, Request request ) throws ConfigurationException { long min = Long.parseLong(modeConf.getAttribute("min","0")); long max = Long.parseLong(modeConf.getAttribute("max","9999999999")); return Long.toString(java.lang.Math.round(java.lang.Math.random()*(max-min))); } public Enumeration getAttributeNames( Configuration modeConf, Request request ) throws ConfigurationException { return RandomNumberModule.returnNames; } public Object[] getAttributeValues( String name, Configuration modeConf, Request request ) throws ConfigurationException { List values = new LinkedList(); values.add( this.getAttribute(name, modeConf, request) ); return values.toArray(); } } 1.1 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/input/DigestMetaModule.java Index: DigestMetaModule.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact [EMAIL PROTECTED] 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ /* <mode name="CollectionMeta"> <member name="foo_*" type="int"/> </mode> */ package org.apache.cocoon.components.modules.input; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.activity.Initializable; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.component.ComponentSelector; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; import org.apache.cocoon.components.modules.input.InputModule; import org.apache.cocoon.matching.AbstractWildcardMatcher; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Map; import java.util.Enumeration; import java.util.Iterator; import java.util.SortedSet; import java.util.TreeSet; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; /** Meta module that obtains values from other module and returns * message digest of value. Very useful for storing and checking * passwords. Input module configured through nested element * "input-module", message digest algorithm, security provider, salt, * and URL encoded output configurable through attributes * "algorithm", "provider", "salt", "encode" of configuration root * element. Defaults are "sha", null, "salt", and "false". * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> * @version CVS $Id: DigestMetaModule.java,v 1.1 2002/04/28 19:22:02 haul Exp $ */ public class DigestMetaModule extends AbstractLoggable implements InputModule, Configurable, Initializable, Composable, Disposable { /** The component manager instance */ protected ComponentManager manager; private String defaultInput = "request"; // default to request parameters private Configuration inputConf = null; // will become an empty configuration object // during configure() so why bother here... String INPUT_MODULE_ROLE = InputModule.ROLE; String INPUT_MODULE_SELECTOR = INPUT_MODULE_ROLE+"Selector"; private boolean initialized = false; private InputModule input = null; private ComponentSelector inputSelector = null; private String defaultAlgorithm = "SHA"; private String defaultProvider = null; private String defaultSalt = "salt"; private boolean defaultEncode = false; /** * Set the current <code>ComponentManager</code> instance used by this * <code>Composable</code>. */ public void compose(ComponentManager manager) throws ComponentException { this.manager=manager; } public void configure(Configuration config) throws ConfigurationException { this.inputConf = config.getChild("input-module"); this.defaultAlgorithm = this.inputConf.getAttribute("algorithm",this.defaultAlgorithm); this.defaultProvider = this.inputConf.getAttribute("provider",this.defaultProvider); this.defaultSalt = this.inputConf.getAttribute("salt",this.defaultSalt); this.defaultEncode = this.inputConf.getAttributeAsBoolean("encode",this.defaultEncode); } public void initialize() { try { // obtain input module this.inputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); if (this.defaultInput != null && this.inputSelector != null && this.inputSelector.hasComponent(this.defaultInput) ){ this.input = (InputModule) this.inputSelector.select(this.defaultInput); if (!(this.input instanceof ThreadSafe && this.inputSelector instanceof ThreadSafe) ) { this.inputSelector.release(this.input); this.manager.release(this.inputSelector); this.input = null; this.inputSelector = null; } this.initialized = true; } else { if (getLogger().isErrorEnabled()) getLogger().error("A problem occurred setting up '" + this.defaultInput + "': Selector is "+(this.inputSelector!=null?"not ":"") +"null, Component is " +(this.inputSelector!=null&&this.inputSelector.hasComponent(this.defaultInput)?"known":"unknown")); } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred setting up '" + this.defaultInput + "': " + e.getMessage()); } } public void dispose() { if (!this.initialized) if (getLogger().isErrorEnabled()) getLogger().error("Uninitialized Component! FAILING"); else if (this.inputSelector != null) { if (this.input != null) this.inputSelector.release(this.input); this.manager.release(this.inputSelector); } } public Object getAttribute( String name, Configuration modeConf, Request request ) throws ConfigurationException { if (!this.initialized) { if (getLogger().isErrorEnabled()) getLogger().error("Uninitialized Component! FAILING"); return null; } if (this.defaultInput == null) { if (getLogger().isWarnEnabled()) getLogger().warn("No input module given. FAILING"); return null; } // obtain correct configuration objects // default vs dynamic Configuration inputConfig = null; String inputName=null; if (modeConf!=null) { inputName = modeConf.getChild("input-module").getAttribute("name",null); if (inputName != null) { inputConfig = modeConf.getChild("input-module"); } } // 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 ); // done reading configuration // setup modules and read values Object result = null; try { Object value = null; if (this.input != null && inputName == null) { // input module is thread safe // thus we still have a reference to it // and // no other module is configured dynamically value = input.getAttribute(name,this.inputConf,request); } else { // input was not thread safe // or // another module is configured dynamically // so acquire it again ComponentSelector iputSelector = null; InputModule iput = null; try { // obtain input module if (inputName == null) { inputName = this.defaultInput; inputConfig = this.inputConf; } iputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); if (this.defaultInput != null && iputSelector != null && iputSelector.hasComponent(inputName)) { iput = (InputModule) iputSelector.select(inputName); } if (iput != null) { value = iput.getAttribute(name, inputConfig, request); } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring a value from '" + inputName + "' for '"+name+"': " + e.getMessage()); } finally { // release components if (iputSelector != null) { if (iput != null) iputSelector.release(iput); this.manager.release(iputSelector); } } } // done reading value // get message digest implementation and compute hash if (value != null) { try { MessageDigest md = (provider==null ? MessageDigest.getInstance(algorithm) : MessageDigest.getInstance(algorithm,provider)); md.update((salt+(value instanceof String? (String)value : value.toString())).getBytes()); if (encode) { return URLEncoder.encode(new String(md.digest())); } else { return md.digest(); } } catch (NoSuchAlgorithmException nsae) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring digest algorithm '" + algorithm + (provider==null?"":"' from '"+provider) +"': " + nsae.getMessage()); } } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring a value from '" + inputName + "' for '"+name+"': " + e.getMessage()); } return null; } public Enumeration getAttributeNames( Configuration modeConf, Request request ) throws ConfigurationException { if (!this.initialized) { if (getLogger().isErrorEnabled()) getLogger().error("Uninitialized Component! FAILING"); return null; } if (this.defaultInput == null) { if (getLogger().isWarnEnabled()) getLogger().warn("No input module given. FAILING"); return null; } // obtain correct configuration objects // default vs dynamic Configuration inputConfig = null; String inputName=null; if (modeConf!=null) { inputName = modeConf.getChild("input-module").getAttribute("name",null); if (inputName != null) { inputConfig = modeConf.getChild("input-module"); } } // read necessary parameters // done reading configuration // setup modules and read values Object result = null; try { Enumeration names = null; if (this.input != null && inputName == null) { // input module is thread safe // thus we still have a reference to it // and // no other module is configured dynamically names = input.getAttributeNames(this.inputConf,request); } else { // input was not thread safe // or // another module is configured dynamically // so acquire it again ComponentSelector iputSelector = null; InputModule iput = null; try { // obtain input module if (inputName == null) { inputName = this.defaultInput; inputConfig = this.inputConf; } iputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); if (this.defaultInput != null && iputSelector != null && iputSelector.hasComponent(inputName)) { iput = (InputModule) iputSelector.select(inputName); } if (iput != null) { names = iput.getAttributeNames(inputConfig, request); } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring a names from '" + inputName + "': " + e.getMessage()); } finally { // release components if (iputSelector != null) { if (iput != null) iputSelector.release(iput); this.manager.release(iputSelector); } } } // done reading value return names; } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring names from '" + inputName + "' : " + e.getMessage()); } return null; } public Object[] getAttributeValues( String name, Configuration modeConf, Request request ) throws ConfigurationException { if (!this.initialized) { if (getLogger().isErrorEnabled()) getLogger().error("Uninitialized Component! FAILING"); return null; } if (this.defaultInput == null) { if (getLogger().isWarnEnabled()) getLogger().warn("No input module given. FAILING"); return null; } // obtain correct configuration objects // default vs dynamic Configuration inputConfig = null; String inputName=null; if (modeConf!=null) { inputName = modeConf.getChild("input-module").getAttribute("name",null); if (inputName != null) { inputConfig = modeConf.getChild("input-module"); } } // 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 ); // done reading configuration // setup modules and read values Object[] result = null; try { Object[] values = null; if (this.input != null && inputName == null) { // input module is thread safe // thus we still have a reference to it // and // no other module is configured dynamically values = input.getAttributeValues(name,this.inputConf,request); } else { // input was not thread safe // or // another module is configured dynamically // so acquire it again ComponentSelector iputSelector = null; InputModule iput = null; try { // obtain input module if (inputName == null) { inputName = this.defaultInput; inputConfig = this.inputConf; } iputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); if (this.defaultInput != null && iputSelector != null && iputSelector.hasComponent(inputName)) { iput = (InputModule) iputSelector.select(inputName); } if (iput != null) { values = iput.getAttributeValues(name, inputConfig, request); } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring a value from '" + inputName + "' for '"+name+"': " + e.getMessage()); } finally { // release components if (iputSelector != null) { if (iput != null) iputSelector.release(iput); this.manager.release(iputSelector); } } } // done reading value // get message digest implementation and compute hash if (values != null) { try { MessageDigest md = (provider==null ? MessageDigest.getInstance(algorithm) : MessageDigest.getInstance(algorithm,provider)); result = new Object[values.length]; for (int i=0; i<values.length; i++) { md.update((salt + (values[i] instanceof String? (String)values[i] : values[i].toString())).getBytes()); if (encode) { result[i] = URLEncoder.encode(new String(md.digest())); } else { result[i] = md.digest(); } } } catch (NoSuchAlgorithmException nsae) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring digest algorithm '" + algorithm + (provider==null?"":"' from '"+provider) +"': " + nsae.getMessage()); } return result; } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring a value from '" + inputName + "' for '"+name+"': " + e.getMessage()); } return null; } } 1.1 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/input/DateInputModule.java Index: DateInputModule.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact [EMAIL PROTECTED] 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ package org.apache.cocoon.components.modules.input; import java.util.Enumeration; import java.util.List; import java.util.LinkedList; import java.util.StringTokenizer; import java.util.Date; import java.text.SimpleDateFormat; import org.apache.cocoon.environment.Request; 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; /** * DateInputModule returns current data as a string, optionally * formated. Format given through attribute "format" of configuration * root node. * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> * @version CVS $Id: DateInputModule.java,v 1.1 2002/04/28 19:22:02 haul Exp $ * @see java.text.SimpleDateFormat */ public class DateInputModule extends AbstractInputModule implements ThreadSafe { final static Enumeration returnNames = new StringTokenizer("stringConstant"); public Object getAttribute( String name, Configuration modeConf, Request request ) throws ConfigurationException { String format = modeConf.getAttribute("format",null); if (format==null) { return new Date(); } else { return new SimpleDateFormat(format).format(new Date()); } } public Enumeration getAttributeNames( Configuration modeConf, Request request ) throws ConfigurationException { return DateInputModule.returnNames; } public Object[] getAttributeValues( String name, Configuration modeConf, Request request ) throws ConfigurationException { List values = new LinkedList(); values.add( this.getAttribute(name, modeConf, request) ); return values.toArray(); } } 1.1 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/input/CollectionMetaModule.java Index: CollectionMetaModule.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact [EMAIL PROTECTED] 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ package org.apache.cocoon.components.modules.input; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.activity.Initializable; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.component.ComponentSelector; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; import org.apache.cocoon.components.modules.input.InputModule; import org.apache.cocoon.matching.AbstractWildcardMatcher; import java.util.ArrayList; import java.util.Map; import java.util.Enumeration; import java.util.Iterator; import java.util.SortedSet; import java.util.TreeSet; /** * Constructs an array of values suitable for a JDBC collection type * from parameters obtained from another input module. Application is * not limited to JDBC collections but can be used wherever similar * named attributes shall be collected to an array of a given * type. Currently, long, int, and string are known, more to come. * * <p><b>Global and local configuration</b></p> * <table border="1"> * <tr><td><code>input-module</code></td><td>Name of the input module used to obtain the value and its configuration</td></tr> * <tr><td><code>member</code></td> <td>Collection member <table * <tr><td>Attribute</td><td></td></tr> * <tr><td>name</td><td>Parameter name, "*" may distinguish multiple collections</td></tr> * <tr><td>type</td><td>JDBC type name of members</td></tr> * </table> </td></tr> * </table> * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> * @version CVS $Id: CollectionMetaModule.java,v 1.1 2002/04/28 19:22:02 haul Exp $ */ public class CollectionMetaModule extends AbstractLoggable implements InputModule, Configurable, Initializable, Composable, Disposable { /** The component manager instance */ protected ComponentManager manager; protected Configuration memberConf = null; private String defaultInput = "request"; // default to request parameters private Configuration inputConf = null; // will become an empty configuration object // during configure() so why bother here... String INPUT_MODULE_ROLE = InputModule.ROLE; String INPUT_MODULE_SELECTOR = INPUT_MODULE_ROLE+"Selector"; private boolean initialized = false; private InputModule input = null; private ComponentSelector inputSelector = null; /** * Set the current <code>ComponentManager</code> instance used by this * <code>Composable</code>. */ public void compose(ComponentManager manager) throws ComponentException { this.manager=manager; } public void configure(Configuration config) throws ConfigurationException { this.memberConf = config.getChild("member"); this.inputConf = config.getChild("input-module"); this.defaultInput = this.inputConf.getAttribute("name",this.defaultInput); } public void initialize() { try { // obtain input module this.inputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); if (this.defaultInput != null && this.inputSelector != null && this.inputSelector.hasComponent(this.defaultInput) ){ this.input = (InputModule) this.inputSelector.select(this.defaultInput); if (!(this.input instanceof ThreadSafe && this.inputSelector instanceof ThreadSafe) ) { this.inputSelector.release(this.input); this.manager.release(this.inputSelector); this.input = null; this.inputSelector = null; } this.initialized = true; } else { if (getLogger().isErrorEnabled()) getLogger().error("A problem occurred setting up '" + this.defaultInput + "': Selector is "+(this.inputSelector!=null?"not ":"") +"null, Component is " +(this.inputSelector!=null&&this.inputSelector.hasComponent(this.defaultInput)?"known":"unknown")); } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred setting up '" + this.defaultInput + "': " + e.getMessage()); } } public void dispose() { if (!this.initialized) if (getLogger().isErrorEnabled()) getLogger().error("Uninitialized Component! FAILING"); else if (this.inputSelector != null) { if (this.input != null) this.inputSelector.release(this.input); this.manager.release(this.inputSelector); } } public Object getAttribute( String name, Configuration modeConf, Request request ) throws ConfigurationException { if (!this.initialized) { if (getLogger().isErrorEnabled()) getLogger().error("Uninitialized Component! FAILING"); return null; } if (this.defaultInput == null) { if (getLogger().isWarnEnabled()) getLogger().warn("No input module given. FAILING"); return null; } // obtain correct configuration objects // default vs dynamic Configuration mConf = this.memberConf; Configuration inputConfig = null; String inputName=null; if (modeConf!=null) { mConf = modeConf.getChild("member"); inputName = modeConf.getChild("input-module").getAttribute("name",null); if (inputName != null) { inputConfig = modeConf.getChild("input-module"); } } // read necessary parameters // name is used only if parameter name contains '*' // in that case it replaces '*' otherwise it is // ignored String jType = mConf.getAttribute("type","string"); SortedSet matchset = new TreeSet(); String pName = mConf.getAttribute("name"); int index = pName.indexOf("*"); if (index>-1) { String prefix = (index > 0 ? pName.substring(0,index) : null); String suffix = (index < (pName.length() -1) ? pName.substring(index+1,pName.length()) : null); pName = prefix+name+suffix; } getLogger().debug("jType "+jType); // done reading configuration // setup modules and read values Object result = null; try { Object[] values = null; if (this.input != null && inputName == null) { // input module is thread safe // thus we still have a reference to it // and // no other module is configured dynamically values = input.getAttributeValues(pName,this.inputConf,request); } else { // input was not thread safe // or // another module is configured dynamically // so acquire it again ComponentSelector iputSelector = null; InputModule iput = null; try { // obtain input module if (inputName == null) { inputName = this.defaultInput; inputConfig = this.inputConf; } iputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); if (this.defaultInput != null && iputSelector != null && iputSelector.hasComponent(inputName)) { iput = (InputModule) iputSelector.select(inputName); } if (iput != null) { values = iput.getAttributeValues(pName, inputConfig, request); } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring a value from '" + inputName + "' for '"+pName+"': " + e.getMessage()); } finally { // release components if (iputSelector != null) { if (iput != null) iputSelector.release(iput); this.manager.release(iputSelector); } } } // done reading values // start converting values and assemble array if (values != null) { Object[] objects = new Object[values.length]; // FIXME: should put this into helper class for (int i = 0; i<values.length; i++) { Object value = values[i]; if (jType.equalsIgnoreCase("string")) { if (value instanceof String) { objects[i] = value; } else { objects[i] = value.toString(); } } else if (jType.equalsIgnoreCase("int")) { if (value instanceof String) { objects[i] = Integer.decode((String)value); } else if (value instanceof Integer) { objects[i] = value; } else { if (getLogger().isErrorEnabled()) getLogger().error("don't know how to cast"); } } else if (jType.equalsIgnoreCase("long")) { if (value instanceof String) { objects[i] = Long.decode((String)value); } else if (value instanceof Long) { objects[i] = value; } else { if (getLogger().isErrorEnabled()) getLogger().error("don't know how to cast"); } } else { // other types need parsing & creation if (getLogger().isErrorEnabled()) getLogger().error("don't know how to cast"); } } return objects; } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring a value from '" + inputName + "' for '"+pName+"': " + e.getMessage()); } return null; } public Enumeration getAttributeNames( Configuration modeConf, Request request ) throws ConfigurationException { if (!this.initialized) { if (getLogger().isErrorEnabled()) getLogger().error("Uninitialized Component! FAILING"); return null; } if (this.defaultInput == null) { if (getLogger().isWarnEnabled()) getLogger().warn("No input module given. FAILING"); return null; } // obtain correct configuration objects // default vs dynamic Configuration mConf = this.memberConf; Configuration inputConfig = null; String inputName=null; if (modeConf!=null) { mConf = modeConf.getChild("member"); inputName = modeConf.getChild("input-module").getAttribute("name",null); if (inputName != null) { inputConfig = modeConf.getChild("input-module"); } } // done reading configuration // setup modules and read attribute names Object result = null; try { Enumeration names = null; if (this.input != null && inputName == null) { // input module is thread safe // thus we still have a reference to it // and // no other module is configured dynamically names = input.getAttributeNames(this.inputConf,request); } else { // input was not thread safe // or // another module is configured dynamically // so acquire it again ComponentSelector iputSelector = null; InputModule iput = null; try { // obtain input module if (inputName == null) { inputName = this.defaultInput; inputConfig = this.inputConf; } iputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); if (this.defaultInput != null && iputSelector != null && iputSelector.hasComponent(inputName)) { iput = (InputModule) iputSelector.select(inputName); } if (iput != null) { names = iput.getAttributeNames(inputConfig, request); } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring a names from '" + inputName + "': " + e.getMessage()); } finally { // release components if (iputSelector != null) { if (iput != null) iputSelector.release(iput); this.manager.release(iputSelector); } } } // done reading names // find attribute names matching configuration // and return an enumeration if (names != null) { SortedSet matchset = new TreeSet(); String pName = mConf.getAttribute("name"); int index = pName.indexOf("*"); if (index>-1) { // parameter name contains '*' // find all strings that match this '*' // return them in an enumeration String prefix = (index > 0 ? pName.substring(0,index) : null); String suffix = (index < (pName.length() -1) ? pName.substring(index+1,pName.length()) : null); while (names.hasMoreElements()) { String name = (String)names.nextElement(); if (name.startsWith(prefix) && name.endsWith(suffix)) { String wildcard = name.substring(prefix.length()); wildcard = wildcard.substring(0,wildcard.length()-suffix.length()); matchset.add(wildcard); } } } else { // parameter name without wildcard // check that name is among available names // and return it in that case boolean done=false; while (!done && names.hasMoreElements()) { String name = (String)names.nextElement(); if (name.equals(pName)) { matchset.add(pName); done = true; } } } return new EnumerationHelper(matchset.iterator()); } else { return null; } } catch (Exception e) { if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred acquiring names from '" + inputName + "': " + e.getMessage()); } return null; } public Object[] getAttributeValues( String name, Configuration modeConf, Request request ) throws ConfigurationException { Enumeration names = this.getAttributeNames( modeConf, request ); ArrayList values = new ArrayList(); while (names.hasMoreElements()) { values.add(this.getAttribute((String) names.nextElement(),modeConf,request)); } return values.toArray(); } } class EnumerationHelper implements Enumeration { Iterator iter = null; public EnumerationHelper( Iterator i ) { this.iter = i; } public boolean hasMoreElements() { return this.iter.hasNext(); } public Object nextElement() { return this.iter.next(); } }
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]