diff --git a/ccm-core/src/com/arsdigita/bebop/FormProcessException.java b/ccm-core/src/com/arsdigita/bebop/FormProcessException.java index 4fce23803..8ef9f2c08 100755 --- a/ccm-core/src/com/arsdigita/bebop/FormProcessException.java +++ b/ccm-core/src/com/arsdigita/bebop/FormProcessException.java @@ -32,12 +32,13 @@ import javax.servlet.ServletException; * doGet methods do not need to explicitly catch * instances of this class. However, they may wish to do so for * special error reporting to the user, or to notify the webmaster via - * e-mail of the problem. */ + * e-mail of the problem. + * + * @version $Id: FormProcessException.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class FormProcessException extends ServletException { - public static final String versionId = "$Id: FormProcessException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public FormProcessException(String message) { super(message); } diff --git a/ccm-core/src/com/arsdigita/bebop/form/TextArea.java b/ccm-core/src/com/arsdigita/bebop/form/TextArea.java index 84a44cd1a..4e0479060 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/TextArea.java +++ b/ccm-core/src/com/arsdigita/bebop/form/TextArea.java @@ -45,7 +45,8 @@ public class TextArea extends Widget implements BebopConstants { * Constant for specifying OFF value for the * WRAP attribute of this image input. See here - * for a description of what this attribute does. */ + * for a description of what this attribute does. + */ public static final int OFF = 0; /** diff --git a/ccm-core/src/com/arsdigita/domain/DomainObjectFactory.java b/ccm-core/src/com/arsdigita/domain/DomainObjectFactory.java index fcf0d8a41..107cb3407 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainObjectFactory.java +++ b/ccm-core/src/com/arsdigita/domain/DomainObjectFactory.java @@ -69,12 +69,11 @@ import org.apache.log4j.Logger; * * @author Oumi Mehrotra * @version 1.0 + * @version $Id: DomainObjectFactory.java 738 2005-09-01 12:36:52Z sskracic $ * **/ public class DomainObjectFactory { - public static final String versionId = "$Id: DomainObjectFactory.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // map of registered instantiators, keyed by data object type. private static Map s_instantiators = new HashMap(); diff --git a/ccm-core/src/com/arsdigita/domain/DomainObjectInstantiator.java b/ccm-core/src/com/arsdigita/domain/DomainObjectInstantiator.java index f4b6272bd..ef6166f95 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainObjectInstantiator.java +++ b/ccm-core/src/com/arsdigita/domain/DomainObjectInstantiator.java @@ -66,11 +66,10 @@ import com.arsdigita.persistence.DataObject; * * @author Oumi Mehrotra * @version 1.0 + * @version $Id: DomainObjectInstantiator.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class DomainObjectInstantiator { - public static final String versionId = "$Id: DomainObjectInstantiator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Return a delegated instantiator. Called from * DomainObjectFactory.newInstance(). If the returned instantiator diff --git a/ccm-core/src/com/arsdigita/loader/CoreLoader.java b/ccm-core/src/com/arsdigita/loader/CoreLoader.java index 027dc6535..5579089e9 100755 --- a/ccm-core/src/com/arsdigita/loader/CoreLoader.java +++ b/ccm-core/src/com/arsdigita/loader/CoreLoader.java @@ -68,14 +68,10 @@ import org.apache.log4j.Logger; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #15 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: CoreLoader.java 1841 2009-03-05 07:52:42Z terry $ + */ public class CoreLoader extends PackageLoader { - public final static String versionId = - "$Id: CoreLoader.java 1841 2009-03-05 07:52:42Z terry $" + - " by $Author: terry $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(CoreLoader.class); private EmailParameter m_email = new EmailParameter("waf.admin.email"); diff --git a/ccm-core/src/com/arsdigita/loader/MimeTypeRow.java b/ccm-core/src/com/arsdigita/loader/MimeTypeRow.java index 0429618be..7f62722ee 100755 --- a/ccm-core/src/com/arsdigita/loader/MimeTypeRow.java +++ b/ccm-core/src/com/arsdigita/loader/MimeTypeRow.java @@ -31,15 +31,10 @@ import org.apache.log4j.Logger; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #5 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: MimeTypeRow.java 287 2005-02-22 00:29:02Z sskracic $ + */ class MimeTypeRow extends AbstractConfig { - public final static String versionId = - "$Id: MimeTypeRow.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(MimeTypeRow.class); private StringParameter m_type = new StringParameter diff --git a/ccm-core/src/com/arsdigita/loader/PackageLoader.java b/ccm-core/src/com/arsdigita/loader/PackageLoader.java index aea0e2ece..936ce1305 100755 --- a/ccm-core/src/com/arsdigita/loader/PackageLoader.java +++ b/ccm-core/src/com/arsdigita/loader/PackageLoader.java @@ -49,17 +49,11 @@ import com.arsdigita.util.parameter.ParameterReader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Id: PackageLoader.java 1840 2009-03-05 07:51:20Z terry $ - **/ - + */ public abstract class PackageLoader extends AbstractScript { public final static Logger s_log = Logger.getLogger(PackageLoader.class); - // public final static String versionId = - // "$Id: PackageLoader.java 1840 2009-03-05 07:51:20Z terry $" + - // " by $Author: terry $, " + - // "$DateTime: 2004/08/16 18:10:38 $"; - public static boolean exists(Connection conn, String table) { try { DatabaseMetaData md = conn.getMetaData(); diff --git a/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java b/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java index 9a8cc9169..d80db4259 100755 --- a/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java +++ b/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java @@ -74,12 +74,10 @@ import org.apache.log4j.Logger; * * @author randyg@alum.mit.edu * @version $Revision: #24 $ $Date: 2004/08/16 $ + * @version $Id: DynamicObjectType.java 287 2005-02-22 00:29:02Z sskracic $ */ - public class DynamicObjectType extends DynamicElement { - public static final String versionId = "$Id: DynamicObjectType.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final int COLLECTION = com.arsdigita.persistence.metadata.Property.COLLECTION; private static final int NULLABLE = diff --git a/ccm-core/src/com/arsdigita/runtime/AbstractConfig.java b/ccm-core/src/com/arsdigita/runtime/AbstractConfig.java index 2935b18ff..c2784631f 100755 --- a/ccm-core/src/com/arsdigita/runtime/AbstractConfig.java +++ b/ccm-core/src/com/arsdigita/runtime/AbstractConfig.java @@ -75,10 +75,6 @@ import org.apache.log4j.Logger; * @version $Id: AbstractConfig.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class AbstractConfig extends AbstractParameterContext { - public final static String versionId = - "$Id: AbstractConfig.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (AbstractConfig.class); diff --git a/ccm-core/src/com/arsdigita/runtime/AbstractScript.java b/ccm-core/src/com/arsdigita/runtime/AbstractScript.java index 7e411b657..2bb0abda9 100755 --- a/ccm-core/src/com/arsdigita/runtime/AbstractScript.java +++ b/ccm-core/src/com/arsdigita/runtime/AbstractScript.java @@ -29,14 +29,12 @@ import com.arsdigita.util.parameter.AbstractParameterContext; * script's run method. * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: AbstractScript.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class AbstractScript extends AbstractParameterContext implements Script { - public final static String versionId = "$Id: AbstractScript.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Default constructor for derived classes. **/ diff --git a/ccm-core/src/com/arsdigita/runtime/CCMResourceManager.java b/ccm-core/src/com/arsdigita/runtime/CCMResourceManager.java index fe731bd27..3d605e3d2 100755 --- a/ccm-core/src/com/arsdigita/runtime/CCMResourceManager.java +++ b/ccm-core/src/com/arsdigita/runtime/CCMResourceManager.java @@ -63,8 +63,6 @@ import org.apache.log4j.Logger; * @version $Id: CCMResourceManager.java 751 2005-09-02 12:52:23Z sskracic $ */ public final class CCMResourceManager { - public final static String versionId = - "$Id: CCMResourceManager.java 1393 2006-11-28 09:12:32Z sskracic $" ; private static final Logger s_log = Logger.getLogger(CCMResourceManager.class); diff --git a/ccm-core/src/com/arsdigita/runtime/ConfigRegistry.java b/ccm-core/src/com/arsdigita/runtime/ConfigRegistry.java index 231cd1350..379802211 100755 --- a/ccm-core/src/com/arsdigita/runtime/ConfigRegistry.java +++ b/ccm-core/src/com/arsdigita/runtime/ConfigRegistry.java @@ -75,15 +75,11 @@ import org.apache.log4j.Logger; * mappings are then used by the ConfigRegistry instance to load config objects. * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #15 $ $Date: 2004/08/16 $ + * @version $Id: ConfigRegistry.java 736 2005-09-01 10:46:05Z sskracic $ **/ public class ConfigRegistry { - public final static String versionId = - "$Id: ConfigRegistry.java 736 2005-09-01 10:46:05Z sskracic $ " + - "by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ConfigRegistry.class); private URL m_url; diff --git a/ccm-core/src/com/arsdigita/runtime/InteractiveParameterReader.java b/ccm-core/src/com/arsdigita/runtime/InteractiveParameterReader.java index 9eecbf2b3..866240899 100755 --- a/ccm-core/src/com/arsdigita/runtime/InteractiveParameterReader.java +++ b/ccm-core/src/com/arsdigita/runtime/InteractiveParameterReader.java @@ -38,15 +38,10 @@ import org.apache.log4j.Logger; * @author Peter Boy <pboy@barkhof.uni-bremen.de> using code by * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #7 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: InteractiveParameterReader.java 287 2005-02-22 00:29:02Z sskracic $ + */ public final class InteractiveParameterReader implements ParameterReader { - public final static String versionId = - "$Id: InteractiveParameterReader.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger (InteractiveParameterReader.class); diff --git a/ccm-core/src/com/arsdigita/runtime/OptionalLegacyInitializer.java b/ccm-core/src/com/arsdigita/runtime/OptionalLegacyInitializer.java index 0b0bdb722..520dba3a6 100755 --- a/ccm-core/src/com/arsdigita/runtime/OptionalLegacyInitializer.java +++ b/ccm-core/src/com/arsdigita/runtime/OptionalLegacyInitializer.java @@ -24,11 +24,10 @@ import java.io.InputStream; * The OptionalLegacyInitializer behaves like LegacyInitializer, * except that it won't break if the configuration file cannot * be found. + * @version $Id: OptionalLegacyInitializer.java 738 2005-09-01 12:36:52Z sskracic $ **/ public class OptionalLegacyInitializer extends LegacyInitializer { - public static final String versionId = "$Id: OptionalLegacyInitializer.java 738 2005-09-01 12:36:52Z sskracic $"; - public OptionalLegacyInitializer(String init, ClassLoader loader) { super(init, loader); } diff --git a/ccm-core/src/com/arsdigita/runtime/RegistryConfig.java b/ccm-core/src/com/arsdigita/runtime/RegistryConfig.java index 49c10bc11..b52b57236 100755 --- a/ccm-core/src/com/arsdigita/runtime/RegistryConfig.java +++ b/ccm-core/src/com/arsdigita/runtime/RegistryConfig.java @@ -37,7 +37,7 @@ import java.net.URL; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Id: RegistryConfig.java 287 2005-02-22 00:29:02Z sskracic $ - **/ + */ public class RegistryConfig extends AbstractConfig { private static String[] array(String str) { diff --git a/ccm-core/src/com/arsdigita/runtime/RuntimeConfig.java b/ccm-core/src/com/arsdigita/runtime/RuntimeConfig.java index e84b42af4..bc4f687b1 100755 --- a/ccm-core/src/com/arsdigita/runtime/RuntimeConfig.java +++ b/ccm-core/src/com/arsdigita/runtime/RuntimeConfig.java @@ -32,10 +32,6 @@ import org.apache.log4j.Logger; * @version $Id: RuntimeConfig.java 1393 2006-11-28 09:12:32Z sskracic $ */ public final class RuntimeConfig extends AbstractConfig { - public final static String versionId = - "$Id: RuntimeConfig.java 1393 2006-11-28 09:12:32Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(RuntimeConfig.class); diff --git a/ccm-core/src/com/arsdigita/runtime/Script.java b/ccm-core/src/com/arsdigita/runtime/Script.java index cc0c583f1..dc9db251b 100755 --- a/ccm-core/src/com/arsdigita/runtime/Script.java +++ b/ccm-core/src/com/arsdigita/runtime/Script.java @@ -30,13 +30,11 @@ import com.arsdigita.util.parameter.ParameterContext; * extend the {@link AbstractScript} class. * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: Script.java 287 2005-02-22 00:29:02Z sskracic $ **/ public interface Script extends ParameterContext { - public final static String versionId = "$Id: Script.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * This method is invoked in order to execute the script. The * implementor of the script should use the persistent session diff --git a/ccm-core/src/com/arsdigita/runtime/ScriptContext.java b/ccm-core/src/com/arsdigita/runtime/ScriptContext.java index 7f07eb7dc..9c8e00a73 100755 --- a/ccm-core/src/com/arsdigita/runtime/ScriptContext.java +++ b/ccm-core/src/com/arsdigita/runtime/ScriptContext.java @@ -29,15 +29,10 @@ import com.arsdigita.util.parameter.ParameterReader; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #5 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: ScriptContext.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ScriptContext { - public final static String versionId = - "$Id: ScriptContext.java 287 2005-02-22 00:29:02Z sskracic $" + - "by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; - private final Session m_ssn; private final ParameterReader m_params; diff --git a/ccm-core/src/com/arsdigita/search/intermedia/ContentChangeTime.java b/ccm-core/src/com/arsdigita/search/intermedia/ContentChangeTime.java index e11a8cdca..260a87462 100755 --- a/ccm-core/src/com/arsdigita/search/intermedia/ContentChangeTime.java +++ b/ccm-core/src/com/arsdigita/search/intermedia/ContentChangeTime.java @@ -29,9 +29,9 @@ import org.apache.log4j.Logger; * content changes. * * @author Archit Shah + * @version $Id: ContentChangeTime.java 287 2005-02-22 00:29:02Z sskracic $ **/ class ContentChangeTime { - public static final String versionId = "$Id: ContentChangeTime.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Creates a s_logging category with name = to the full name of class private static final Logger s_log = diff --git a/ccm-core/src/com/arsdigita/search/intermedia/SearchSpecification.java b/ccm-core/src/com/arsdigita/search/intermedia/SearchSpecification.java index 00d53d191..416d0d448 100755 --- a/ccm-core/src/com/arsdigita/search/intermedia/SearchSpecification.java +++ b/ccm-core/src/com/arsdigita/search/intermedia/SearchSpecification.java @@ -112,9 +112,9 @@ import java.util.Iterator; * * @author Jeff Teeters * @version 1.0 - **/ + * @version $Id: SearchSpecification.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class SearchSpecification { - public static final String versionId = "$Id: SearchSpecification.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Default values final private static int DEFAULT_MAXROWS = 1000; final private static int DEFAULT_ROWSPERPAGE = 100; diff --git a/ccm-core/src/com/arsdigita/util/parameter/AbstractParameter.java b/ccm-core/src/com/arsdigita/util/parameter/AbstractParameter.java index 46885ef64..7ac8ace10 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/AbstractParameter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/AbstractParameter.java @@ -38,10 +38,6 @@ import org.apache.commons.beanutils.ConversionException; * @version $Id: AbstractParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class AbstractParameter implements Parameter { - public final static String versionId = - "$Id: AbstractParameter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private final String m_name; private final Class m_type; diff --git a/ccm-core/src/com/arsdigita/util/parameter/AbstractParameterContext.java b/ccm-core/src/com/arsdigita/util/parameter/AbstractParameterContext.java index 08e6d98ff..5411ca68a 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/AbstractParameterContext.java +++ b/ccm-core/src/com/arsdigita/util/parameter/AbstractParameterContext.java @@ -42,10 +42,6 @@ import org.apache.log4j.Logger; * @version $Id: AbstractParameterContext.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class AbstractParameterContext implements ParameterContext { - public final static String versionId = - "$Id: AbstractParameterContext.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (AbstractParameterContext.class); diff --git a/ccm-core/src/com/arsdigita/util/parameter/BooleanParameter.java b/ccm-core/src/com/arsdigita/util/parameter/BooleanParameter.java index e456c2929..11bbe047d 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/BooleanParameter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/BooleanParameter.java @@ -31,10 +31,6 @@ import org.apache.commons.beanutils.converters.BooleanConverter; * @version $Id: BooleanParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class BooleanParameter extends AbstractParameter { - public final static String versionId = - "$Id: BooleanParameter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; static { Converters.set(Boolean.class, new BooleanConverter()); diff --git a/ccm-core/src/com/arsdigita/util/parameter/CompoundParameterReader.java b/ccm-core/src/com/arsdigita/util/parameter/CompoundParameterReader.java index 4348025fc..d86929b81 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/CompoundParameterReader.java +++ b/ccm-core/src/com/arsdigita/util/parameter/CompoundParameterReader.java @@ -36,10 +36,6 @@ import org.apache.log4j.Logger; * @version $Id: CompoundParameterReader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CompoundParameterReader implements ParameterReader { - public final static String versionId = - "$Id: CompoundParameterReader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (CompoundParameterReader.class); diff --git a/ccm-core/src/com/arsdigita/util/parameter/Converters.java b/ccm-core/src/com/arsdigita/util/parameter/Converters.java index 3e2c12135..5f515a361 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/Converters.java +++ b/ccm-core/src/com/arsdigita/util/parameter/Converters.java @@ -36,10 +36,6 @@ import org.apache.commons.beanutils.Converter; * @version $Id: Converters.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Converters { - public final static String versionId = - "$Id: Converters.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static Map s_converters = Collections.synchronizedMap (new HashMap()); diff --git a/ccm-core/src/com/arsdigita/util/parameter/EmailParameter.java b/ccm-core/src/com/arsdigita/util/parameter/EmailParameter.java index 60b9cb664..d3f09c617 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/EmailParameter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/EmailParameter.java @@ -33,10 +33,6 @@ import org.apache.oro.text.perl.Perl5Util; * @version $Id: EmailParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class EmailParameter extends StringParameter { - public final static String versionId = - "$Id: EmailParameter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Perl5Util s_perl = new Perl5Util(); private static final String s_regex = diff --git a/ccm-core/src/com/arsdigita/util/parameter/EnumerationParameter.java b/ccm-core/src/com/arsdigita/util/parameter/EnumerationParameter.java index 0faca14a6..57a1be65d 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/EnumerationParameter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/EnumerationParameter.java @@ -32,10 +32,6 @@ import org.apache.log4j.Logger; * @version $Id: EnumerationParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class EnumerationParameter extends AbstractParameter { - public final static String versionId = - "$Id: EnumerationParameter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (EnumerationParameter.class); diff --git a/ccm-core/src/com/arsdigita/util/parameter/ErrorList.java b/ccm-core/src/com/arsdigita/util/parameter/ErrorList.java index d879442bd..34ae20695 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/ErrorList.java +++ b/ccm-core/src/com/arsdigita/util/parameter/ErrorList.java @@ -43,10 +43,6 @@ import org.apache.log4j.Logger; * @version $Id: ErrorList.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class ErrorList { - public final static String versionId = - "$Id: ErrorList.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ErrorList.class); diff --git a/ccm-core/src/com/arsdigita/util/parameter/Parameter.java b/ccm-core/src/com/arsdigita/util/parameter/Parameter.java index 02cb13550..110415f82 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/Parameter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/Parameter.java @@ -82,10 +82,6 @@ package com.arsdigita.util.parameter; * @version $Id: Parameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface Parameter { - public final static String versionId = - "$Id: Parameter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; /** * Flag to indicate the parameter value is nullable. diff --git a/ccm-core/src/com/arsdigita/util/parameter/ParameterError.java b/ccm-core/src/com/arsdigita/util/parameter/ParameterError.java index 5c1eb2063..2affc9c62 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/ParameterError.java +++ b/ccm-core/src/com/arsdigita/util/parameter/ParameterError.java @@ -34,10 +34,6 @@ import com.arsdigita.util.Assert; * @version $Id: ParameterError.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class ParameterError { - public final static String versionId = - "$Id: ParameterError.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private final Parameter m_param; private final String m_message; diff --git a/ccm-core/src/com/arsdigita/util/parameter/ParameterException.java b/ccm-core/src/com/arsdigita/util/parameter/ParameterException.java index f6671dab0..e34149a01 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/ParameterException.java +++ b/ccm-core/src/com/arsdigita/util/parameter/ParameterException.java @@ -35,10 +35,6 @@ import org.apache.log4j.Logger; * @version $Id: ParameterException.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class ParameterException extends RuntimeException { - public final static String versionId = - "$Id: ParameterException.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (ParameterException.class); diff --git a/ccm-core/src/com/arsdigita/util/parameter/ParameterPrinter.java b/ccm-core/src/com/arsdigita/util/parameter/ParameterPrinter.java index 550b0d70a..7fa95fb1d 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/ParameterPrinter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/ParameterPrinter.java @@ -49,10 +49,6 @@ import org.apache.commons.cli.ParseException; * @version $Id: ParameterPrinter.java 287 2005-02-22 00:29:02Z sskracic $ */ final class ParameterPrinter { - public final static String versionId = - "$Id: ParameterPrinter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (ParameterPrinter.class); diff --git a/ccm-core/src/com/arsdigita/util/parameter/ParameterReader.java b/ccm-core/src/com/arsdigita/util/parameter/ParameterReader.java index 5e5b35c04..bac949747 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/ParameterReader.java +++ b/ccm-core/src/com/arsdigita/util/parameter/ParameterReader.java @@ -32,10 +32,6 @@ package com.arsdigita.util.parameter; * @version $Id: ParameterReader.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ParameterReader { - public final static String versionId = - "$Id: ParameterReader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; /** * Reads an encoded String value for diff --git a/ccm-core/src/com/arsdigita/util/parameter/ParameterWriter.java b/ccm-core/src/com/arsdigita/util/parameter/ParameterWriter.java index b025f8e00..00ef9b8b8 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/ParameterWriter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/ParameterWriter.java @@ -30,10 +30,6 @@ package com.arsdigita.util.parameter; * @version $Id: ParameterWriter.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ParameterWriter { - public final static String versionId = - "$Id: ParameterWriter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; /** * Writes the marshaled value for parameter diff --git a/ccm-core/src/com/arsdigita/util/parameter/SingletonParameter.java b/ccm-core/src/com/arsdigita/util/parameter/SingletonParameter.java index 54a035519..b401e6877 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/SingletonParameter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/SingletonParameter.java @@ -22,10 +22,10 @@ import com.arsdigita.util.Classes; import com.arsdigita.util.UncheckedWrapperException; /** - * Subject to change. - * * A parameter representing an instance of a Java class. * + * Subject to change. + * * @see Parameter * @author Justin Ross <jross@redhat.com> * @version $Id: SingletonParameter.java 738 2005-09-01 12:36:52Z sskracic $ diff --git a/ccm-core/src/com/arsdigita/util/parameter/SpecificClassParameter.java b/ccm-core/src/com/arsdigita/util/parameter/SpecificClassParameter.java new file mode 100644 index 000000000..d20c62346 --- /dev/null +++ b/ccm-core/src/com/arsdigita/util/parameter/SpecificClassParameter.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.util.parameter; + +/** + * A parameter representing a Java Class which is checked to be + * an implementation of a required class / interface. + * + * Subject to change. + * + * @see java.lang.Class + * @see Parameter + * @author Justin Ross <jross@redhat.com> + * @version $Id: ClassParameter.java 287 2005-02-22 00:29:02Z sskracic $ + */ +public class SpecificClassParameter extends ClassParameter { + + + private Class m_requiredClass; + + public SpecificClassParameter(final String name, + final int multiplicity, + final Object defaultObj, + final Class requiredClass) { + super(name, multiplicity, defaultObj); + m_requiredClass = requiredClass; + } + + // value != null + @Override + protected Object unmarshal(String value, ErrorList errors) { + Class theClass = (Class) super.unmarshal(value,errors); + if (theClass != null) { + if (!m_requiredClass.isAssignableFrom(theClass)) { + errors.add(new ParameterError(this, "class " + value + + " must implement : " + + m_requiredClass.getName())); + } + } + + return theClass; + } + +} diff --git a/ccm-core/src/com/arsdigita/util/parameter/URLParameter.java b/ccm-core/src/com/arsdigita/util/parameter/URLParameter.java index fa4ce2843..6ec530b31 100755 --- a/ccm-core/src/com/arsdigita/util/parameter/URLParameter.java +++ b/ccm-core/src/com/arsdigita/util/parameter/URLParameter.java @@ -32,10 +32,6 @@ import java.net.URL; * @version $Id: URLParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class URLParameter extends StringParameter { - public final static String versionId = - "$Id: URLParameter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; public URLParameter(final String name) { super(name); diff --git a/ccm-core/src/com/redhat/persistence/metadata/ObjectType.java b/ccm-core/src/com/redhat/persistence/metadata/ObjectType.java index 8d631f569..117a2b63e 100755 --- a/ccm-core/src/com/redhat/persistence/metadata/ObjectType.java +++ b/ccm-core/src/com/redhat/persistence/metadata/ObjectType.java @@ -29,14 +29,11 @@ import java.util.List; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: ObjectType.java 738 2005-09-01 12:36:52Z sskracic $ **/ public class ObjectType extends Element { - public final static String versionId = - "$Id: ObjectType.java 738 2005-09-01 12:36:52Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final Model m_model; private final String m_name; private final String m_qualifiedName; diff --git a/ccm-core/src/com/redhat/persistence/oql/Code.java b/ccm-core/src/com/redhat/persistence/oql/Code.java index 4bbd456be..681630645 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Code.java +++ b/ccm-core/src/com/redhat/persistence/oql/Code.java @@ -52,12 +52,11 @@ import org.apache.log4j.Logger; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Code.java 737 2005-09-01 12:27:29Z sskracic $ **/ public class Code { - public final static String versionId = "$Id: Code.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(Code.class); public static class Binding { diff --git a/ccm-core/src/com/redhat/persistence/oql/Condition.java b/ccm-core/src/com/redhat/persistence/oql/Condition.java index a61d6aee7..2af18351b 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Condition.java +++ b/ccm-core/src/com/redhat/persistence/oql/Condition.java @@ -27,6 +27,5 @@ package com.redhat.persistence.oql; public abstract class Condition extends Expression { - public final static String versionId = "$Id: Condition.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; } diff --git a/ccm-core/src/com/redhat/persistence/oql/CrossJoin.java b/ccm-core/src/com/redhat/persistence/oql/CrossJoin.java index a847ccf2a..2728a18a0 100755 --- a/ccm-core/src/com/redhat/persistence/oql/CrossJoin.java +++ b/ccm-core/src/com/redhat/persistence/oql/CrossJoin.java @@ -23,12 +23,11 @@ package com.redhat.persistence.oql; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: CrossJoin.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class CrossJoin extends AbstractJoin { - public final static String versionId = "$Id: CrossJoin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - CrossJoin(Expression left, Expression right) { super(left, right); }