diff --git a/ccm-core/src/com/redhat/persistence/oql/AbstractJoin.java b/ccm-core/src/com/redhat/persistence/oql/AbstractJoin.java index 61561041e..c665a0825 100755 --- a/ccm-core/src/com/redhat/persistence/oql/AbstractJoin.java +++ b/ccm-core/src/com/redhat/persistence/oql/AbstractJoin.java @@ -37,8 +37,6 @@ import java.util.List; public abstract class AbstractJoin extends Expression { - public final static String versionId = "$Id: AbstractJoin.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Expression m_left; private Expression m_right; diff --git a/ccm-core/src/com/redhat/persistence/oql/All.java b/ccm-core/src/com/redhat/persistence/oql/All.java index a3e1b74a4..2aca735c2 100755 --- a/ccm-core/src/com/redhat/persistence/oql/All.java +++ b/ccm-core/src/com/redhat/persistence/oql/All.java @@ -31,12 +31,10 @@ import java.util.Map; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/16 $ - **/ + */ public class All extends Expression { - public final static String versionId = "$Id: All.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private String m_type; private Map m_bindings; private Expression m_scope; diff --git a/ccm-core/src/com/redhat/persistence/oql/And.java b/ccm-core/src/com/redhat/persistence/oql/And.java index d1e81cb07..88b8855f4 100755 --- a/ccm-core/src/com/redhat/persistence/oql/And.java +++ b/ccm-core/src/com/redhat/persistence/oql/And.java @@ -23,12 +23,10 @@ package com.redhat.persistence.oql; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #5 $ $Date: 2004/08/16 $ - **/ + */ public class And extends BinaryCondition { - public final static String versionId = "$Id: And.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public And(Expression left, Expression right) { super(left, right); } diff --git a/ccm-core/src/com/redhat/persistence/oql/BinaryCondition.java b/ccm-core/src/com/redhat/persistence/oql/BinaryCondition.java index 64520bb8f..8d53d0771 100755 --- a/ccm-core/src/com/redhat/persistence/oql/BinaryCondition.java +++ b/ccm-core/src/com/redhat/persistence/oql/BinaryCondition.java @@ -23,12 +23,10 @@ package com.redhat.persistence.oql; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/16 $ - **/ + */ public abstract class BinaryCondition extends Condition { - public final static String versionId = "$Id: BinaryCondition.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - Expression m_left; Expression m_right; diff --git a/ccm-core/src/com/redhat/persistence/oql/Condition.java b/ccm-core/src/com/redhat/persistence/oql/Condition.java index 7d58ea00e..903dfa243 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Condition.java +++ b/ccm-core/src/com/redhat/persistence/oql/Condition.java @@ -28,5 +28,4 @@ package com.redhat.persistence.oql; public abstract class Condition extends Expression { - } diff --git a/ccm-core/src/com/redhat/persistence/oql/Define.java b/ccm-core/src/com/redhat/persistence/oql/Define.java index 14e4c995c..dab32f7b2 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Define.java +++ b/ccm-core/src/com/redhat/persistence/oql/Define.java @@ -32,12 +32,10 @@ import java.util.Map; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/16 $ - **/ + */ public class Define extends Expression { - public final static String versionId = "$Id: Define.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Expression m_expr; private String m_name; diff --git a/ccm-core/src/com/redhat/persistence/oql/Equals.java b/ccm-core/src/com/redhat/persistence/oql/Equals.java index 632a0a1da..39ea03ddc 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Equals.java +++ b/ccm-core/src/com/redhat/persistence/oql/Equals.java @@ -26,12 +26,10 @@ import java.util.List; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/16 $ - **/ + */ public class Equals extends BinaryCondition { - public final static String versionId = "$Id: Equals.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Equals(Expression left, Expression right) { super(left, right); } diff --git a/ccm-core/src/com/redhat/persistence/oql/EquiSet.java b/ccm-core/src/com/redhat/persistence/oql/EquiSet.java index 5ebfba1b0..03882b787 100755 --- a/ccm-core/src/com/redhat/persistence/oql/EquiSet.java +++ b/ccm-core/src/com/redhat/persistence/oql/EquiSet.java @@ -36,12 +36,10 @@ import org.apache.log4j.Logger; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #11 $ $Date: 2004/08/16 $ - **/ + */ class EquiSet { - public final static String versionId = "$Id: EquiSet.java 751 2005-09-02 12:52:23Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(EquiSet.class); private Generator m_generator; diff --git a/ccm-core/src/com/redhat/persistence/oql/Exists.java b/ccm-core/src/com/redhat/persistence/oql/Exists.java index a8da9c4fe..9b787dd16 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Exists.java +++ b/ccm-core/src/com/redhat/persistence/oql/Exists.java @@ -27,12 +27,10 @@ import java.util.List; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #4 $ $Date: 2004/08/16 $ - **/ + */ public class Exists extends UnaryCondition { - public final static String versionId = "$Id: Exists.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Exists(Expression query) { super(query); } diff --git a/ccm-core/src/com/redhat/persistence/oql/Expression.java b/ccm-core/src/com/redhat/persistence/oql/Expression.java index 71c8e2ac1..4e8e0e610 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Expression.java +++ b/ccm-core/src/com/redhat/persistence/oql/Expression.java @@ -25,12 +25,10 @@ import com.redhat.persistence.common.Path; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/16 $ - **/ + */ public abstract class Expression { - public final static String versionId = "$Id: Expression.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static Expression valueOf(Path path) { if (path.getParent() == null) { return new Variable(path.getName()); diff --git a/ccm-core/src/com/redhat/persistence/oql/Filter.java b/ccm-core/src/com/redhat/persistence/oql/Filter.java index dbba1862b..e0ba4796a 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Filter.java +++ b/ccm-core/src/com/redhat/persistence/oql/Filter.java @@ -24,12 +24,10 @@ package com.redhat.persistence.oql; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #6 $ $Date: 2004/08/16 $ - **/ + */ public class Filter extends Expression { - public final static String versionId = "$Id: Filter.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Expression m_expr; private Expression m_condition; diff --git a/ccm-core/src/com/redhat/persistence/oql/FullJoin.java b/ccm-core/src/com/redhat/persistence/oql/FullJoin.java index 563ffee9a..6f1903854 100755 --- a/ccm-core/src/com/redhat/persistence/oql/FullJoin.java +++ b/ccm-core/src/com/redhat/persistence/oql/FullJoin.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class FullJoin extends AbstractJoin { - public final static String versionId = "$Id: FullJoin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public FullJoin(Expression left, Expression right, Expression condition) { super(left, right, condition); diff --git a/ccm-core/src/com/redhat/persistence/oql/Generator.java b/ccm-core/src/com/redhat/persistence/oql/Generator.java index 6ff9ea4df..c043ededa 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Generator.java +++ b/ccm-core/src/com/redhat/persistence/oql/Generator.java @@ -47,7 +47,7 @@ import org.apache.log4j.Logger; class Generator { - public final static String versionId = "$Id: Generator.java 751 2005-09-02 12:52:23Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(Generator.class); diff --git a/ccm-core/src/com/redhat/persistence/oql/Get.java b/ccm-core/src/com/redhat/persistence/oql/Get.java index 345a2ab05..d7dd61589 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Get.java +++ b/ccm-core/src/com/redhat/persistence/oql/Get.java @@ -51,7 +51,7 @@ import org.apache.log4j.Logger; public class Get extends Expression { - public final static String versionId = "$Id: Get.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(Get.class); diff --git a/ccm-core/src/com/redhat/persistence/oql/Indentor.java b/ccm-core/src/com/redhat/persistence/oql/Indentor.java index 3dc87d4b1..7a3c329da 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Indentor.java +++ b/ccm-core/src/com/redhat/persistence/oql/Indentor.java @@ -30,7 +30,7 @@ import java.io.Writer; class Indentor { - public final static String versionId = "$Id: Indentor.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + int level = 0; diff --git a/ccm-core/src/com/redhat/persistence/oql/Join.java b/ccm-core/src/com/redhat/persistence/oql/Join.java index 0ade5cf03..c897ac79b 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Join.java +++ b/ccm-core/src/com/redhat/persistence/oql/Join.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class Join extends AbstractJoin { - public final static String versionId = "$Id: Join.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public Join(Expression left, Expression right, Expression condition) { super(left, right, condition); diff --git a/ccm-core/src/com/redhat/persistence/oql/LeftJoin.java b/ccm-core/src/com/redhat/persistence/oql/LeftJoin.java index fac32a031..98b4fec72 100755 --- a/ccm-core/src/com/redhat/persistence/oql/LeftJoin.java +++ b/ccm-core/src/com/redhat/persistence/oql/LeftJoin.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class LeftJoin extends AbstractJoin { - public final static String versionId = "$Id: LeftJoin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public LeftJoin(Expression left, Expression right, Expression condition) { super(left, right, condition); diff --git a/ccm-core/src/com/redhat/persistence/oql/Limit.java b/ccm-core/src/com/redhat/persistence/oql/Limit.java index 84ce855ed..edc63db4f 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Limit.java +++ b/ccm-core/src/com/redhat/persistence/oql/Limit.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class Limit extends Range { - public final static String versionId = "$Id: Limit.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public Limit(Expression query, Expression limit) { super(query, limit); diff --git a/ccm-core/src/com/redhat/persistence/oql/Literal.java b/ccm-core/src/com/redhat/persistence/oql/Literal.java index b73ec2f5e..d4f0ab601 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Literal.java +++ b/ccm-core/src/com/redhat/persistence/oql/Literal.java @@ -38,7 +38,7 @@ import java.util.List; public class Literal extends Expression { - public final static String versionId = "$Id: Literal.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private Object m_value; diff --git a/ccm-core/src/com/redhat/persistence/oql/Main.java b/ccm-core/src/com/redhat/persistence/oql/Main.java index 89ebc8fa1..b7469089c 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Main.java +++ b/ccm-core/src/com/redhat/persistence/oql/Main.java @@ -34,7 +34,7 @@ import java.util.List; public class Main { - public final static String versionId = "$Id: Main.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final void main(String[] args) throws Throwable { PDL pdl = new PDL(); diff --git a/ccm-core/src/com/redhat/persistence/oql/MultiMap.java b/ccm-core/src/com/redhat/persistence/oql/MultiMap.java index 185e601ff..8e01f9aa4 100755 --- a/ccm-core/src/com/redhat/persistence/oql/MultiMap.java +++ b/ccm-core/src/com/redhat/persistence/oql/MultiMap.java @@ -36,7 +36,7 @@ import org.apache.commons.collections.list.SetUniqueList; class MultiMap { - public final static String versionId = "$Id: MultiMap.java 751 2005-09-02 12:52:23Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private List m_keys = new ArrayList(); private Map m_values = new HashMap(); diff --git a/ccm-core/src/com/redhat/persistence/oql/Not.java b/ccm-core/src/com/redhat/persistence/oql/Not.java index 180179cbb..058b57dbb 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Not.java +++ b/ccm-core/src/com/redhat/persistence/oql/Not.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class Not extends UnaryCondition { - public final static String versionId = "$Id: Not.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public Not(Expression expr) { super(expr); diff --git a/ccm-core/src/com/redhat/persistence/oql/Offset.java b/ccm-core/src/com/redhat/persistence/oql/Offset.java index f472859fc..76d527b75 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Offset.java +++ b/ccm-core/src/com/redhat/persistence/oql/Offset.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class Offset extends Range { - public final static String versionId = "$Id: Offset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public Offset(Expression query, Expression offset) { super(query, offset); diff --git a/ccm-core/src/com/redhat/persistence/oql/Or.java b/ccm-core/src/com/redhat/persistence/oql/Or.java index d3c331263..3160f93a9 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Or.java +++ b/ccm-core/src/com/redhat/persistence/oql/Or.java @@ -28,7 +28,7 @@ package com.redhat.persistence.oql; public class Or extends BinaryCondition { - public final static String versionId = "$Id: Or.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public Or(Expression left, Expression right) { super(left, right); diff --git a/ccm-core/src/com/redhat/persistence/oql/QFrame.java b/ccm-core/src/com/redhat/persistence/oql/QFrame.java index 09cf22a7f..77333142b 100755 --- a/ccm-core/src/com/redhat/persistence/oql/QFrame.java +++ b/ccm-core/src/com/redhat/persistence/oql/QFrame.java @@ -48,7 +48,7 @@ import org.apache.log4j.Logger; class QFrame { - public final static String versionId = "$Id: QFrame.java 751 2005-09-02 12:52:23Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(QFrame.class); diff --git a/ccm-core/src/com/redhat/persistence/oql/QValue.java b/ccm-core/src/com/redhat/persistence/oql/QValue.java index 02d388b98..621f516d3 100755 --- a/ccm-core/src/com/redhat/persistence/oql/QValue.java +++ b/ccm-core/src/com/redhat/persistence/oql/QValue.java @@ -31,7 +31,7 @@ import com.redhat.persistence.metadata.Table; class QValue { - public final static String versionId = "$Id: QValue.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private QFrame m_frame; private String m_column = null; diff --git a/ccm-core/src/com/redhat/persistence/oql/Query.java b/ccm-core/src/com/redhat/persistence/oql/Query.java index 782c539ac..1a67f0f84 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Query.java +++ b/ccm-core/src/com/redhat/persistence/oql/Query.java @@ -38,7 +38,7 @@ import org.apache.log4j.Logger; public class Query { - public final static String versionId = "$Id: Query.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(Query.class); diff --git a/ccm-core/src/com/redhat/persistence/oql/Range.java b/ccm-core/src/com/redhat/persistence/oql/Range.java index 96601b3ef..e1924adfc 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Range.java +++ b/ccm-core/src/com/redhat/persistence/oql/Range.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public abstract class Range extends Expression { - public final static String versionId = "$Id: Range.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + Expression m_query; Expression m_operand; diff --git a/ccm-core/src/com/redhat/persistence/oql/RightJoin.java b/ccm-core/src/com/redhat/persistence/oql/RightJoin.java index 79d1b27cf..11536c9d1 100755 --- a/ccm-core/src/com/redhat/persistence/oql/RightJoin.java +++ b/ccm-core/src/com/redhat/persistence/oql/RightJoin.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class RightJoin extends LeftJoin { - public final static String versionId = "$Id: RightJoin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public RightJoin(Expression left, Expression right, Expression condition) { super(right, left, condition); diff --git a/ccm-core/src/com/redhat/persistence/oql/Size.java b/ccm-core/src/com/redhat/persistence/oql/Size.java index fa4921f59..f7bbadae5 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Size.java +++ b/ccm-core/src/com/redhat/persistence/oql/Size.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class Size extends Expression { - public final static String versionId = "$Id: Size.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private Expression m_query; diff --git a/ccm-core/src/com/redhat/persistence/oql/Sort.java b/ccm-core/src/com/redhat/persistence/oql/Sort.java index 0d82fe61a..a87f0f798 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Sort.java +++ b/ccm-core/src/com/redhat/persistence/oql/Sort.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public class Sort extends Expression { - public final static String versionId = "$Id: Sort.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static class Order { private Order() {} diff --git a/ccm-core/src/com/redhat/persistence/oql/UnaryCondition.java b/ccm-core/src/com/redhat/persistence/oql/UnaryCondition.java index 330fabfc9..80b636111 100755 --- a/ccm-core/src/com/redhat/persistence/oql/UnaryCondition.java +++ b/ccm-core/src/com/redhat/persistence/oql/UnaryCondition.java @@ -27,7 +27,7 @@ package com.redhat.persistence.oql; public abstract class UnaryCondition extends Condition { - public final static String versionId = "$Id: UnaryCondition.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + Expression m_operand; diff --git a/ccm-core/src/com/redhat/persistence/oql/Variable.java b/ccm-core/src/com/redhat/persistence/oql/Variable.java index d4e9ec947..e5763f18d 100755 --- a/ccm-core/src/com/redhat/persistence/oql/Variable.java +++ b/ccm-core/src/com/redhat/persistence/oql/Variable.java @@ -28,7 +28,7 @@ package com.redhat.persistence.oql; public class Variable extends Expression { - public final static String versionId = "$Id: Variable.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private String m_name; diff --git a/ccm-core/src/com/redhat/persistence/pdl/DDLWriter.java b/ccm-core/src/com/redhat/persistence/pdl/DDLWriter.java index 6bad1c161..034bd648f 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/DDLWriter.java +++ b/ccm-core/src/com/redhat/persistence/pdl/DDLWriter.java @@ -45,7 +45,7 @@ import java.util.Set; public class DDLWriter { - public final static String versionId = "$Id: DDLWriter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private File m_base; private boolean m_overwrite; diff --git a/ccm-core/src/com/redhat/persistence/pdl/ErrorReport.java b/ccm-core/src/com/redhat/persistence/pdl/ErrorReport.java index eb77cc4fa..bf54505cb 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/ErrorReport.java +++ b/ccm-core/src/com/redhat/persistence/pdl/ErrorReport.java @@ -32,7 +32,7 @@ import java.util.Iterator; class ErrorReport { - public final static String versionId = "$Id: ErrorReport.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private ArrayList m_messages = new ArrayList(); private boolean m_fatal = false; diff --git a/ccm-core/src/com/redhat/persistence/pdl/PDL.java b/ccm-core/src/com/redhat/persistence/pdl/PDL.java index 741d9c61d..45d365d1a 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/PDL.java +++ b/ccm-core/src/com/redhat/persistence/pdl/PDL.java @@ -91,7 +91,7 @@ import org.apache.log4j.Logger; public class PDL { - public final static String versionId = "$Id: PDL.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private final static Logger LOG = Logger.getLogger(PDL.class); public static final String LINK = "@link"; diff --git a/ccm-core/src/com/redhat/persistence/pdl/PDLWriter.java b/ccm-core/src/com/redhat/persistence/pdl/PDLWriter.java index a448e3c5f..95dcd3440 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/PDLWriter.java +++ b/ccm-core/src/com/redhat/persistence/pdl/PDLWriter.java @@ -46,7 +46,7 @@ import java.util.Iterator; public class PDLWriter { - public final static String versionId = "$Id: PDLWriter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private Writer m_out; diff --git a/ccm-core/src/com/redhat/persistence/pdl/SymbolTable.java b/ccm-core/src/com/redhat/persistence/pdl/SymbolTable.java index 8b22fc167..a405391aa 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/SymbolTable.java +++ b/ccm-core/src/com/redhat/persistence/pdl/SymbolTable.java @@ -41,7 +41,7 @@ import java.util.Iterator; class SymbolTable { - public final static String versionId = "$Id: SymbolTable.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private HashMap m_types = new HashMap(); private ArrayList m_order = new ArrayList(); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/BigDecimalAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/BigDecimalAd.java index daa5db39a..1d7139346 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/BigDecimalAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/BigDecimalAd.java @@ -33,10 +33,6 @@ import java.sql.Types; public class BigDecimalAd extends SimpleAdapter { - public final static String versionId = - "$Id: BigDecimalAd.java 287 2005-02-22 00:29:02Z sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; - public BigDecimalAd() { super("global.BigDecimal", Types.NUMERIC); } diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/BigIntegerAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/BigIntegerAd.java index d4a4c35ff..99fedcb38 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/BigIntegerAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/BigIntegerAd.java @@ -34,7 +34,7 @@ import java.sql.Types; public class BigIntegerAd extends SimpleAdapter { - public final static String versionId = "$Id: BigIntegerAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public BigIntegerAd() { super("global.BigInteger", Types.NUMERIC); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/BooleanAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/BooleanAd.java index f4d4168d4..ad0028bca 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/BooleanAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/BooleanAd.java @@ -33,7 +33,7 @@ import java.sql.Types; public class BooleanAd extends SimpleAdapter { - public final static String versionId = "$Id: BooleanAd.java 735 2005-09-01 06:42:59Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public BooleanAd() { super("global.Boolean", Types.BIT); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/ByteAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/ByteAd.java index 13a18351f..d66ef665b 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/ByteAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/ByteAd.java @@ -32,7 +32,7 @@ import java.sql.Types; public class ByteAd extends SimpleAdapter { - public final static String versionId = "$Id: ByteAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public ByteAd() { super("global.Byte", Types.TINYINT); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/CharacterAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/CharacterAd.java index 896544839..657b1487d 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/CharacterAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/CharacterAd.java @@ -32,7 +32,7 @@ import java.sql.Types; public class CharacterAd extends SimpleAdapter { - public final static String versionId = "$Id: CharacterAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public CharacterAd() { super("global.Character", Types.CHAR); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/DateAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/DateAd.java index 3eb11f9f7..8f78fb899 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/DateAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/DateAd.java @@ -35,7 +35,7 @@ import java.sql.Types; public class DateAd extends SimpleAdapter { - public final static String versionId = "$Id: DateAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DateAd() { super("global.Date", Types.TIMESTAMP); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/DoubleAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/DoubleAd.java index d0e831862..754be5499 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/DoubleAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/DoubleAd.java @@ -33,10 +33,6 @@ import java.sql.Types; public class DoubleAd extends SimpleAdapter { - public final static String versionId = - "$Id: DoubleAd.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public DoubleAd() { super("global.Double", Types.DOUBLE); } diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/FloatAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/FloatAd.java index f66fdb0d5..5a632f669 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/FloatAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/FloatAd.java @@ -33,7 +33,7 @@ import java.sql.Types; public class FloatAd extends SimpleAdapter { - public final static String versionId = "$Id: FloatAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public FloatAd() { super("global.Float", Types.FLOAT); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/IntegerAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/IntegerAd.java index 17dbeeea3..bac269a2b 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/IntegerAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/IntegerAd.java @@ -33,7 +33,7 @@ import java.sql.Types; public class IntegerAd extends SimpleAdapter { - public final static String versionId = "$Id: IntegerAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public IntegerAd() { super("global.Integer", Types.INTEGER); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/LongAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/LongAd.java index 8ea62e09e..7f8a6e3c8 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/LongAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/LongAd.java @@ -33,7 +33,7 @@ import java.sql.Types; public class LongAd extends SimpleAdapter { - public final static String versionId = "$Id: LongAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public LongAd() { super("global.Long", Types.BIGINT); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/ObjectAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/ObjectAd.java index af4cbbaf4..58b6dc6d1 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/ObjectAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/ObjectAd.java @@ -32,7 +32,7 @@ import java.sql.Types; public class ObjectAd extends SimpleAdapter { - public final static String versionId = "$Id: ObjectAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public ObjectAd() { super("global.Object", Types.INTEGER); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/ShortAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/ShortAd.java index 04cf9e69d..8f4803d08 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/ShortAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/ShortAd.java @@ -33,7 +33,7 @@ import java.sql.Types; public class ShortAd extends SimpleAdapter { - public final static String versionId = "$Id: ShortAd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public ShortAd() { super("global.Short", Types.SMALLINT); diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java index c01956b6b..702a0a6ea 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java @@ -36,10 +36,6 @@ import com.redhat.persistence.metadata.ObjectType; abstract class SimpleAdapter extends Adapter { - public final static String versionId = - "$Id: SimpleAdapter.java 735 2005-09-01 06:42:59Z sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; - private String m_type; private int m_defaultJDBCType; diff --git a/ccm-core/src/com/redhat/persistence/pdl/adapters/StringAd.java b/ccm-core/src/com/redhat/persistence/pdl/adapters/StringAd.java index b12b8351d..b6bddeb71 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/adapters/StringAd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/adapters/StringAd.java @@ -37,7 +37,7 @@ import com.arsdigita.db.DbHelper; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Id: StringAd.java 287 2005-02-22 00:29:02Z sskracic $ - **/ + */ public class StringAd extends SimpleAdapter { diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/AST.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/AST.java index b25f25af3..6fe30341f 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/AST.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/AST.java @@ -29,7 +29,7 @@ package com.redhat.persistence.pdl.nodes; public class AST extends Node { - public final static String versionId = "$Id: AST.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field FILES = new Field(AST.class, "files", FileNd.class); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/AggressiveLoadNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/AggressiveLoadNd.java index 7263cdf66..97c3cee4e 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/AggressiveLoadNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/AggressiveLoadNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class AggressiveLoadNd extends StatementNd { - public final static String versionId = "$Id: AggressiveLoadNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field PATHS = new Field(AggressiveLoadNd.class, "paths", PathNd.class, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/AssociationNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/AssociationNd.java index a03853806..c3bf8a642 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/AssociationNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/AssociationNd.java @@ -29,7 +29,7 @@ import java.util.Collection; public class AssociationNd extends StatementNd { - public final static String versionId = "$Id: AssociationNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field ROLE_ONE = new Field(AssociationNd.class, "roleOne", PropertyNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/BindingNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/BindingNd.java index 415f43182..e752f9f5d 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/BindingNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/BindingNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class BindingNd extends Node { - public final static String versionId = "$Id: BindingNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field PATH = new Field(BindingNd.class, "path", PathNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/ColumnNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/ColumnNd.java index bda89c199..97fc03c44 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/ColumnNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/ColumnNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class ColumnNd extends Node { - public final static String versionId = "$Id: ColumnNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field TABLE = new Field(ColumnNd.class, "table", IdentifierNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/DataOperationNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/DataOperationNd.java index cf71dea57..0ee4324f5 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/DataOperationNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/DataOperationNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class DataOperationNd extends Node { - public final static String versionId = "$Id: DataOperationNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field NAME = new Field(DataOperationNd.class, "name", IdentifierNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/DbTypeNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/DbTypeNd.java index 31b95c8a9..5290d5404 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/DbTypeNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/DbTypeNd.java @@ -29,7 +29,7 @@ import com.arsdigita.util.WrappedError; public class DbTypeNd extends Node { - public final static String versionId = "$Id: DbTypeNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field NAME = new Field(DbTypeNd.class, "name", IdentifierNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/EventNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/EventNd.java index 6c42969f9..cbde080c5 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/EventNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/EventNd.java @@ -30,7 +30,7 @@ import java.util.HashMap; public class EventNd extends Node { - public final static String versionId = "$Id: EventNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final HashMap TYPES = new HashMap(); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/FileNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/FileNd.java index 2d97cc72e..3ecd58eca 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/FileNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/FileNd.java @@ -29,7 +29,7 @@ import java.util.Collection; public class FileNd extends Node { - public final static String versionId = "$Id: FileNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field MODEL = new Field(FileNd.class, "model", ModelNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/IdentifierNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/IdentifierNd.java index 2664e1e37..f89296f6b 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/IdentifierNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/IdentifierNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class IdentifierNd extends Node { - public final static String versionId = "$Id: IdentifierNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private String m_name; diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/ImportNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/ImportNd.java index 1f931e3e5..1ed39678b 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/ImportNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/ImportNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class ImportNd extends Node { - public final static String versionId = "$Id: ImportNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field PATH = new Field(ImportNd.class, "path", IdentifierNd.class, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/JavaClassNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/JavaClassNd.java index f5d2dca8a..a6af8bcae 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/JavaClassNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/JavaClassNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class JavaClassNd extends Node { - public final static String versionId = "$Id: JavaClassNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field IDENTIFIERS = new Field(JavaClassNd.class, "identifiers", IdentifierNd.class, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/JoinNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/JoinNd.java index d5b3cd21b..8d6ee42d7 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/JoinNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/JoinNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class JoinNd extends Node { - public final static String versionId = "$Id: JoinNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field FROM = new Field(JoinNd.class, "from", ColumnNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/JoinPathNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/JoinPathNd.java index f31738073..0440f0f16 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/JoinPathNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/JoinPathNd.java @@ -29,7 +29,7 @@ import java.util.List; public class JoinPathNd extends StatementNd { - public final static String versionId = "$Id: JoinPathNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field JOINS = new Field(JoinPathNd.class, "joins", JoinNd.class, 1, 2); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/MappingNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/MappingNd.java index 7ad3390a7..2ef356333 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/MappingNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/MappingNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class MappingNd extends Node { - public final static String versionId = "$Id: MappingNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field PATH = new Field(MappingNd.class, "path", PathNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/ModelNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/ModelNd.java index 3a77459b9..3db9f24ed 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/ModelNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/ModelNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class ModelNd extends Node { - public final static String versionId = "$Id: ModelNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field PATH = new Field(ModelNd.class, "path", IdentifierNd.class, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/Node.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/Node.java index 790605e3f..6cd02df99 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/Node.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/Node.java @@ -35,7 +35,7 @@ import java.util.List; public abstract class Node { - public final static String versionId = "$Id: Node.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/pdl/nodes/ObjectKeyNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/ObjectKeyNd.java index ff32a3db7..b57f8a6fd 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/ObjectKeyNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/ObjectKeyNd.java @@ -29,7 +29,7 @@ import java.util.Collection; public class ObjectKeyNd extends StatementNd { - public final static String versionId = "$Id: ObjectKeyNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field PROPERTIES = new Field(ObjectKeyNd.class, "properties", IdentifierNd.class, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/ObjectTypeNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/ObjectTypeNd.java index d520ab154..853880521 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/ObjectTypeNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/ObjectTypeNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class ObjectTypeNd extends Node { - public final static String versionId = "$Id: ObjectTypeNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field NAME = new Field(ObjectTypeNd.class, "name", IdentifierNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/PathNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/PathNd.java index 9a125c6e8..5bbb1babc 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/PathNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/PathNd.java @@ -29,7 +29,7 @@ import com.redhat.persistence.common.Path; public class PathNd extends Node { - public final static String versionId = "$Id: PathNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field PATH = new Field(PathNd.class, "path", IdentifierNd.class, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/PropertyNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/PropertyNd.java index ef650cccb..344eea844 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/PropertyNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/PropertyNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class PropertyNd extends StatementNd { - public final static String versionId = "$Id: PropertyNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field TYPE = new Field(PropertyNd.class, "type", TypeNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/QualiasNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/QualiasNd.java index 800d0ec77..7e87e1b2d 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/QualiasNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/QualiasNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class QualiasNd extends Node { - public final static String versionId = "$Id: QualiasNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private String m_query; diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/ReferenceKeyNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/ReferenceKeyNd.java index ca0217696..cf5cc4882 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/ReferenceKeyNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/ReferenceKeyNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class ReferenceKeyNd extends StatementNd { - public final static String versionId = "$Id: ReferenceKeyNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field COLUMN = new Field(ReferenceKeyNd.class, "column", ColumnNd.class, 1, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/SQLBlockNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/SQLBlockNd.java index e577ee4e7..fd9f1a409 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/SQLBlockNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/SQLBlockNd.java @@ -29,7 +29,7 @@ import java.util.Collection; public class SQLBlockNd extends Node { - public final static String versionId = "$Id: SQLBlockNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field MAPPINGS = new Field(SQLBlockNd.class, "mappings", MappingNd.class, 0); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/StatementNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/StatementNd.java index 646846826..56d1d584e 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/StatementNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/StatementNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public abstract class StatementNd extends Node { - public final static String versionId = "$Id: StatementNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public void dispatch(Switch sw) { super.dispatch(sw); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/SuperNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/SuperNd.java index ddaf50e05..a348a18af 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/SuperNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/SuperNd.java @@ -27,7 +27,7 @@ package com.redhat.persistence.pdl.nodes; public class SuperNd extends Node { - public final static String versionId = "$Id: SuperNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public void dispatch(Switch sw) { super.dispatch(sw); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/TypeNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/TypeNd.java index 3a7bb3320..4677a0406 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/TypeNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/TypeNd.java @@ -29,7 +29,7 @@ import java.util.Collection; public class TypeNd extends Node { - public final static String versionId = "$Id: TypeNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field IDENTIFIERS = new Field(TypeNd.class, "identifiers", IdentifierNd.class, 1); diff --git a/ccm-core/src/com/redhat/persistence/pdl/nodes/UniqueKeyNd.java b/ccm-core/src/com/redhat/persistence/pdl/nodes/UniqueKeyNd.java index 14b79582b..b71f1daae 100755 --- a/ccm-core/src/com/redhat/persistence/pdl/nodes/UniqueKeyNd.java +++ b/ccm-core/src/com/redhat/persistence/pdl/nodes/UniqueKeyNd.java @@ -29,7 +29,7 @@ import java.util.Collection; public class UniqueKeyNd extends StatementNd { - public final static String versionId = "$Id: UniqueKeyNd.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static final Field PROPERTIES = new Field(UniqueKeyNd.class, "properties", IdentifierNd.class, 1); diff --git a/ccm-core/test/src/com/arsdigita/bebop/BebopFormCactusTest.java b/ccm-core/test/src/com/arsdigita/bebop/BebopFormCactusTest.java index 8b24b6d4d..20b03feb2 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/BebopFormCactusTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/BebopFormCactusTest.java @@ -48,7 +48,6 @@ import org.apache.cactus.WebRequest; public class BebopFormCactusTest extends ServletTestCase { - public static final String versionId = "$Id: BebopFormCactusTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; Servlet s; Page page; diff --git a/ccm-core/test/src/com/arsdigita/bebop/BebopPipelineTest.java b/ccm-core/test/src/com/arsdigita/bebop/BebopPipelineTest.java index 4a60b0b84..04d17b31b 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/BebopPipelineTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/BebopPipelineTest.java @@ -33,7 +33,6 @@ import junit.framework.TestCase; * */ public class BebopPipelineTest extends TestCase { - public static final String versionId = "$Id: BebopPipelineTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/BebopSuite.java b/ccm-core/test/src/com/arsdigita/bebop/BebopSuite.java index 100fc6f98..9f925c6c2 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/BebopSuite.java +++ b/ccm-core/test/src/com/arsdigita/bebop/BebopSuite.java @@ -32,8 +32,6 @@ import junit.framework.Test; public class BebopSuite extends PackageTestSuite { - public final static String versionId = "$Id: BebopSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static Test suite() { BebopSuite suite = new BebopSuite(); populateSuite(suite); diff --git a/ccm-core/test/src/com/arsdigita/bebop/BoxPanelTest.java b/ccm-core/test/src/com/arsdigita/bebop/BoxPanelTest.java index 8f6b292f6..f1aab49a7 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/BoxPanelTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/BoxPanelTest.java @@ -27,7 +27,6 @@ package com.arsdigita.bebop; public class BoxPanelTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: BoxPanelTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public final static int HORIZONTAL = 1; public final static int VERTICAL = 2; diff --git a/ccm-core/test/src/com/arsdigita/bebop/ColumnPanelTest.java b/ccm-core/test/src/com/arsdigita/bebop/ColumnPanelTest.java index f73d1f555..925182cdc 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ColumnPanelTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ColumnPanelTest.java @@ -27,7 +27,6 @@ package com.arsdigita.bebop; public class ColumnPanelTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: ColumnPanelTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public ColumnPanelTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/ComponentImpl.java b/ccm-core/test/src/com/arsdigita/bebop/ComponentImpl.java index 3d30f9998..b4ff18122 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ComponentImpl.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ComponentImpl.java @@ -29,7 +29,6 @@ import java.util.Iterator; public class ComponentImpl extends LockableImpl implements Component { - public static final String versionId = "$Id: ComponentImpl.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public void generateXML(PageState state, Element parent) {} diff --git a/ccm-core/test/src/com/arsdigita/bebop/ComponentTest.java b/ccm-core/test/src/com/arsdigita/bebop/ComponentTest.java index b1e482d81..f7f309c05 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ComponentTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ComponentTest.java @@ -32,7 +32,6 @@ import junit.framework.TestCase; public class ComponentTest extends TestCase { - public static final String versionId = "$Id: ComponentTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; ComponentImpl m_ComponentImpl; Page m_page; diff --git a/ccm-core/test/src/com/arsdigita/bebop/ComponentToXML.java b/ccm-core/test/src/com/arsdigita/bebop/ComponentToXML.java index 2953e0d35..3fe616d0d 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ComponentToXML.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ComponentToXML.java @@ -36,7 +36,6 @@ import javax.servlet.ServletException; */ public class ComponentToXML { - public static final String versionId = "$Id: ComponentToXML.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * This method places the given component into a page, generates XML, and returns diff --git a/ccm-core/test/src/com/arsdigita/bebop/ComponentXMLComparator.java b/ccm-core/test/src/com/arsdigita/bebop/ComponentXMLComparator.java index 6d57188fd..da575a6c3 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ComponentXMLComparator.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ComponentXMLComparator.java @@ -50,7 +50,6 @@ import org.w3c.dom.Document; */ public abstract class ComponentXMLComparator { - public static final String versionId = "$Id: ComponentXMLComparator.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger log = Logger.getLogger(ComponentXMLComparator.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java b/ccm-core/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java index f81536d13..59ac48ab1 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java @@ -44,7 +44,6 @@ import org.w3c.dom.Document; public class ComponentXMLRegexper { - public static final String versionId = "$Id: ComponentXMLRegexper.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static DocumentBuilderFactory s_DocumentBuilderFactory; // The Page to use for XML generation. diff --git a/ccm-core/test/src/com/arsdigita/bebop/CompoundComponentXMLComparator.java b/ccm-core/test/src/com/arsdigita/bebop/CompoundComponentXMLComparator.java index b66f5617d..1b2334870 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/CompoundComponentXMLComparator.java +++ b/ccm-core/test/src/com/arsdigita/bebop/CompoundComponentXMLComparator.java @@ -28,7 +28,6 @@ package com.arsdigita.bebop; public class CompoundComponentXMLComparator extends ComponentXMLComparator { - public static final String versionId = "$Id: CompoundComponentXMLComparator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Constucts a comparator for a Component. * diff --git a/ccm-core/test/src/com/arsdigita/bebop/ContainerImpl.java b/ccm-core/test/src/com/arsdigita/bebop/ContainerImpl.java index 8c98dd0ff..42272d3c6 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ContainerImpl.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ContainerImpl.java @@ -28,7 +28,6 @@ package com.arsdigita.bebop; public class ContainerImpl extends ComponentImpl implements Container { - public static final String versionId = "$Id: ContainerImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public ContainerImpl() {} diff --git a/ccm-core/test/src/com/arsdigita/bebop/ContainerTest.java b/ccm-core/test/src/com/arsdigita/bebop/ContainerTest.java index 9e2152ece..af6a5b6ba 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ContainerTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ContainerTest.java @@ -28,7 +28,6 @@ import junit.framework.TestCase; public class ContainerTest extends TestCase { - public static final String versionId = "$Id: ContainerTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; ContainerImpl m_containerImpl; diff --git a/ccm-core/test/src/com/arsdigita/bebop/ControlLinkTest.java b/ccm-core/test/src/com/arsdigita/bebop/ControlLinkTest.java index 8ec1e41cb..fa993e341 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ControlLinkTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ControlLinkTest.java @@ -27,7 +27,6 @@ package com.arsdigita.bebop; public class ControlLinkTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: ControlLinkTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public ControlLinkTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/FormDataTest.java b/ccm-core/test/src/com/arsdigita/bebop/FormDataTest.java index 61e6f2db7..ffa29d533 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/FormDataTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/FormDataTest.java @@ -44,7 +44,6 @@ import javax.servlet.ServletRequest; * */ public class FormDataTest extends BaseTestCase { - public static final String versionId = "$Id: FormDataTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/FormTest.java b/ccm-core/test/src/com/arsdigita/bebop/FormTest.java index db5f40e4b..6bad3386f 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/FormTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/FormTest.java @@ -27,7 +27,6 @@ package com.arsdigita.bebop; public class FormTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: FormTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public FormTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/ImageTest.java b/ccm-core/test/src/com/arsdigita/bebop/ImageTest.java index 4c33ad140..79cb0f5e9 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ImageTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ImageTest.java @@ -27,7 +27,6 @@ package com.arsdigita.bebop; public class ImageTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: ImageTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public ImageTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/LabelTest.java b/ccm-core/test/src/com/arsdigita/bebop/LabelTest.java index 1241965fa..ac93784f1 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/LabelTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/LabelTest.java @@ -27,7 +27,6 @@ package com.arsdigita.bebop; public class LabelTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: LabelTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public LabelTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/LinkTest.java b/ccm-core/test/src/com/arsdigita/bebop/LinkTest.java index 2f61c6273..1d8184749 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/LinkTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/LinkTest.java @@ -27,8 +27,6 @@ package com.arsdigita.bebop; public class LinkTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: LinkTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public LinkTest (String id) { super(id); } diff --git a/ccm-core/test/src/com/arsdigita/bebop/ListPanelTest.java b/ccm-core/test/src/com/arsdigita/bebop/ListPanelTest.java index 15cccd8f0..cd52fbc44 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ListPanelTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ListPanelTest.java @@ -27,7 +27,6 @@ package com.arsdigita.bebop; public class ListPanelTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: ListPanelTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public ListPanelTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/ListTest.java b/ccm-core/test/src/com/arsdigita/bebop/ListTest.java index b516c6729..f9985a97c 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ListTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ListTest.java @@ -29,7 +29,6 @@ import java.util.Map; public class ListTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: ListTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public ListTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/LockableImpl.java b/ccm-core/test/src/com/arsdigita/bebop/LockableImpl.java index de3937395..939b08798 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/LockableImpl.java +++ b/ccm-core/test/src/com/arsdigita/bebop/LockableImpl.java @@ -28,7 +28,6 @@ import com.arsdigita.util.Lockable; public class LockableImpl implements Lockable { - public static final String versionId = "$Id: LockableImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public void lock() {} diff --git a/ccm-core/test/src/com/arsdigita/bebop/PageTest.java b/ccm-core/test/src/com/arsdigita/bebop/PageTest.java index fc358dcfa..7c7752112 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/PageTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/PageTest.java @@ -29,7 +29,6 @@ import junit.framework.TestCase; public class PageTest extends TestCase { - public static final String versionId = "$Id: PageTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; SimpleComponent m_comp; Page m_page; diff --git a/ccm-core/test/src/com/arsdigita/bebop/SimpleComponentTest.java b/ccm-core/test/src/com/arsdigita/bebop/SimpleComponentTest.java index 7f27615c8..98fc7cdb8 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/SimpleComponentTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/SimpleComponentTest.java @@ -26,7 +26,6 @@ package com.arsdigita.bebop; public class SimpleComponentTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: SimpleComponentTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public SimpleComponentTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/SingleComponentXMLComparator.java b/ccm-core/test/src/com/arsdigita/bebop/SingleComponentXMLComparator.java index 43c986899..d74d931df 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/SingleComponentXMLComparator.java +++ b/ccm-core/test/src/com/arsdigita/bebop/SingleComponentXMLComparator.java @@ -28,7 +28,6 @@ package com.arsdigita.bebop; public class SingleComponentXMLComparator extends ComponentXMLComparator { - public static final String versionId = "$Id: SingleComponentXMLComparator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Constucts a comparator for a lone Component. * diff --git a/ccm-core/test/src/com/arsdigita/bebop/TabbedPaneTest.java b/ccm-core/test/src/com/arsdigita/bebop/TabbedPaneTest.java index 3680eeb6c..0fc52306e 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/TabbedPaneTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/TabbedPaneTest.java @@ -27,7 +27,6 @@ package com.arsdigita.bebop; public class TabbedPaneTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: TabbedPaneTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public TabbedPaneTest(String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/ToggleLinkTest.java b/ccm-core/test/src/com/arsdigita/bebop/ToggleLinkTest.java index 745ae23e5..656e95f1c 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/ToggleLinkTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/ToggleLinkTest.java @@ -28,7 +28,6 @@ import org.apache.log4j.Logger; public class ToggleLinkTest extends XMLComponentRegressionBase { - public static final String versionId = "$Id: ToggleLinkTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger s_log = Logger.getLogger(ToggleLinkTest.class); diff --git a/ccm-core/test/src/com/arsdigita/bebop/XMLComparatorError.java b/ccm-core/test/src/com/arsdigita/bebop/XMLComparatorError.java index 2bb9a1b5d..b35d634b0 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/XMLComparatorError.java +++ b/ccm-core/test/src/com/arsdigita/bebop/XMLComparatorError.java @@ -26,7 +26,6 @@ package com.arsdigita.bebop; public class XMLComparatorError extends Exception { - public static final String versionId = "$Id: XMLComparatorError.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public XMLComparatorError(String msg) { super(msg); diff --git a/ccm-core/test/src/com/arsdigita/bebop/XMLComponentRegressionBase.java b/ccm-core/test/src/com/arsdigita/bebop/XMLComponentRegressionBase.java index ffb741162..0c600eb1e 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/XMLComponentRegressionBase.java +++ b/ccm-core/test/src/com/arsdigita/bebop/XMLComponentRegressionBase.java @@ -47,7 +47,6 @@ import java.io.StringWriter; public class XMLComponentRegressionBase extends BaseTestCase { - public static final String versionId = "$Id: XMLComponentRegressionBase.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public XMLComponentRegressionBase(String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/form/FormSuite.java b/ccm-core/test/src/com/arsdigita/bebop/form/FormSuite.java index c95824eed..a5465e403 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/form/FormSuite.java +++ b/ccm-core/test/src/com/arsdigita/bebop/form/FormSuite.java @@ -32,7 +32,7 @@ import junit.framework.Test; public class FormSuite extends PackageTestSuite { - public final static String versionId = "$Id: FormSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { FormSuite suite = new FormSuite(); diff --git a/ccm-core/test/src/com/arsdigita/bebop/form/OptionTest.java b/ccm-core/test/src/com/arsdigita/bebop/form/OptionTest.java index a3c5274d0..401ddb7cc 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/form/OptionTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/form/OptionTest.java @@ -22,8 +22,6 @@ import junit.framework.TestCase; public class OptionTest extends TestCase { - public static final String versionId = "$Id: OptionTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Option _option; /** diff --git a/ccm-core/test/src/com/arsdigita/bebop/form/SelectTest.java b/ccm-core/test/src/com/arsdigita/bebop/form/SelectTest.java index 618d69ba7..fe3120933 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/form/SelectTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/form/SelectTest.java @@ -33,8 +33,6 @@ import com.arsdigita.bebop.event.PrintListener; public class SelectTest extends Fixture { - public static final String versionId = "$Id: SelectTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public SelectTest (String id) { super(id); } diff --git a/ccm-core/test/src/com/arsdigita/bebop/form/TagTest.java b/ccm-core/test/src/com/arsdigita/bebop/form/TagTest.java index 76ee2157e..70c86366f 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/form/TagTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/form/TagTest.java @@ -27,7 +27,6 @@ import com.arsdigita.xml.TagTestElement; public class TagTest extends BaseTestCase { - public static final String versionId = "$Id: TagTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public TagTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/bebop/form/TextFieldTest.java b/ccm-core/test/src/com/arsdigita/bebop/form/TextFieldTest.java index 2162ccb55..66834d3d0 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/form/TextFieldTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/form/TextFieldTest.java @@ -26,7 +26,6 @@ package com.arsdigita.bebop.form; public class TextFieldTest extends Fixture { - public static final String versionId = "$Id: TextFieldTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public TextFieldTest (String id) { super(id); diff --git a/ccm-core/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java b/ccm-core/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java index d079a2f35..94788c68f 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java @@ -30,11 +30,10 @@ import org.apache.oro.text.perl.Perl5Util; * * * @author Bill Schneider - * @version 1.0 + * @version $Id: BebopJSPTest.java 748 2005-09-02 11:57:31Z sskracic $ */ public class BebopJSPTest extends HttpUnitTestCase { - public static final String versionId = "$Id: BebopJSPTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Perl5Util m_re; diff --git a/ccm-core/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java b/ccm-core/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java index 81e61314a..2a37a8efc 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java +++ b/ccm-core/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java @@ -23,7 +23,6 @@ import junit.framework.Test; public class BebopJSPTestSuite extends PackageTestSuite { - public static final String versionId = "$Id: BebopJSPTestSuite.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static Test suite() { BebopJSPTestSuite suite = new BebopJSPTestSuite(); return suite; diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java index ced820a9a..444c8b171 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java @@ -34,8 +34,6 @@ import java.util.Iterator; public class ArrayParameterTest extends BaseTestCase { - public static final String versionId = "$Id: ArrayParameterTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static final String ARRAY_PARAM = "ArrayParameter"; /** diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java index 2f2812f8e..b7d541530 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java @@ -28,7 +28,6 @@ import java.math.BigDecimal; public class BigDecimalParameterTest extends BaseTestCase { - public static final String versionId = "$Id: BigDecimalParameterTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java index 24003645c..43ac8af0f 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java @@ -27,7 +27,6 @@ import java.util.GregorianCalendar; public class DateParameterTest extends BaseTestCase { - public static final String versionId = "$Id: DateParameterTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java index 0c19b927e..c69259a7f 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java @@ -26,7 +26,6 @@ import java.lang.IllegalArgumentException; public class EmailParameterTest extends BaseTestCase { - public static final String versionId = "$Id: EmailParameterTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java index 30fa37eab..bea795abd 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java @@ -25,7 +25,6 @@ import com.arsdigita.bebop.parameters.ParameterData; public class EnumerationValidationListenerTest extends ValidationListenerTest { - public static final String versionId = "$Id: EnumerationValidationListenerTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java index 878a0262d..7ca6506b1 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java @@ -28,7 +28,6 @@ import java.lang.IllegalArgumentException; public class IntegerParameterTest extends BaseTestCase { - public static final String versionId = "$Id: IntegerParameterTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java index b25cd4ac1..dea80349d 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java @@ -27,7 +27,6 @@ import java.lang.IllegalArgumentException; public class NumberParameterTest extends BaseTestCase { - public static final String versionId = "$Id: NumberParameterTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java index b01fedbe1..b4c829335 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java @@ -25,7 +25,6 @@ import com.arsdigita.bebop.parameters.ParameterData; public class NumberValidationListenerTest extends ValidationListenerTest { - public static final String versionId = "$Id: NumberValidationListenerTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/ParameterSuite.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/ParameterSuite.java index a424920fc..04dc84b2b 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/ParameterSuite.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/ParameterSuite.java @@ -32,7 +32,7 @@ import junit.framework.Test; public class ParameterSuite extends PackageTestSuite { - public final static String versionId = "$Id: ParameterSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { ParameterSuite suite = new ParameterSuite(); diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java index 0e9525f05..efa7e88b0 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java @@ -26,7 +26,6 @@ import java.lang.IllegalArgumentException; public class URLParameterTest extends BaseTestCase { - public static final String versionId = "$Id: URLParameterTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java b/ccm-core/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java index 055592d02..682a74ada 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java @@ -31,7 +31,6 @@ import com.arsdigita.util.RequestEnvironment; public class ValidationListenerTest extends BaseTestCase { - public static final String versionId = "$Id: ValidationListenerTest.java 742 2005-09-02 10:29:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** Constructs a test with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/bebop/util/LockableImplTest.java b/ccm-core/test/src/com/arsdigita/bebop/util/LockableImplTest.java index 1c0d31dee..50be5bd8a 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/util/LockableImplTest.java +++ b/ccm-core/test/src/com/arsdigita/bebop/util/LockableImplTest.java @@ -34,7 +34,6 @@ import junit.framework.TestSuite; public class LockableImplTest extends TestCase { - public static final String versionId = "$Id: LockableImplTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private LockableImpl m_lockableImpl; diff --git a/ccm-core/test/src/com/arsdigita/bebop/util/UtilSuite.java b/ccm-core/test/src/com/arsdigita/bebop/util/UtilSuite.java index 5b3aac5dc..2a64737d5 100755 --- a/ccm-core/test/src/com/arsdigita/bebop/util/UtilSuite.java +++ b/ccm-core/test/src/com/arsdigita/bebop/util/UtilSuite.java @@ -32,8 +32,6 @@ import junit.framework.Test; public class UtilSuite extends PackageTestSuite { - public final static String versionId = "$Id: UtilSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static Test suite() { UtilSuite suite = new UtilSuite(); populateSuite(suite); diff --git a/ccm-core/test/src/com/arsdigita/categorization/CategorizationSuite.java b/ccm-core/test/src/com/arsdigita/categorization/CategorizationSuite.java index cd13afc24..df463a64b 100755 --- a/ccm-core/test/src/com/arsdigita/categorization/CategorizationSuite.java +++ b/ccm-core/test/src/com/arsdigita/categorization/CategorizationSuite.java @@ -31,7 +31,6 @@ import junit.framework.Test; * @version 1.0 **/ public class CategorizationSuite extends PackageTestSuite { - public static final String versionId = "$Id: CategorizationSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public CategorizationSuite() { super(); } diff --git a/ccm-core/test/src/com/arsdigita/categorization/CategoryFamilyAltTest.java b/ccm-core/test/src/com/arsdigita/categorization/CategoryFamilyAltTest.java index 24a55c797..d637b3ed3 100755 --- a/ccm-core/test/src/com/arsdigita/categorization/CategoryFamilyAltTest.java +++ b/ccm-core/test/src/com/arsdigita/categorization/CategoryFamilyAltTest.java @@ -29,7 +29,6 @@ package com.arsdigita.categorization; */ public class CategoryFamilyAltTest extends CategoryFamilyTest { - public static final String versionId = "$Id: CategoryFamilyAltTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public CategoryFamilyAltTest( String name ) { super( name ); diff --git a/ccm-core/test/src/com/arsdigita/categorization/CategoryTreeModelTest.java b/ccm-core/test/src/com/arsdigita/categorization/CategoryTreeModelTest.java index ce5b8bd14..2694b9b28 100755 --- a/ccm-core/test/src/com/arsdigita/categorization/CategoryTreeModelTest.java +++ b/ccm-core/test/src/com/arsdigita/categorization/CategoryTreeModelTest.java @@ -40,7 +40,6 @@ import junit.framework.TestCase; public class CategoryTreeModelTest extends TestCase { - public static final String versionId = "$Id: CategoryTreeModelTest.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; Session session; TransactionContext txn; diff --git a/ccm-core/test/src/com/arsdigita/categorization/CategoryTreeNodeTest.java b/ccm-core/test/src/com/arsdigita/categorization/CategoryTreeNodeTest.java index b1fa4a507..844aafe45 100755 --- a/ccm-core/test/src/com/arsdigita/categorization/CategoryTreeNodeTest.java +++ b/ccm-core/test/src/com/arsdigita/categorization/CategoryTreeNodeTest.java @@ -40,7 +40,6 @@ import junit.framework.TestCase; public class CategoryTreeNodeTest extends TestCase { - public static final String versionId = "$Id: CategoryTreeNodeTest.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; Session session; TransactionContext txn; diff --git a/ccm-core/test/src/com/arsdigita/db/ConnectionManagerTest.java b/ccm-core/test/src/com/arsdigita/db/ConnectionManagerTest.java index b6224957d..98d0ecb51 100755 --- a/ccm-core/test/src/com/arsdigita/db/ConnectionManagerTest.java +++ b/ccm-core/test/src/com/arsdigita/db/ConnectionManagerTest.java @@ -26,7 +26,6 @@ import junit.framework.TestSuite; public class ConnectionManagerTest extends TestCase { - public static final String versionId = "$Id: ConnectionManagerTest.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private String ORACLE_DATE_QUERY = "select sysdate from dual"; private String POSTGRES_DATE_QUERY = "select 'now'::timestamp"; diff --git a/ccm-core/test/src/com/arsdigita/db/DBExerciseTest.java b/ccm-core/test/src/com/arsdigita/db/DBExerciseTest.java index 58a5508ac..8b3ad80e0 100755 --- a/ccm-core/test/src/com/arsdigita/db/DBExerciseTest.java +++ b/ccm-core/test/src/com/arsdigita/db/DBExerciseTest.java @@ -42,7 +42,6 @@ import junit.framework.TestSuite; public class DBExerciseTest extends TestCase { - public static final String versionId = "$Id: DBExerciseTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static java.sql.Connection conn; diff --git a/ccm-core/test/src/com/arsdigita/db/DBTestSuite.java b/ccm-core/test/src/com/arsdigita/db/DBTestSuite.java index 3334449bb..0681f9bbd 100755 --- a/ccm-core/test/src/com/arsdigita/db/DBTestSuite.java +++ b/ccm-core/test/src/com/arsdigita/db/DBTestSuite.java @@ -33,7 +33,6 @@ import junit.framework.TestResult; * @version $Revision: #11 $ $Date: 2004/08/16 $ */ public class DBTestSuite extends PackageTestSuite { - public final static String versionId = "$Id: DBTestSuite.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static Test suite() { DBTestSuite suite = new DBTestSuite(); diff --git a/ccm-core/test/src/com/arsdigita/db/SequenceTest.java b/ccm-core/test/src/com/arsdigita/db/SequenceTest.java index 25f47cb59..df7b90845 100755 --- a/ccm-core/test/src/com/arsdigita/db/SequenceTest.java +++ b/ccm-core/test/src/com/arsdigita/db/SequenceTest.java @@ -26,7 +26,6 @@ import junit.framework.TestSuite; public class SequenceTest extends TestCase { - public static final String versionId = "$Id: SequenceTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static String sequenceName = "acs_object_id_seq"; diff --git a/ccm-core/test/src/com/arsdigita/dbinvariants/DBInvariantTestSuite.java b/ccm-core/test/src/com/arsdigita/dbinvariants/DBInvariantTestSuite.java index af06e5294..e7431c20a 100755 --- a/ccm-core/test/src/com/arsdigita/dbinvariants/DBInvariantTestSuite.java +++ b/ccm-core/test/src/com/arsdigita/dbinvariants/DBInvariantTestSuite.java @@ -31,7 +31,7 @@ import junit.framework.TestSuite; * @version $Revision: #8 $ $Date: 2004/08/16 $ */ public class DBInvariantTestSuite extends PackageTestSuite { - public final static String versionId = "$Id: DBInvariantTestSuite.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { DBInvariantTestSuite suite = new DBInvariantTestSuite(); diff --git a/ccm-core/test/src/com/arsdigita/developersupport/DSTest.java b/ccm-core/test/src/com/arsdigita/developersupport/DSTest.java index f61d6d355..9b6406592 100755 --- a/ccm-core/test/src/com/arsdigita/developersupport/DSTest.java +++ b/ccm-core/test/src/com/arsdigita/developersupport/DSTest.java @@ -30,7 +30,6 @@ import junit.framework.TestSuite; * @version 1.0 **/ public class DSTest extends TestCase { - public static final String versionId = "$Id: DSTest.java 1415 2006-12-07 14:28:27Z chrisgilbert23 $ by $Author: chrisgilbert23 $, $DateTime: 2004/08/16 18:10:38 $"; public DSTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/developersupport/DSTestSuite.java b/ccm-core/test/src/com/arsdigita/developersupport/DSTestSuite.java index 0fe5feb46..ca58d163f 100755 --- a/ccm-core/test/src/com/arsdigita/developersupport/DSTestSuite.java +++ b/ccm-core/test/src/com/arsdigita/developersupport/DSTestSuite.java @@ -28,7 +28,6 @@ import junit.framework.Test; * @version $Revision: #9 $ $Date: 2004/08/16 $ */ public class DSTestSuite extends PackageTestSuite { - public final static String versionId = "$Id: DSTestSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static Test suite() { DSTestSuite suite = new DSTestSuite(); diff --git a/ccm-core/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java b/ccm-core/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java index 99b1b8867..2f7c7d9c1 100755 --- a/ccm-core/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java +++ b/ccm-core/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java @@ -34,7 +34,6 @@ import org.apache.log4j.Logger; public class BaseDispatcherServletCactusTest extends ServletTestCase { - public static final String versionId = "$Id: BaseDispatcherServletCactusTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; BaseDispatcherServlet s; RequestContext rctx; diff --git a/ccm-core/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java b/ccm-core/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java index 78a90d5c1..f5b1d4777 100755 --- a/ccm-core/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java +++ b/ccm-core/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java @@ -25,7 +25,6 @@ import org.apache.cactus.ServletTestCase; public class DispatcherHelperCactusTest extends ServletTestCase { - public static final String versionId = "$Id: DispatcherHelperCactusTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public DispatcherHelperCactusTest(String theName) { super(theName); diff --git a/ccm-core/test/src/com/arsdigita/dispatcher/DispatcherSuite.java b/ccm-core/test/src/com/arsdigita/dispatcher/DispatcherSuite.java index bd3525369..4ad77b439 100755 --- a/ccm-core/test/src/com/arsdigita/dispatcher/DispatcherSuite.java +++ b/ccm-core/test/src/com/arsdigita/dispatcher/DispatcherSuite.java @@ -32,7 +32,7 @@ import junit.framework.Test; public class DispatcherSuite extends PackageTestSuite { - public final static String versionId = "$Id: DispatcherSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { DispatcherSuite suite = new DispatcherSuite(); diff --git a/ccm-core/test/src/com/arsdigita/dispatcher/TestUtils.java b/ccm-core/test/src/com/arsdigita/dispatcher/TestUtils.java index 094491bd9..b92c69487 100755 --- a/ccm-core/test/src/com/arsdigita/dispatcher/TestUtils.java +++ b/ccm-core/test/src/com/arsdigita/dispatcher/TestUtils.java @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; * @version $Revision: #8 $ $Date: 2004/08/16 $ */ public class TestUtils { - public final static String versionId = "$Id: TestUtils.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static void setRequest(HttpServletRequest request) { DispatcherHelper.setRequest(request); diff --git a/ccm-core/test/src/com/arsdigita/domain/DependencyTest.java b/ccm-core/test/src/com/arsdigita/domain/DependencyTest.java index e6d62193b..6e95fd03b 100755 --- a/ccm-core/test/src/com/arsdigita/domain/DependencyTest.java +++ b/ccm-core/test/src/com/arsdigita/domain/DependencyTest.java @@ -32,7 +32,6 @@ import org.apache.log4j.Logger; */ public class DependencyTest extends DomainTestCase { - public static final String versionId = "$Id: DependencyTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger log = Logger.getLogger(DependencyTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java b/ccm-core/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java index 6100e97c2..cfc90fd34 100755 --- a/ccm-core/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java +++ b/ccm-core/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java @@ -22,7 +22,6 @@ import com.arsdigita.persistence.DataObject; public class DomainObjectFactoryTest extends DomainTestCase { - public static final String versionId = "$Id: DomainObjectFactoryTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public DomainObjectFactoryTest(String name) { super(name); } diff --git a/ccm-core/test/src/com/arsdigita/domain/DomainTestCase.java b/ccm-core/test/src/com/arsdigita/domain/DomainTestCase.java index 37834c088..54a2ee18b 100755 --- a/ccm-core/test/src/com/arsdigita/domain/DomainTestCase.java +++ b/ccm-core/test/src/com/arsdigita/domain/DomainTestCase.java @@ -39,7 +39,7 @@ import junit.framework.TestCase; public class DomainTestCase extends TestCase { - public final static String versionId = "$Id: DomainTestCase.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + // Prevent loading the same PDL file twice private static Set m_loadedPDLResources = new HashSet(); diff --git a/ccm-core/test/src/com/arsdigita/domain/DomainTestSuite.java b/ccm-core/test/src/com/arsdigita/domain/DomainTestSuite.java index c9458407b..3d5a586c5 100755 --- a/ccm-core/test/src/com/arsdigita/domain/DomainTestSuite.java +++ b/ccm-core/test/src/com/arsdigita/domain/DomainTestSuite.java @@ -30,7 +30,7 @@ import junit.framework.Test; * @version $Revision: #11 $ $Date: 2004/08/16 $ */ public class DomainTestSuite extends PackageTestSuite { - public final static String versionId = "$Id: DomainTestSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DomainTestSuite() { super(); diff --git a/ccm-core/test/src/com/arsdigita/domain/JavaClass.java b/ccm-core/test/src/com/arsdigita/domain/JavaClass.java index 2aa171b18..583dfafd4 100755 --- a/ccm-core/test/src/com/arsdigita/domain/JavaClass.java +++ b/ccm-core/test/src/com/arsdigita/domain/JavaClass.java @@ -32,7 +32,6 @@ import org.apache.log4j.Logger; */ public class JavaClass extends DomainObject { - public static final String versionId = "$Id: JavaClass.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger log = Logger.getLogger(JavaClass.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/domain/JavaPackage.java b/ccm-core/test/src/com/arsdigita/domain/JavaPackage.java index 7388e6905..36c1914bf 100755 --- a/ccm-core/test/src/com/arsdigita/domain/JavaPackage.java +++ b/ccm-core/test/src/com/arsdigita/domain/JavaPackage.java @@ -34,7 +34,6 @@ import org.apache.log4j.Logger; * @version $Revision: #9 $ $Date: 2004/08/16 $ */ public class JavaPackage extends DomainObject { - public static final String versionId = "$Id: JavaPackage.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger log = Logger.getLogger(JavaPackage.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/domain/JavaPackageInstantiator.java b/ccm-core/test/src/com/arsdigita/domain/JavaPackageInstantiator.java index 27e35e26c..2d2ebbba2 100755 --- a/ccm-core/test/src/com/arsdigita/domain/JavaPackageInstantiator.java +++ b/ccm-core/test/src/com/arsdigita/domain/JavaPackageInstantiator.java @@ -23,7 +23,6 @@ import com.arsdigita.persistence.DataObject; public class JavaPackageInstantiator extends DomainObjectInstantiator { - public static final String versionId = "$Id: JavaPackageInstantiator.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Construct a JavaPackage given a data object. Called from * DomainObjectFactory.newInstance() as the last step of diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java index f45b55396..0136e9f47 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java @@ -26,13 +26,12 @@ import org.apache.log4j.Logger; * Test case for the ComponentPropertiesForm class. * * @author Peter Marklund - * @version $Id: ComponentPropertiesFormTest.java 750 2005-09-02 12:38:44Z sskracic $ + * @version $Id: ComponentPropertiesFormTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class ComponentPropertiesFormTest extends com.arsdigita.tools.junit.framework.BaseTestCase { - public static final String versionId = "$Id: ComponentPropertiesFormTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/FormbuilderSuite.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/FormbuilderSuite.java index 306440721..5aab96008 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/FormbuilderSuite.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/FormbuilderSuite.java @@ -31,12 +31,11 @@ import junit.framework.Test; * it in enterprise.init) is run. * * @author Peter Marklund - * @version $Id: FormbuilderSuite.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: FormbuilderSuite.java 1940 2009-05-29 07:15:05Z terry $ * */ public class FormbuilderSuite extends PackageTestSuite { - public static final String versionId = "$Id: FormbuilderSuite.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public FormbuilderSuite(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java index f288994b5..6f1e7de7f 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java @@ -31,12 +31,11 @@ import org.apache.log4j.Logger; * the PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentCheckboxGroupTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentCheckboxGroupTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class PersistentCheckboxGroupTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentCheckboxGroupTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java index c8fb07187..3d6a7a245 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java @@ -40,12 +40,11 @@ import org.apache.log4j.Logger; * Then the factory is saved and resurrected and the XML comparison is repeated. * * @author Peter Marklund - * @version $Id: PersistentComponentTestCase.java 750 2005-09-02 12:38:44Z sskracic $ + * @version $Id: PersistentComponentTestCase.java 1940 2009-05-29 07:15:05Z terry $ * */ public abstract class PersistentComponentTestCase extends BaseTestCase { - public static final String versionId = "$Id: PersistentComponentTestCase.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private final static Logger s_log = Logger.getLogger(PersistentComponentTestCase.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java index 4d16c4505..3962695ca 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java @@ -31,11 +31,10 @@ import org.apache.log4j.Logger; * PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentDateTest.java 750 2005-09-02 12:38:44Z sskracic $ + * @version $Id: PersistentDateTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class PersistentDateTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentDateTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java index 6713e48ea..5512f319d 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java @@ -36,12 +36,11 @@ import org.apache.log4j.Logger; * the PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentFormSectionTest.java 750 2005-09-02 12:38:44Z sskracic $ + * @version $Id: PersistentFormSectionTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class PersistentFormSectionTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentFormSectionTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java index fdd8d037e..10048d374 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java @@ -29,12 +29,11 @@ import org.apache.log4j.Logger; * the PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentFormTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentFormTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class PersistentFormTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentFormTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java index 7435cc94b..031c265fd 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java @@ -28,12 +28,11 @@ import com.arsdigita.formbuilder.PersistentLabel; * PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentLabelTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentLabelTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class PersistentLabelTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentLabelTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Properties of the Label private String m_label = "test label string"; diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java index c9e791f39..237f62134 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java @@ -32,12 +32,11 @@ import org.apache.log4j.Logger; * the PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentMultipleSelectTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentMultipleSelectTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class PersistentMultipleSelectTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentMultipleSelectTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java index 2bab7fdf4..88997d05a 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java @@ -28,12 +28,11 @@ import com.arsdigita.formbuilder.PersistentOption; * PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentOptionTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentOptionTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class PersistentOptionTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentOptionTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Properties of the Option private String m_parameterValue = "test_option_name"; diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java index ca2b5d665..2c0e14be7 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java @@ -31,12 +31,11 @@ import org.apache.log4j.Logger; * the PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentRadioGroupTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentRadioGroupTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class PersistentRadioGroupTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentRadioGroupTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java index 65b686514..a084a7d06 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java @@ -31,12 +31,11 @@ import org.apache.log4j.Logger; * the PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentSingleSelectTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentSingleSelectTest.java 1940 2009-05-29 07:15:05Z terry $ * */ public class PersistentSingleSelectTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentSingleSelectTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java index 83724a099..0e9cdedc7 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java @@ -28,11 +28,10 @@ import com.arsdigita.formbuilder.PersistentSubmit; * PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentSubmitTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentSubmitTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class PersistentSubmitTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentSubmitTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Properties of the submit private String m_htmlName = "submit_test_name"; diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java index 95ffb710c..06c071e6f 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java @@ -29,11 +29,10 @@ import org.apache.log4j.Logger; * PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentTextAreaTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentTextAreaTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class PersistentTextAreaTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentTextAreaTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java index e490ff2b7..843ad62e3 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java @@ -29,11 +29,10 @@ import org.apache.log4j.Logger; * PersistentComponentTestCase. * * @author Peter Marklund - * @version $Id: PersistentTextFieldTest.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: PersistentTextFieldTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class PersistentTextFieldTest extends PersistentComponentTestCase { - public static final String versionId = "$Id: PersistentTextFieldTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Logging private final static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/formbuilder/test/XMLComparator.java b/ccm-core/test/src/com/arsdigita/formbuilder/test/XMLComparator.java index f55fa8240..29b512373 100755 --- a/ccm-core/test/src/com/arsdigita/formbuilder/test/XMLComparator.java +++ b/ccm-core/test/src/com/arsdigita/formbuilder/test/XMLComparator.java @@ -38,12 +38,11 @@ import org.apache.oro.text.perl.Perl5Util; * to determine if two components generate identical XML. * * @author Peter Marklund - * @version $Id: XMLComparator.java 741 2005-09-02 10:21:19Z sskracic $ + * @version $Id: XMLComparator.java 1940 2009-05-29 07:15:05Z terry $ * */ public class XMLComparator { - public static final String versionId = "$Id: XMLComparator.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private final static Logger s_log = Logger.getLogger(XMLComparator.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/globalization/Charset2Test.java b/ccm-core/test/src/com/arsdigita/globalization/Charset2Test.java index a3ad97783..58b4c2503 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/Charset2Test.java +++ b/ccm-core/test/src/com/arsdigita/globalization/Charset2Test.java @@ -29,7 +29,7 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; * @version $Revision: #9 $ $Date: 2004/08/16 $ */ public class Charset2Test extends BaseTestCase { - public final static String versionId = "$Id: Charset2Test.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public Charset2Test(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/globalization/CharsetTest.java b/ccm-core/test/src/com/arsdigita/globalization/CharsetTest.java index a45730d04..bfad69cba 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/CharsetTest.java +++ b/ccm-core/test/src/com/arsdigita/globalization/CharsetTest.java @@ -30,7 +30,7 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; * @version $Revision: #8 $ $Date: 2004/08/16 $ */ public class CharsetTest extends BaseTestCase { - public final static String versionId = "$Id: CharsetTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + /** * Construct a CharsetTest with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/globalization/GlobalizationSuite.java b/ccm-core/test/src/com/arsdigita/globalization/GlobalizationSuite.java index 3d61a0f79..cc72e66d3 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/GlobalizationSuite.java +++ b/ccm-core/test/src/com/arsdigita/globalization/GlobalizationSuite.java @@ -27,7 +27,7 @@ import junit.framework.Test; * @version $Revision: #9 $ $Date: 2004/08/16 $ */ public class GlobalizationSuite extends PackageTestSuite { - public final static String versionId = "$Id: GlobalizationSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { GlobalizationSuite suite = new GlobalizationSuite(); diff --git a/ccm-core/test/src/com/arsdigita/globalization/GlobalizedMessageTest.java b/ccm-core/test/src/com/arsdigita/globalization/GlobalizedMessageTest.java index 08541bff5..a8d60ec0e 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/GlobalizedMessageTest.java +++ b/ccm-core/test/src/com/arsdigita/globalization/GlobalizedMessageTest.java @@ -29,7 +29,7 @@ import java.util.Locale; * @version $Revision: #8 $ $Date: 2004/08/16 $ */ public class GlobalizedMessageTest extends BaseTestCase { - public final static String versionId = "$Id: GlobalizedMessageTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private final static String bundleName = "com.arsdigita.globalization.GMBundle"; private final static Locale l_en = new Locale("en", "", ""); diff --git a/ccm-core/test/src/com/arsdigita/globalization/Locale2Test.java b/ccm-core/test/src/com/arsdigita/globalization/Locale2Test.java index 74459bb55..4bc67016e 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/Locale2Test.java +++ b/ccm-core/test/src/com/arsdigita/globalization/Locale2Test.java @@ -30,7 +30,7 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; * @version $Revision: #10 $ $Date: 2004/08/16 $ */ public class Locale2Test extends BaseTestCase { - public final static String versionId = "$Id: Locale2Test.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public Locale2Test(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/globalization/LocaleNegotiatorTest.java b/ccm-core/test/src/com/arsdigita/globalization/LocaleNegotiatorTest.java index 3db0c669b..57ba1c47f 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/LocaleNegotiatorTest.java +++ b/ccm-core/test/src/com/arsdigita/globalization/LocaleNegotiatorTest.java @@ -26,7 +26,6 @@ import java.util.ResourceBundle; public class LocaleNegotiatorTest extends BaseTestCase { - public static final String versionId = "$Id: LocaleNegotiatorTest.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public LocaleNegotiatorTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/globalization/LocaleTest.java b/ccm-core/test/src/com/arsdigita/globalization/LocaleTest.java index 1da5efb24..8f68dda19 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/LocaleTest.java +++ b/ccm-core/test/src/com/arsdigita/globalization/LocaleTest.java @@ -34,7 +34,7 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; * @version $Revision: #8 $ $Date: 2004/08/16 $ */ public class LocaleTest extends BaseTestCase { - public final static String versionId = "$Id: LocaleTest.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private Session m_ssn; diff --git a/ccm-core/test/src/com/arsdigita/globalization/MRBundle1.java b/ccm-core/test/src/com/arsdigita/globalization/MRBundle1.java index f603684b6..1d6df4895 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/MRBundle1.java +++ b/ccm-core/test/src/com/arsdigita/globalization/MRBundle1.java @@ -20,7 +20,6 @@ package com.arsdigita.globalization; public class MRBundle1 extends com.arsdigita.globalization.MixedResourceBundle { - public static final String versionId = "$Id: MRBundle1.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // protected Object[][] getContents() { // return new Object[][] {}; // } diff --git a/ccm-core/test/src/com/arsdigita/globalization/MessageCatalog2Test.java b/ccm-core/test/src/com/arsdigita/globalization/MessageCatalog2Test.java index fefe87e48..ff66fa2b2 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/MessageCatalog2Test.java +++ b/ccm-core/test/src/com/arsdigita/globalization/MessageCatalog2Test.java @@ -29,7 +29,7 @@ import java.util.TreeMap; * @version $Revision: #9 $ $Date: 2004/08/16 $ */ public class MessageCatalog2Test extends BaseTestCase { - public final static String versionId = "$Id: MessageCatalog2Test.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public MessageCatalog2Test(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/globalization/MessageCatalogTest.java b/ccm-core/test/src/com/arsdigita/globalization/MessageCatalogTest.java index c484e9856..4358e2c7a 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/MessageCatalogTest.java +++ b/ccm-core/test/src/com/arsdigita/globalization/MessageCatalogTest.java @@ -30,7 +30,7 @@ import java.util.Map; * @version $Revision: #8 $ $Date: 2004/08/16 $ */ public class MessageCatalogTest extends BaseTestCase { - public final static String versionId = "$Id: MessageCatalogTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + /** * Construct a MessageCatalogTest with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/globalization/MixedResourceBundleTest.java b/ccm-core/test/src/com/arsdigita/globalization/MixedResourceBundleTest.java index 02abafc54..b70348fd8 100755 --- a/ccm-core/test/src/com/arsdigita/globalization/MixedResourceBundleTest.java +++ b/ccm-core/test/src/com/arsdigita/globalization/MixedResourceBundleTest.java @@ -26,7 +26,6 @@ import java.util.ResourceBundle; public class MixedResourceBundleTest extends BaseTestCase { - public static final String versionId = "$Id: MixedResourceBundleTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public MixedResourceBundleTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/initializer/FooInitializer.java b/ccm-core/test/src/com/arsdigita/initializer/FooInitializer.java index f5ebc8a1c..7f1ee615e 100755 --- a/ccm-core/test/src/com/arsdigita/initializer/FooInitializer.java +++ b/ccm-core/test/src/com/arsdigita/initializer/FooInitializer.java @@ -30,7 +30,7 @@ import java.util.List; public class FooInitializer implements Initializer { - public final static String versionId = "$Id: FooInitializer.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static boolean isStarted = false; diff --git a/ccm-core/test/src/com/arsdigita/initializer/InitializerSuite.java b/ccm-core/test/src/com/arsdigita/initializer/InitializerSuite.java index 811e71a9b..da94866e3 100755 --- a/ccm-core/test/src/com/arsdigita/initializer/InitializerSuite.java +++ b/ccm-core/test/src/com/arsdigita/initializer/InitializerSuite.java @@ -28,7 +28,7 @@ import junit.framework.Test; * @version $Revision: #9 $ $Date: 2004/08/16 $ */ public class InitializerSuite extends PackageTestSuite { - public final static String versionId = "$Id: InitializerSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { InitializerSuite suite = new InitializerSuite(); diff --git a/ccm-core/test/src/com/arsdigita/initializer/ScriptTest.java b/ccm-core/test/src/com/arsdigita/initializer/ScriptTest.java index e7930a52f..701b8fa23 100755 --- a/ccm-core/test/src/com/arsdigita/initializer/ScriptTest.java +++ b/ccm-core/test/src/com/arsdigita/initializer/ScriptTest.java @@ -31,7 +31,7 @@ import junit.framework.TestCase; public class ScriptTest extends TestCase { - public final static String versionId = "$Id: ScriptTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public ScriptTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/kernel/Bug164566Test.java b/ccm-core/test/src/com/arsdigita/kernel/Bug164566Test.java index 4263e647c..e9fd3d3fc 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/Bug164566Test.java +++ b/ccm-core/test/src/com/arsdigita/kernel/Bug164566Test.java @@ -33,7 +33,6 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; public class Bug164566Test extends BaseTestCase { - public static final String versionId = "$Id: Bug164566Test.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public Bug164566Test(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/kernel/EmailAddressTest.java b/ccm-core/test/src/com/arsdigita/kernel/EmailAddressTest.java index 6864b26dc..c7ae75a67 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/EmailAddressTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/EmailAddressTest.java @@ -40,7 +40,6 @@ import org.apache.log4j.Logger; public class EmailAddressTest extends BaseTestCase { - public static final String versionId = "$Id: EmailAddressTest.java 743 2005-09-02 10:37:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final String m_baseDataObjectType = "com.arsdigita.kernel.EmailAddress"; diff --git a/ccm-core/test/src/com/arsdigita/kernel/ExampleForum.java b/ccm-core/test/src/com/arsdigita/kernel/ExampleForum.java index 0a82048a4..630becbf3 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/ExampleForum.java +++ b/ccm-core/test/src/com/arsdigita/kernel/ExampleForum.java @@ -33,7 +33,6 @@ import com.arsdigita.persistence.metadata.ObjectType; **/ public class ExampleForum extends ACSObject { - public static final String versionId = "$Id: ExampleForum.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "examples.Forum"; diff --git a/ccm-core/test/src/com/arsdigita/kernel/ExampleMessage.java b/ccm-core/test/src/com/arsdigita/kernel/ExampleMessage.java index f79068839..caf3ef1f8 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/ExampleMessage.java +++ b/ccm-core/test/src/com/arsdigita/kernel/ExampleMessage.java @@ -32,7 +32,6 @@ import com.arsdigita.persistence.metadata.ObjectType; **/ public class ExampleMessage extends ACSObject { - public static final String versionId = "$Id: ExampleMessage.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "examples.Message"; diff --git a/ccm-core/test/src/com/arsdigita/kernel/ExampleMessageCollection.java b/ccm-core/test/src/com/arsdigita/kernel/ExampleMessageCollection.java index 0e47dcd0e..9f4a39e9a 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/ExampleMessageCollection.java +++ b/ccm-core/test/src/com/arsdigita/kernel/ExampleMessageCollection.java @@ -28,7 +28,6 @@ import com.arsdigita.persistence.DataCollection; **/ public class ExampleMessageCollection extends ACSObjectCollection { - public static final String versionId = "$Id: ExampleMessageCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Constructor. diff --git a/ccm-core/test/src/com/arsdigita/kernel/GroupMembershipTest.java b/ccm-core/test/src/com/arsdigita/kernel/GroupMembershipTest.java index 1c4015b89..950d6557e 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/GroupMembershipTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/GroupMembershipTest.java @@ -32,7 +32,6 @@ import com.arsdigita.domain.DomainObject; public class GroupMembershipTest extends com.arsdigita.tools.junit.framework.BaseTestCase { - public static final String versionId = "$Id: GroupMembershipTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Group theGroup; private User user1; diff --git a/ccm-core/test/src/com/arsdigita/kernel/GroupTest.java b/ccm-core/test/src/com/arsdigita/kernel/GroupTest.java index d1661d1bb..c5bed8488 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/GroupTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/GroupTest.java @@ -44,7 +44,6 @@ import org.apache.log4j.Logger; public class GroupTest extends BaseTestCase { - public static final String versionId = "$Id: GroupTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final String m_baseDataObjectType = "com.arsdigita.kernel.Group"; diff --git a/ccm-core/test/src/com/arsdigita/kernel/GroupsBasicTest.java b/ccm-core/test/src/com/arsdigita/kernel/GroupsBasicTest.java index c2ba7b32c..b2c8718b1 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/GroupsBasicTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/GroupsBasicTest.java @@ -42,7 +42,6 @@ import java.util.List; public class GroupsBasicTest extends BaseTestCase { - public static final String versionId = "$Id: GroupsBasicTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Constructs a GroupsBasicTest with the specified name. diff --git a/ccm-core/test/src/com/arsdigita/kernel/KernelSuite.java b/ccm-core/test/src/com/arsdigita/kernel/KernelSuite.java index b5fa041cb..2d9970dca 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/KernelSuite.java +++ b/ccm-core/test/src/com/arsdigita/kernel/KernelSuite.java @@ -32,7 +32,7 @@ import junit.framework.Test; public class KernelSuite extends PackageTestSuite { - public final static String versionId = "$Id: KernelSuite.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public void addTest(Test test) { PermissionDecorator perm = new PermissionDecorator(test); diff --git a/ccm-core/test/src/com/arsdigita/kernel/PackageTypeTest.java b/ccm-core/test/src/com/arsdigita/kernel/PackageTypeTest.java index 4cd2915d0..31ada8cb1 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/PackageTypeTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/PackageTypeTest.java @@ -30,7 +30,6 @@ import org.apache.log4j.Logger; */ public class PackageTypeTest extends BaseTestCase { - public static final String versionId = "$Id: PackageTypeTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private PackageType m_ptype; private PackageType m_ptype2; diff --git a/ccm-core/test/src/com/arsdigita/kernel/PartiesBasicTest.java b/ccm-core/test/src/com/arsdigita/kernel/PartiesBasicTest.java index 6a99a43d2..3c6e7d599 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/PartiesBasicTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/PartiesBasicTest.java @@ -41,7 +41,6 @@ import junit.framework.TestSuite; public class PartiesBasicTest extends BaseTestCase { - public static final String versionId = "$Id: PartiesBasicTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Session m_ssn; diff --git a/ccm-core/test/src/com/arsdigita/kernel/RolePermissionTest.java b/ccm-core/test/src/com/arsdigita/kernel/RolePermissionTest.java index d5f0726db..fed21233b 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/RolePermissionTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/RolePermissionTest.java @@ -39,7 +39,6 @@ import junit.framework.TestSuite; public class RolePermissionTest extends BaseTestCase { - public static final String versionId = "$Id: RolePermissionTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Group m_group; private ArrayList m_roles; diff --git a/ccm-core/test/src/com/arsdigita/kernel/RoleTest.java b/ccm-core/test/src/com/arsdigita/kernel/RoleTest.java index a4e223eec..416e87dcc 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/RoleTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/RoleTest.java @@ -37,7 +37,6 @@ import junit.framework.TestSuite; public class RoleTest extends BaseTestCase { - public static final String versionId = "$Id: RoleTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Group m_group; diff --git a/ccm-core/test/src/com/arsdigita/kernel/SampleListener.java b/ccm-core/test/src/com/arsdigita/kernel/SampleListener.java index 69c35c3d1..7cd11cd0f 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/SampleListener.java +++ b/ccm-core/test/src/com/arsdigita/kernel/SampleListener.java @@ -28,8 +28,7 @@ import org.apache.log4j.Logger; public class SampleListener implements PackageEventListener { - public static final String versionId = "$Id: SampleListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public final static String versionID = "$Id: SampleListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public final static String versionID = "$Id: SampleListener.java 1940 2009-05-29 07:15:05Z terry $ by $Author: terry $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger s_cat = Logger.getLogger(SampleListener.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/kernel/SampleListener2.java b/ccm-core/test/src/com/arsdigita/kernel/SampleListener2.java index 6aa42b236..c023eebef 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/SampleListener2.java +++ b/ccm-core/test/src/com/arsdigita/kernel/SampleListener2.java @@ -28,8 +28,7 @@ import org.apache.log4j.Logger; public class SampleListener2 implements PackageEventListener { - public static final String versionId = "$Id: SampleListener2.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public final static String versionID = "$Id: SampleListener2.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public final static String versionID = "$Id: SampleListener2.java 1940 2009-05-29 07:15:05Z terry $ by $Author: terry $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger s_cat = Logger.getLogger(SampleListener.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/kernel/SiteNodeTest.java b/ccm-core/test/src/com/arsdigita/kernel/SiteNodeTest.java index fbe8d1455..380dbdf4e 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/SiteNodeTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/SiteNodeTest.java @@ -35,7 +35,6 @@ import org.apache.log4j.Logger; */ public class SiteNodeTest extends BaseTestCase { - public static final String versionId = "$Id: SiteNodeTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private SiteNode m_siteNode; private Session m_ssn; private static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/kernel/URLServiceTest.java b/ccm-core/test/src/com/arsdigita/kernel/URLServiceTest.java index 8a034a270..591d98ed2 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/URLServiceTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/URLServiceTest.java @@ -39,9 +39,8 @@ import org.apache.log4j.Logger; public class URLServiceTest extends BaseTestCase { - public static final String versionId = "$Id: URLServiceTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public final static String id = "$Id: URLServiceTest.java 744 2005-09-02 10:43:19Z sskracic $"; + public final static String id = "$Id: URLServiceTest.java 1940 2009-05-29 07:15:05Z terry $"; private static Logger s_log = Logger.getLogger( URLServiceTest.class.getName() ); diff --git a/ccm-core/test/src/com/arsdigita/kernel/UserAuthenticationTest.java b/ccm-core/test/src/com/arsdigita/kernel/UserAuthenticationTest.java index 95ca071e8..3dae6ccac 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/UserAuthenticationTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/UserAuthenticationTest.java @@ -37,7 +37,7 @@ import junit.framework.TestSuite; */ public class UserAuthenticationTest extends BaseTestCase { - public final static String versionId = "$Id: UserAuthenticationTest.java 744 2005-09-02 10:43:19Z sskracic $"; + private Session m_ssn; diff --git a/ccm-core/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java b/ccm-core/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java index 45733fe35..a4a2cd911 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java +++ b/ccm-core/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java @@ -34,7 +34,6 @@ import junit.framework.TestSuite; */ public class UserAuthenticationTestNew extends BaseTestCase { - public static final String versionId = "$Id: UserAuthenticationTestNew.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.kernel.UserAuthentication"; diff --git a/ccm-core/test/src/com/arsdigita/kernel/UserMassTest.java b/ccm-core/test/src/com/arsdigita/kernel/UserMassTest.java index 83a29546b..46a453b19 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/UserMassTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/UserMassTest.java @@ -36,7 +36,6 @@ public class UserMassTest extends BaseTestCase { public static final boolean FAILS = true; - public static final String versionId = "$Id: UserMassTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final int NUMBER_TO_TEST = 25000; private static final int NUMBER_TO_REPORT = 500; diff --git a/ccm-core/test/src/com/arsdigita/kernel/UserTest.java b/ccm-core/test/src/com/arsdigita/kernel/UserTest.java index f7a483408..60e013f9a 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/UserTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/UserTest.java @@ -53,7 +53,6 @@ import org.apache.log4j.Logger; public class UserTest extends BaseTestCase { - public static final String versionId = "$Id: UserTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Session m_ssn; diff --git a/ccm-core/test/src/com/arsdigita/kernel/permissions/OrderingTest.java b/ccm-core/test/src/com/arsdigita/kernel/permissions/OrderingTest.java index c3ee22345..9629df298 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/permissions/OrderingTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/permissions/OrderingTest.java @@ -48,7 +48,7 @@ import org.apache.log4j.Logger; **/ public class OrderingTest extends BaseTestCase { - public final static String versionId = "$Id: OrderingTest.java 744 2005-09-02 10:43:19Z sskracic $"; + private static Logger s_cat = Logger.getLogger(OrderingTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/kernel/permissions/PermissionTest.java b/ccm-core/test/src/com/arsdigita/kernel/permissions/PermissionTest.java index ad9ba6b11..bcc116ae3 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/permissions/PermissionTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/permissions/PermissionTest.java @@ -48,8 +48,7 @@ import junit.framework.TestSuite; **/ public class PermissionTest extends BaseTestCase { - public final static String versionId = - "$Id: PermissionTest.java 744 2005-09-02 10:43:19Z sskracic $"; + private Session m_ssn; diff --git a/ccm-core/test/src/com/arsdigita/kernel/permissions/PermissionsSuite.java b/ccm-core/test/src/com/arsdigita/kernel/permissions/PermissionsSuite.java index 432eb244a..5af817aa2 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/permissions/PermissionsSuite.java +++ b/ccm-core/test/src/com/arsdigita/kernel/permissions/PermissionsSuite.java @@ -32,7 +32,7 @@ import junit.framework.Test; public class PermissionsSuite extends PackageTestSuite { - public final static String versionId = "$Id: PermissionsSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { PermissionsSuite suite = new PermissionsSuite(); diff --git a/ccm-core/test/src/com/arsdigita/kernel/security/CryptoTest.java b/ccm-core/test/src/com/arsdigita/kernel/security/CryptoTest.java index 9613b392c..1681c981e 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/security/CryptoTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/security/CryptoTest.java @@ -27,7 +27,6 @@ import junit.framework.TestSuite; public class CryptoTest extends TestCase { - public static final String versionId = "$Id: CryptoTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public CryptoTest(String name) { super(name); } diff --git a/ccm-core/test/src/com/arsdigita/kernel/security/LoginConfigTest.java b/ccm-core/test/src/com/arsdigita/kernel/security/LoginConfigTest.java index 92f2aa61b..e8fe91e98 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/security/LoginConfigTest.java +++ b/ccm-core/test/src/com/arsdigita/kernel/security/LoginConfigTest.java @@ -28,7 +28,6 @@ import junit.framework.TestSuite; public class LoginConfigTest extends TestCase { - public static final String versionId = "$Id: LoginConfigTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public LoginConfigTest(String name) { super(name); } diff --git a/ccm-core/test/src/com/arsdigita/kernel/security/SecuritySuite.java b/ccm-core/test/src/com/arsdigita/kernel/security/SecuritySuite.java index 97c32b266..a4bf0cf0f 100755 --- a/ccm-core/test/src/com/arsdigita/kernel/security/SecuritySuite.java +++ b/ccm-core/test/src/com/arsdigita/kernel/security/SecuritySuite.java @@ -32,7 +32,7 @@ import junit.framework.Test; public class SecuritySuite extends PackageTestSuite { - public final static String versionId = "$Id: SecuritySuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { SecuritySuite suite = new SecuritySuite(); diff --git a/ccm-core/test/src/com/arsdigita/mail/MailCharTest.java b/ccm-core/test/src/com/arsdigita/mail/MailCharTest.java index 2dccd3261..d265d5330 100755 --- a/ccm-core/test/src/com/arsdigita/mail/MailCharTest.java +++ b/ccm-core/test/src/com/arsdigita/mail/MailCharTest.java @@ -31,12 +31,11 @@ import junit.framework.TestCase; * @author Stefan Deusch * @author Ron Henderson * - * @version $Id: MailCharTest.java 748 2005-09-02 11:57:31Z sskracic $ + * @version $Id: MailCharTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class MailCharTest extends TestCase { - public static final String versionId = "$Id: MailCharTest.java 748 2005-09-02 11:57:31Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // data for test cases final static String to = "to@somedomain.net"; diff --git a/ccm-core/test/src/com/arsdigita/mail/MailFailTest.java b/ccm-core/test/src/com/arsdigita/mail/MailFailTest.java index 94bd2c5dd..fd725b4f1 100755 --- a/ccm-core/test/src/com/arsdigita/mail/MailFailTest.java +++ b/ccm-core/test/src/com/arsdigita/mail/MailFailTest.java @@ -30,12 +30,11 @@ import org.apache.log4j.Logger; * of javax.mail deals with runtime exceptions from the server side. * * @author Stefan Deusch - * @version $Id: MailFailTest.java 749 2005-09-02 12:11:57Z sskracic $ + * @version $Id: MailFailTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class MailFailTest extends TestCase { - public static final String versionId = "$Id: MailFailTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static int msgNumber = 0; private static Logger s_log = Logger.getLogger(MailFailTest.class); diff --git a/ccm-core/test/src/com/arsdigita/mail/MailQueueTest.java b/ccm-core/test/src/com/arsdigita/mail/MailQueueTest.java index 8d02fa51c..3cebec393 100755 --- a/ccm-core/test/src/com/arsdigita/mail/MailQueueTest.java +++ b/ccm-core/test/src/com/arsdigita/mail/MailQueueTest.java @@ -26,12 +26,11 @@ import junit.framework.TestCase; * tests are only provided for creating and storing messages in the * queue, but not actually sending them. * - * @version $Id: MailQueueTest.java 749 2005-09-02 12:11:57Z sskracic $ + * @version $Id: MailQueueTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class MailQueueTest extends TestCase { - public static final String versionId = "$Id: MailQueueTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Data for the test cases diff --git a/ccm-core/test/src/com/arsdigita/mail/MailSuite.java b/ccm-core/test/src/com/arsdigita/mail/MailSuite.java index 8765b3cbb..e83aa54d1 100755 --- a/ccm-core/test/src/com/arsdigita/mail/MailSuite.java +++ b/ccm-core/test/src/com/arsdigita/mail/MailSuite.java @@ -28,12 +28,11 @@ import junit.framework.Test; * * Test suite for the ACS Mail package. * - * @version $Id: MailSuite.java 749 2005-09-02 12:11:57Z sskracic $ + * @version $Id: MailSuite.java 1940 2009-05-29 07:15:05Z terry $ */ public class MailSuite extends PackageTestSuite { - public static final String versionId = "$Id: MailSuite.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public MailSuite() { super(); } diff --git a/ccm-core/test/src/com/arsdigita/mail/MailTest.java b/ccm-core/test/src/com/arsdigita/mail/MailTest.java index c89e9654a..91dc2b796 100755 --- a/ccm-core/test/src/com/arsdigita/mail/MailTest.java +++ b/ccm-core/test/src/com/arsdigita/mail/MailTest.java @@ -37,12 +37,11 @@ import junit.framework.TestCase; * work -- they do. It's because I haven't figured out yet how to * access relatives files correctly from within a unit test. * - * @version $Id: MailTest.java 749 2005-09-02 12:11:57Z sskracic $ + * @version $Id: MailTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class MailTest extends TestCase { - public static final String versionId = "$Id: MailTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Data for the test cases diff --git a/ccm-core/test/src/com/arsdigita/messaging/AttachmentTest.java b/ccm-core/test/src/com/arsdigita/messaging/AttachmentTest.java index 35b3c29af..84a47b1a4 100755 --- a/ccm-core/test/src/com/arsdigita/messaging/AttachmentTest.java +++ b/ccm-core/test/src/com/arsdigita/messaging/AttachmentTest.java @@ -24,12 +24,11 @@ import java.util.Iterator; /** * Test cases for attachments. * - * @version $Id: AttachmentTest.java 750 2005-09-02 12:38:44Z sskracic $ + * @version $Id: AttachmentTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class AttachmentTest extends MessageTestCase { - public static final String versionId = "$Id: AttachmentTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static String subject = "This is the subject"; private static String body = "This is the body"; diff --git a/ccm-core/test/src/com/arsdigita/messaging/HtmlMessageTest.java b/ccm-core/test/src/com/arsdigita/messaging/HtmlMessageTest.java index d873fa4b8..4468e81c2 100755 --- a/ccm-core/test/src/com/arsdigita/messaging/HtmlMessageTest.java +++ b/ccm-core/test/src/com/arsdigita/messaging/HtmlMessageTest.java @@ -21,12 +21,11 @@ package com.arsdigita.messaging; /** * Test cases for HTML messages. * - * @version $Id: HtmlMessageTest.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: HtmlMessageTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class HtmlMessageTest extends MessageTestCase { - public static final String versionId = "$Id: HtmlMessageTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static String subject = "This is the subject"; private static String body = "

This is the body

"; diff --git a/ccm-core/test/src/com/arsdigita/messaging/MessagePartTest.java b/ccm-core/test/src/com/arsdigita/messaging/MessagePartTest.java index c00d648fb..8e7a837e2 100755 --- a/ccm-core/test/src/com/arsdigita/messaging/MessagePartTest.java +++ b/ccm-core/test/src/com/arsdigita/messaging/MessagePartTest.java @@ -24,12 +24,11 @@ import javax.activation.DataHandler; /** * Test cases for MessageParts. * - * @version $Id: MessagePartTest.java 749 2005-09-02 12:11:57Z sskracic $ + * @version $Id: MessagePartTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class MessagePartTest extends MessageTestCase { - public static final String versionId = "$Id: MessagePartTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static String name = "attachment"; private static String desc = "an attached message"; diff --git a/ccm-core/test/src/com/arsdigita/messaging/MessageSuite.java b/ccm-core/test/src/com/arsdigita/messaging/MessageSuite.java index 2f8ecbad3..0a6f6de84 100755 --- a/ccm-core/test/src/com/arsdigita/messaging/MessageSuite.java +++ b/ccm-core/test/src/com/arsdigita/messaging/MessageSuite.java @@ -29,12 +29,11 @@ import junit.framework.Test; * * Test suite for the ACS Messaging package. * - * @version $Id: MessageSuite.java 749 2005-09-02 12:11:57Z sskracic $ + * @version $Id: MessageSuite.java 1940 2009-05-29 07:15:05Z terry $ */ public class MessageSuite extends PackageTestSuite { - public static final String versionId = "$Id: MessageSuite.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public MessageSuite() { super(); } diff --git a/ccm-core/test/src/com/arsdigita/messaging/MessageTestCase.java b/ccm-core/test/src/com/arsdigita/messaging/MessageTestCase.java index 9ae8ffe50..af301b6e2 100755 --- a/ccm-core/test/src/com/arsdigita/messaging/MessageTestCase.java +++ b/ccm-core/test/src/com/arsdigita/messaging/MessageTestCase.java @@ -28,12 +28,11 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; * Base test case for Messaging. Provides some common utilities and * setUp() / tearDown() methods for Messaging tests. * - * @version $Id: MessageTestCase.java 744 2005-09-02 10:43:19Z sskracic $ + * @version $Id: MessageTestCase.java 1940 2009-05-29 07:15:05Z terry $ */ public class MessageTestCase extends BaseTestCase { - public static final String versionId = "$Id: MessageTestCase.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * All tests need a Party to represent the Message sender. diff --git a/ccm-core/test/src/com/arsdigita/messaging/SortKeyTest.java b/ccm-core/test/src/com/arsdigita/messaging/SortKeyTest.java index 0ac6ab275..a28d7a528 100755 --- a/ccm-core/test/src/com/arsdigita/messaging/SortKeyTest.java +++ b/ccm-core/test/src/com/arsdigita/messaging/SortKeyTest.java @@ -23,12 +23,11 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; /** * Test cases for sort keys. * - * @version $Id: SortKeyTest.java 744 2005-09-02 10:43:19Z sskracic $ + * @version $Id: SortKeyTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class SortKeyTest extends BaseTestCase { - public static final String versionId = "$Id: SortKeyTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public SortKeyTest (String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/messaging/TextMessageTest.java b/ccm-core/test/src/com/arsdigita/messaging/TextMessageTest.java index f31a796f7..5118e1b0b 100755 --- a/ccm-core/test/src/com/arsdigita/messaging/TextMessageTest.java +++ b/ccm-core/test/src/com/arsdigita/messaging/TextMessageTest.java @@ -21,12 +21,11 @@ package com.arsdigita.messaging; /** * Test cases for plain text messages. * - * @version $Id: TextMessageTest.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TextMessageTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class TextMessageTest extends MessageTestCase { - public static final String versionId = "$Id: TextMessageTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static String subject = "This is the subject"; private static String body = "This is the body"; diff --git a/ccm-core/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java b/ccm-core/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java index 75a96a53e..8e30fd6fb 100755 --- a/ccm-core/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java +++ b/ccm-core/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java @@ -56,7 +56,7 @@ import org.apache.log4j.Logger; public class DynamicObjectTypeTest extends PersistenceTestCase { - public final static String versionId = "$Id: DynamicObjectTypeTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(DynamicObjectTypeTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/metadata/MetadataSuite.java b/ccm-core/test/src/com/arsdigita/metadata/MetadataSuite.java index 350d2b83d..72bbbb24e 100755 --- a/ccm-core/test/src/com/arsdigita/metadata/MetadataSuite.java +++ b/ccm-core/test/src/com/arsdigita/metadata/MetadataSuite.java @@ -30,7 +30,7 @@ import junit.framework.Test; * @version $Revision: #9 $ $Date: 2004/08/16 $ */ public class MetadataSuite extends PackageTestSuite { - public final static String versionId = "$Id: MetadataSuite.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public static Test suite() { MetadataSuite suite = new MetadataSuite(); diff --git a/ccm-core/test/src/com/arsdigita/metadata/PersistenceTestCase.java b/ccm-core/test/src/com/arsdigita/metadata/PersistenceTestCase.java index cc47ba9cb..361f80bc1 100755 --- a/ccm-core/test/src/com/arsdigita/metadata/PersistenceTestCase.java +++ b/ccm-core/test/src/com/arsdigita/metadata/PersistenceTestCase.java @@ -35,7 +35,7 @@ import junit.framework.TestCase; public class PersistenceTestCase extends TestCase { - public final static String versionId = "$Id: PersistenceTestCase.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + // Prevent loading the same PDL file twice private static Set s_loadedPDLResources = new HashSet(); diff --git a/ccm-core/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java b/ccm-core/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java index 292370a30..63a9d9eba 100755 --- a/ccm-core/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java +++ b/ccm-core/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java @@ -46,7 +46,6 @@ import java.math.BigDecimal; public class ConvertHTMLTest extends BaseTestCase { - public static final String versionId = "$Id: ConvertHTMLTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // The last test in this file is only run if // MimeTypeInitializer.INSO_filter_works is not 0. diff --git a/ccm-core/test/src/com/arsdigita/mimetypes/MimetypesSuite.java b/ccm-core/test/src/com/arsdigita/mimetypes/MimetypesSuite.java index c51626318..324d7209d 100755 --- a/ccm-core/test/src/com/arsdigita/mimetypes/MimetypesSuite.java +++ b/ccm-core/test/src/com/arsdigita/mimetypes/MimetypesSuite.java @@ -28,7 +28,6 @@ import junit.framework.Test; * **/ public class MimetypesSuite extends PackageTestSuite { - public static final String versionId = "$Id: MimetypesSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public MimetypesSuite() { super(); } diff --git a/ccm-core/test/src/com/arsdigita/notification/DigestQueueManagerTest.java b/ccm-core/test/src/com/arsdigita/notification/DigestQueueManagerTest.java index 085b2d6ce..e93a8a6d6 100755 --- a/ccm-core/test/src/com/arsdigita/notification/DigestQueueManagerTest.java +++ b/ccm-core/test/src/com/arsdigita/notification/DigestQueueManagerTest.java @@ -28,11 +28,10 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; * Test of DigestQueueManager, similar to SimpleQueueManagerTest. * * @author Stefan Deusch - * @version $Id: DigestQueueManagerTest.java 744 2005-09-02 10:43:19Z sskracic $ + * @version $Id: DigestQueueManagerTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class DigestQueueManagerTest extends BaseTestCase { - public static final String versionId = "$Id: DigestQueueManagerTest.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; static ManagerDispatcher requestMgr; static ManagerDispatcher digestQMgr; diff --git a/ccm-core/test/src/com/arsdigita/notification/ManagerDispatcher.java b/ccm-core/test/src/com/arsdigita/notification/ManagerDispatcher.java index 683f23c8d..7beaba29e 100755 --- a/ccm-core/test/src/com/arsdigita/notification/ManagerDispatcher.java +++ b/ccm-core/test/src/com/arsdigita/notification/ManagerDispatcher.java @@ -38,13 +38,12 @@ import java.util.TimerTask; * scheduled periodically. * * @author Stefan Deusch - * @version $Id: ManagerDispatcher.java 744 2005-09-02 10:43:19Z sskracic $ + * @version $Id: ManagerDispatcher.java 1940 2009-05-29 07:15:05Z terry $ * */ public class ManagerDispatcher extends Thread { - public static final String versionId = "$Id: ManagerDispatcher.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; TimerTask mgr; private boolean suspendRequested; diff --git a/ccm-core/test/src/com/arsdigita/notification/NotificationSuite.java b/ccm-core/test/src/com/arsdigita/notification/NotificationSuite.java index 767a1402e..46c9f6b6b 100755 --- a/ccm-core/test/src/com/arsdigita/notification/NotificationSuite.java +++ b/ccm-core/test/src/com/arsdigita/notification/NotificationSuite.java @@ -43,12 +43,11 @@ import junit.framework.Test; * after the tests completed. * * @author Stefan Deusch - * @version $Id: NotificationSuite.java 744 2005-09-02 10:43:19Z sskracic $ + * @version $Id: NotificationSuite.java 1940 2009-05-29 07:15:05Z terry $ * @see com.arsdigita.mail.SimpleServer for a mockup SMTP mail server needed on localhost here. */ public class NotificationSuite extends PackageTestSuite { - public static final String versionId = "$Id: NotificationSuite.java 744 2005-09-02 10:43:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public void addTest(Test test) { super.addTest(new PermissionDecorator(test)); diff --git a/ccm-core/test/src/com/arsdigita/notification/NotificationTest.java b/ccm-core/test/src/com/arsdigita/notification/NotificationTest.java index ef64998b8..262e63ef4 100755 --- a/ccm-core/test/src/com/arsdigita/notification/NotificationTest.java +++ b/ccm-core/test/src/com/arsdigita/notification/NotificationTest.java @@ -31,12 +31,11 @@ import javax.activation.DataHandler; * Test suite for notifications. Constructors and simple setXXX, getXXX methods are * tested. * - * @version $Id: NotificationTest.java 750 2005-09-02 12:38:44Z sskracic $ + * @version $Id: NotificationTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class NotificationTest extends BaseTestCase { - public static final String versionId = "$Id: NotificationTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; User to; User from; diff --git a/ccm-core/test/src/com/arsdigita/notification/RequestManagerTest.java b/ccm-core/test/src/com/arsdigita/notification/RequestManagerTest.java index 170e659b3..6660e9f76 100755 --- a/ccm-core/test/src/com/arsdigita/notification/RequestManagerTest.java +++ b/ccm-core/test/src/com/arsdigita/notification/RequestManagerTest.java @@ -28,11 +28,10 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; * Test of RequestManager * * @author Stefan Deusch - * @version $Id: RequestManagerTest.java 745 2005-09-02 10:50:34Z sskracic $ + * @version $Id: RequestManagerTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class RequestManagerTest extends BaseTestCase { - public static final String versionId = "$Id: RequestManagerTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; static ManagerDispatcher requestMgr; diff --git a/ccm-core/test/src/com/arsdigita/notification/SimpleQueueManagerTest.java b/ccm-core/test/src/com/arsdigita/notification/SimpleQueueManagerTest.java index 36b6bd182..e787c17b2 100755 --- a/ccm-core/test/src/com/arsdigita/notification/SimpleQueueManagerTest.java +++ b/ccm-core/test/src/com/arsdigita/notification/SimpleQueueManagerTest.java @@ -40,11 +40,10 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; * usable, persistent objects for testing. * * @author Stefan Deusch - * @version $Id: SimpleQueueManagerTest.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SimpleQueueManagerTest.java 1940 2009-05-29 07:15:05Z terry $ */ public class SimpleQueueManagerTest extends BaseTestCase { - public static final String versionId = "$Id: SimpleQueueManagerTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; static final int MAX_WAIT = 5; diff --git a/ccm-core/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java b/ccm-core/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java index efbac7069..85605b9c8 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java @@ -30,7 +30,6 @@ import org.apache.log4j.varia.StringMatchFilter; */ public class AggressiveConnectionCloseTest extends Log4jBasedTestCase { - public static final String versionId = "$Id: AggressiveConnectionCloseTest.java 749 2005-09-02 12:11:57Z sskracic $"; private Session ssn; diff --git a/ccm-core/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java b/ccm-core/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java index 60523f099..038c9a85f 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java @@ -33,7 +33,6 @@ import java.math.BigDecimal; */ public class DataAssociationCursorTest extends DataCollectionTest { - public static final String versionId = "$Id: DataAssociationCursorTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; OrderAssociation m_orderAssoc; diff --git a/ccm-core/test/src/com/arsdigita/persistence/DataAssociationImplTest.java b/ccm-core/test/src/com/arsdigita/persistence/DataAssociationImplTest.java index e971f3db3..c0da127d5 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DataAssociationImplTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DataAssociationImplTest.java @@ -40,7 +40,6 @@ import org.apache.log4j.Logger; public class DataAssociationImplTest extends PersistenceTestCase { - public static final String versionId = "$Id: DataAssociationImplTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger log = Logger.getLogger(DataAssociationImplTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DataCollectionImplTest.java b/ccm-core/test/src/com/arsdigita/persistence/DataCollectionImplTest.java index 8a1bd49a3..f9329d31f 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DataCollectionImplTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DataCollectionImplTest.java @@ -36,7 +36,7 @@ import org.apache.log4j.Logger; */ public class DataCollectionImplTest extends DataCollectionTest { - public final static String versionId = "$Id: DataCollectionImplTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(DataCollectionImplTest.class.getName()); private ObjectType m_nodeType; diff --git a/ccm-core/test/src/com/arsdigita/persistence/DataCollectionTest.java b/ccm-core/test/src/com/arsdigita/persistence/DataCollectionTest.java index d746a4ea6..e766b7f75 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DataCollectionTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DataCollectionTest.java @@ -22,7 +22,6 @@ import com.arsdigita.persistence.metadata.ObjectType; public abstract class DataCollectionTest extends DataQueryTest { - public static final String versionId = "$Id: DataCollectionTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public DataCollectionTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DataObjectManipulator.java b/ccm-core/test/src/com/arsdigita/persistence/DataObjectManipulator.java index 81fae987c..92a9c5290 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DataObjectManipulator.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DataObjectManipulator.java @@ -49,7 +49,7 @@ import org.apache.log4j.Logger; */ public class DataObjectManipulator { - public final static String versionId = "$Id: DataObjectManipulator.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(DataObjectManipulator.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DataOperationTest.java b/ccm-core/test/src/com/arsdigita/persistence/DataOperationTest.java index 9d5ffcf54..6974820a2 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DataOperationTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DataOperationTest.java @@ -35,7 +35,7 @@ import java.util.Date; */ public class DataOperationTest extends PersistenceTestCase { - public final static String versionId = "$Id: DataOperationTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DataOperationTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DataQueryImplTest.java b/ccm-core/test/src/com/arsdigita/persistence/DataQueryImplTest.java index 5c1b53171..02a4df0cc 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DataQueryImplTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DataQueryImplTest.java @@ -42,7 +42,7 @@ import org.apache.log4j.Logger; */ public class DataQueryImplTest extends DataQueryTest { - public final static String versionId = "$Id: DataQueryImplTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(DataQueryImplTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DataQueryTest.java b/ccm-core/test/src/com/arsdigita/persistence/DataQueryTest.java index 2f0c4274f..58623ac69 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DataQueryTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DataQueryTest.java @@ -40,7 +40,7 @@ import java.math.BigDecimal; */ public abstract class DataQueryTest extends PersistenceTestCase { - public final static String versionId = "$Id: DataQueryTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DataQueryTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DatatypeTest.java b/ccm-core/test/src/com/arsdigita/persistence/DatatypeTest.java index 1f9d8c945..dd2078179 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DatatypeTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DatatypeTest.java @@ -31,7 +31,7 @@ import java.sql.Date; public class DatatypeTest extends PersistenceTestCase { - public final static String versionId = "$Id: DatatypeTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private Session ssn; diff --git a/ccm-core/test/src/com/arsdigita/persistence/DeletionTest.java b/ccm-core/test/src/com/arsdigita/persistence/DeletionTest.java index 74450b309..d7d5759b2 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DeletionTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DeletionTest.java @@ -29,7 +29,7 @@ import java.math.BigInteger; public class DeletionTest extends PersistenceTestCase { - public final static String versionId = "$Id: DeletionTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DeletionTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DynamicLinkAttributeTest.java b/ccm-core/test/src/com/arsdigita/persistence/DynamicLinkAttributeTest.java index de6015a66..84608b444 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DynamicLinkAttributeTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DynamicLinkAttributeTest.java @@ -29,7 +29,7 @@ import java.math.BigInteger; public class DynamicLinkAttributeTest extends LinkAttributeTest { - public final static String versionId = "$Id: DynamicLinkAttributeTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DynamicLinkAttributeTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DynamicLinkTest.java b/ccm-core/test/src/com/arsdigita/persistence/DynamicLinkTest.java index e5b763427..f87fb5a0b 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DynamicLinkTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DynamicLinkTest.java @@ -26,7 +26,7 @@ package com.arsdigita.persistence; public class DynamicLinkTest extends LinkTest { - public final static String versionId = "$Id: DynamicLinkTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DynamicLinkTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DynamicNodeTest.java b/ccm-core/test/src/com/arsdigita/persistence/DynamicNodeTest.java index 87bac3d4f..253c171ed 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DynamicNodeTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DynamicNodeTest.java @@ -25,7 +25,7 @@ package com.arsdigita.persistence; public class DynamicNodeTest extends NodeTest { - public final static String versionId = "$Id: DynamicNodeTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DynamicNodeTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DynamicOrderTest.java b/ccm-core/test/src/com/arsdigita/persistence/DynamicOrderTest.java index 049647e86..86072d84a 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DynamicOrderTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DynamicOrderTest.java @@ -27,7 +27,7 @@ package com.arsdigita.persistence; public class DynamicOrderTest extends OrderTest { - public final static String versionId = "$Id: DynamicOrderTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DynamicOrderTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/DynamicPartyTest.java b/ccm-core/test/src/com/arsdigita/persistence/DynamicPartyTest.java index f0ee0f4f3..512d79f8c 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/DynamicPartyTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/DynamicPartyTest.java @@ -27,7 +27,7 @@ package com.arsdigita.persistence; public class DynamicPartyTest extends PartyTest { - public final static String versionId = "$Id: DynamicPartyTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DynamicPartyTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/ExtendLobTest.java b/ccm-core/test/src/com/arsdigita/persistence/ExtendLobTest.java index 49ecaa3ea..5e20c33a5 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/ExtendLobTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/ExtendLobTest.java @@ -30,7 +30,7 @@ import org.apache.log4j.Logger; public class ExtendLobTest extends PersistenceTestCase { - public final static String versionId = "$Id: ExtendLobTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger LOG = Logger.getLogger(ExtendLobTest.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/FilterTest.java b/ccm-core/test/src/com/arsdigita/persistence/FilterTest.java index 99d729bb7..caf0d7ded 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/FilterTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/FilterTest.java @@ -34,7 +34,7 @@ import org.apache.log4j.Logger; * @version $Revision: #19 $ $Date: 2004/08/16 $ */ public class FilterTest extends PersistenceTestCase { - public final static String versionId = "$Id: FilterTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(FilterTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/GenericDataObjectTest.java b/ccm-core/test/src/com/arsdigita/persistence/GenericDataObjectTest.java index e71816e6e..ee0d85139 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/GenericDataObjectTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/GenericDataObjectTest.java @@ -34,7 +34,7 @@ import java.math.BigInteger; */ public class GenericDataObjectTest extends PersistenceTestCase { - public final static String versionId = "$Id: GenericDataObjectTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public GenericDataObjectTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/GenericDataQueryTest.java b/ccm-core/test/src/com/arsdigita/persistence/GenericDataQueryTest.java index c9a14c2b5..64ebeaf86 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/GenericDataQueryTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/GenericDataQueryTest.java @@ -36,7 +36,7 @@ import org.apache.log4j.Logger; public class GenericDataQueryTest extends PersistenceTestCase { - public final static String versionId = "$Id: GenericDataQueryTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(GenericDataQueryTest.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/InitializerTest.java b/ccm-core/test/src/com/arsdigita/persistence/InitializerTest.java index c206ac6af..d7ff0f89f 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/InitializerTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/InitializerTest.java @@ -39,7 +39,6 @@ import junit.framework.TestSuite; public class InitializerTest extends TestCase { - public static final String versionId = "$Id: InitializerTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Constructor (needed for JTest) diff --git a/ccm-core/test/src/com/arsdigita/persistence/KeyGenerator.java b/ccm-core/test/src/com/arsdigita/persistence/KeyGenerator.java index 3c605f6da..4440ce009 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/KeyGenerator.java +++ b/ccm-core/test/src/com/arsdigita/persistence/KeyGenerator.java @@ -41,7 +41,6 @@ import java.util.Map; public class KeyGenerator { - public static final String versionId = "$Id: KeyGenerator.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; static Map s_keys = new HashMap(); private KeyGenerator() diff --git a/ccm-core/test/src/com/arsdigita/persistence/LazyLoadFailureTest.java b/ccm-core/test/src/com/arsdigita/persistence/LazyLoadFailureTest.java index 810156639..481d134c9 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/LazyLoadFailureTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/LazyLoadFailureTest.java @@ -29,7 +29,7 @@ import java.math.BigDecimal; public class LazyLoadFailureTest extends PersistenceTestCase { - public final static String versionId = "$Id: LazyLoadFailureTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public LazyLoadFailureTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/LinkAttributeTest.java b/ccm-core/test/src/com/arsdigita/persistence/LinkAttributeTest.java index 573bd4c2e..987b7bcee 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/LinkAttributeTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/LinkAttributeTest.java @@ -32,7 +32,7 @@ import org.apache.log4j.Logger; public abstract class LinkAttributeTest extends PersistenceTestCase { - public final static String versionId = "$Id: LinkAttributeTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/persistence/LinkTest.java b/ccm-core/test/src/com/arsdigita/persistence/LinkTest.java index bdd51c889..b0298e310 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/LinkTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/LinkTest.java @@ -32,7 +32,7 @@ import org.apache.log4j.Logger; public abstract class LinkTest extends PersistenceTestCase { - public final static String versionId = "$Id: LinkTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(LinkTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java b/ccm-core/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java index 4249e5278..e967f8575 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java +++ b/ccm-core/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java @@ -56,7 +56,6 @@ import org.apache.log4j.WriterAppender; */ public class Log4jBasedTestCase extends PersistenceTestCase { - public static final String versionId = "$Id: Log4jBasedTestCase.java 1837 2009-03-05 06:57:16Z terry $"; /** * The log object. Should be modified diff --git a/ccm-core/test/src/com/arsdigita/persistence/MetaTest.java b/ccm-core/test/src/com/arsdigita/persistence/MetaTest.java index 73a3f466f..d7cd91e72 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/MetaTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/MetaTest.java @@ -32,7 +32,7 @@ import org.apache.log4j.Logger; public class MetaTest extends PersistenceTestCase { - public final static String versionId = "$Id: MetaTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(MetaTest.class.getName()); static { diff --git a/ccm-core/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java b/ccm-core/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java index b75ba34ef..13dcd41cc 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java @@ -29,7 +29,7 @@ import org.apache.log4j.Logger; public class MetadataDebuggingTest extends TestCase { - public final static String versionId = "$Id: MetadataDebuggingTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(MetadataDebuggingTest.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java b/ccm-core/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java index a2826b684..bb61f75e0 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java @@ -34,7 +34,7 @@ import org.apache.log4j.Logger; public class MultiThreadDataObjectTest extends PersistenceTestCase { - public final static String versionId = "$Id: MultiThreadDataObjectTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(MultiThreadDataObjectTest.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/NodeTest.java b/ccm-core/test/src/com/arsdigita/persistence/NodeTest.java index a838f5b79..29b158764 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/NodeTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/NodeTest.java @@ -30,7 +30,7 @@ import org.apache.log4j.Logger; public abstract class NodeTest extends PersistenceTestCase { - public final static String versionId = "$Id: NodeTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(NodeTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/OIDTest.java b/ccm-core/test/src/com/arsdigita/persistence/OIDTest.java index 373878ed4..1ea4ab702 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/OIDTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/OIDTest.java @@ -38,7 +38,7 @@ import org.apache.log4j.Logger; public class OIDTest extends TestCase { - public final static String versionId = "$Id: OIDTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(OIDTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/ObjectTypeValidator.java b/ccm-core/test/src/com/arsdigita/persistence/ObjectTypeValidator.java index e27ad213b..bd2ac7be3 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/ObjectTypeValidator.java +++ b/ccm-core/test/src/com/arsdigita/persistence/ObjectTypeValidator.java @@ -35,7 +35,7 @@ import org.apache.log4j.Logger; public class ObjectTypeValidator { - public final static String versionId = "$Id: ObjectTypeValidator.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(ObjectTypeValidator.class.getName()); DataObjectManipulator m_manipulator; diff --git a/ccm-core/test/src/com/arsdigita/persistence/ObserverTest.java b/ccm-core/test/src/com/arsdigita/persistence/ObserverTest.java index e3f3891bc..4b6c3f437 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/ObserverTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/ObserverTest.java @@ -31,7 +31,7 @@ import java.util.List; public class ObserverTest extends PersistenceTestCase { - public final static String versionId = "$Id: ObserverTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public ObserverTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/OrderAssociation.java b/ccm-core/test/src/com/arsdigita/persistence/OrderAssociation.java index 99845e1be..bb246b64a 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/OrderAssociation.java +++ b/ccm-core/test/src/com/arsdigita/persistence/OrderAssociation.java @@ -28,7 +28,6 @@ import java.util.Date; */ final class OrderAssociation { - public static final String versionId = "$Id: OrderAssociation.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static final int NUM_ITEMS = 10; private final String m_model; diff --git a/ccm-core/test/src/com/arsdigita/persistence/OrderTest.java b/ccm-core/test/src/com/arsdigita/persistence/OrderTest.java index 99cba2105..79023da6f 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/OrderTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/OrderTest.java @@ -31,7 +31,7 @@ import java.util.Set; public abstract class OrderTest extends PersistenceTestCase { - public final static String versionId = "$Id: OrderTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public OrderTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/PartyTest.java b/ccm-core/test/src/com/arsdigita/persistence/PartyTest.java index 7409ce686..fce66f2f2 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/PartyTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/PartyTest.java @@ -33,7 +33,7 @@ import org.apache.log4j.Logger; abstract public class PartyTest extends PersistenceTestCase { - public final static String versionId = "$Id: PartyTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(PartyTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/PersistenceSuite.java b/ccm-core/test/src/com/arsdigita/persistence/PersistenceSuite.java index 4ff61fee7..286c54ff7 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/PersistenceSuite.java +++ b/ccm-core/test/src/com/arsdigita/persistence/PersistenceSuite.java @@ -30,7 +30,7 @@ import junit.framework.Test; * @version $Revision: #14 $ $Date: 2004/08/16 $ */ public class PersistenceSuite extends PackageTestSuite { - public final static String versionId = "$Id: PersistenceSuite.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public PersistenceSuite() { super(); diff --git a/ccm-core/test/src/com/arsdigita/persistence/PersistenceTestCase.java b/ccm-core/test/src/com/arsdigita/persistence/PersistenceTestCase.java index 7fc994179..1cc972f92 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/PersistenceTestCase.java +++ b/ccm-core/test/src/com/arsdigita/persistence/PersistenceTestCase.java @@ -38,7 +38,7 @@ import org.apache.log4j.Logger; public class PersistenceTestCase extends TestCase { - public final static String versionId = "$Id: PersistenceTestCase.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger LOG = Logger.getLogger(PersistenceTestCase.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/PersistenceWrapper.java b/ccm-core/test/src/com/arsdigita/persistence/PersistenceWrapper.java index 195fad509..861a68d15 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/PersistenceWrapper.java +++ b/ccm-core/test/src/com/arsdigita/persistence/PersistenceWrapper.java @@ -31,7 +31,7 @@ import org.apache.log4j.Logger; */ public class PersistenceWrapper extends CoreTestSetup { - public final static String versionId = "$Id: PersistenceWrapper.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static Logger s_log = Logger.getLogger(PersistenceWrapper.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java b/ccm-core/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java index ceae04128..84e3ce3ba 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java @@ -44,7 +44,7 @@ import junit.framework.TestCase; public class PooledConnectionSourceTest extends TestCase { - public final static String versionId = "$Id: PooledConnectionSourceTest.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final String JDBC_PREFIX = "jdbc:test:"; private static final Map CONNECTIONS = new HashMap(); diff --git a/ccm-core/test/src/com/arsdigita/persistence/PropertyManipulator.java b/ccm-core/test/src/com/arsdigita/persistence/PropertyManipulator.java index e3eeabc71..c4dc637de 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/PropertyManipulator.java +++ b/ccm-core/test/src/com/arsdigita/persistence/PropertyManipulator.java @@ -43,7 +43,7 @@ import org.apache.log4j.Priority; */ public class PropertyManipulator { - public final static String versionId = "$Id: PropertyManipulator.java 749 2005-09-02 12:11:57Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(PropertyManipulator.class.getName()); static { diff --git a/ccm-core/test/src/com/arsdigita/persistence/RefetchTest.java b/ccm-core/test/src/com/arsdigita/persistence/RefetchTest.java index ff1e69489..e4ca922da 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/RefetchTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/RefetchTest.java @@ -30,7 +30,7 @@ import org.apache.log4j.Logger; public class RefetchTest extends PersistenceTestCase { - public final static String versionId = "$Id: RefetchTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(RefetchTest.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/StatementClosingTest.java b/ccm-core/test/src/com/arsdigita/persistence/StatementClosingTest.java index 06ff600d3..3f68426fa 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/StatementClosingTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/StatementClosingTest.java @@ -32,7 +32,6 @@ import org.apache.log4j.varia.StringMatchFilter; */ public class StatementClosingTest extends Log4jBasedTestCase { - public static final String versionId = "$Id: StatementClosingTest.java 749 2005-09-02 12:11:57Z sskracic $"; private Session ssn; diff --git a/ccm-core/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java b/ccm-core/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java index 182ce9207..a1700f3d6 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java @@ -27,7 +27,7 @@ package com.arsdigita.persistence; public class StaticLinkAttributeTest extends LinkAttributeTest { - public final static String versionId = "$Id: StaticLinkAttributeTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public StaticLinkAttributeTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/StaticLinkTest.java b/ccm-core/test/src/com/arsdigita/persistence/StaticLinkTest.java index fb6485310..74380e41c 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/StaticLinkTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/StaticLinkTest.java @@ -26,7 +26,7 @@ package com.arsdigita.persistence; public class StaticLinkTest extends LinkTest { - public final static String versionId = "$Id: StaticLinkTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public StaticLinkTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/StaticNodeTest.java b/ccm-core/test/src/com/arsdigita/persistence/StaticNodeTest.java index 6e3762248..b46074999 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/StaticNodeTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/StaticNodeTest.java @@ -27,7 +27,7 @@ package com.arsdigita.persistence; public class StaticNodeTest extends NodeTest { - public final static String versionId = "$Id: StaticNodeTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public StaticNodeTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/StaticOrderTest.java b/ccm-core/test/src/com/arsdigita/persistence/StaticOrderTest.java index 575a751bd..cca2bb4b7 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/StaticOrderTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/StaticOrderTest.java @@ -27,7 +27,7 @@ package com.arsdigita.persistence; public class StaticOrderTest extends OrderTest { - public final static String versionId = "$Id: StaticOrderTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public StaticOrderTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/StaticPartyTest.java b/ccm-core/test/src/com/arsdigita/persistence/StaticPartyTest.java index 6e01035a2..89748aed8 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/StaticPartyTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/StaticPartyTest.java @@ -27,7 +27,7 @@ package com.arsdigita.persistence; public class StaticPartyTest extends PartyTest { - public final static String versionId = "$Id: StaticPartyTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public StaticPartyTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java index a384afb43..d5703d173 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java @@ -33,7 +33,7 @@ import java.util.Iterator; public class CRUDTest extends BaseTestCase { - public final static String versionId = "$Id: CRUDTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public CRUDTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java index 1d5083922..d853c9c51 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java @@ -36,7 +36,7 @@ import org.apache.log4j.Logger; public class CRUDTestlet extends Testlet { - public final static String versionId = "$Id: CRUDTestlet.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger LOG = Logger.getLogger(CRUDTestlet.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/DataSource.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/DataSource.java index 455d046a4..e295b9090 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/DataSource.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/DataSource.java @@ -58,7 +58,7 @@ import org.apache.log4j.Logger; public class DataSource { - public final static String versionId = "$Id: DataSource.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger LOG = Logger.getLogger(DataSource.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/DataSuite.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/DataSuite.java index 7e7dd96f5..a0abcd4c7 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/DataSuite.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/DataSuite.java @@ -32,7 +32,7 @@ import junit.framework.Test; public class DataSuite extends PackageTestSuite { - public final static String versionId = "$Id: DataSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public DataSuite() {} diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java index e8415b282..f55bc8f01 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java @@ -25,7 +25,7 @@ import org.apache.log4j.Logger; public class DoubleUpdateTestlet extends Testlet { - public final static String versionId = "$Id: DoubleUpdateTestlet.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(DoubleUpdateTestlet.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java index bdf17c520..fdec24932 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java @@ -31,7 +31,7 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; public class MappingsTest extends BaseTestCase { - public final static String versionId = "$Id: MappingsTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public MappingsTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java index bdc812d55..42273f810 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java @@ -38,7 +38,7 @@ import java.util.Set; public class ObjectTree { - public final static String versionId = "$Id: ObjectTree.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private ObjectType m_type; private ObjectTree m_parent; diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java index e5c8f1a97..83459291c 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java @@ -25,7 +25,7 @@ import org.apache.log4j.Logger; public class PropertyIsolationTestlet extends Testlet { - public final static String versionId = "$Id: PropertyIsolationTestlet.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(PropertyIsolationTestlet.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/tests/data/Testlet.java b/ccm-core/test/src/com/arsdigita/persistence/tests/data/Testlet.java index 5df565c70..cdc216ddd 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/tests/data/Testlet.java +++ b/ccm-core/test/src/com/arsdigita/persistence/tests/data/Testlet.java @@ -39,7 +39,7 @@ import org.apache.log4j.Logger; public abstract class Testlet { - public final static String versionId = "$Id: Testlet.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger LOG = Logger.getLogger(Testlet.class);