DataObject from the
+ * Constructor retrieves the contained DataObject from the
* persistent storage mechanism with an OID specified by
* oid.
*
diff --git a/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java b/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java
index 4cfa8bf2a..fbf6935a1 100755
--- a/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java
+++ b/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java
@@ -31,13 +31,10 @@ import java.math.BigDecimal;
* authoring steps} in a particular order.
*
* @author Jack Chung (flattop@arsdigita.com)
- * @version $Revision: #11 $ $Date: 2004/08/17 $
+ * @version $Id: AuthoringKitStepAssociation.java 287 2005-02-22 00:29:02Z sskracic $
*/
class AuthoringKitStepAssociation extends DomainObject {
- public static final String versionId = "$Id: AuthoringKitStepAssociation.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
-
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.cms.AuthoringKitStepAssociation";
diff --git a/ccm-cms/src/com/arsdigita/cms/AuthoringStep.java b/ccm-cms/src/com/arsdigita/cms/AuthoringStep.java
index e6fcfa159..ade8f8540 100755
--- a/ccm-cms/src/com/arsdigita/cms/AuthoringStep.java
+++ b/ccm-cms/src/com/arsdigita/cms/AuthoringStep.java
@@ -30,13 +30,10 @@ import java.math.BigDecimal;
* authoring kit}.
*
* @author Jack Chung (flattop@arsdigita.com)
- * @version $Revision: #13 $ $Date: 2004/08/17 $
+ * @version $Id: AuthoringStep.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class AuthoringStep extends ACSObject {
- public static final String versionId = "$Id: AuthoringStep.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
-
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.cms.AuthoringStep";
diff --git a/ccm-cms/src/com/arsdigita/cms/AuthoringStepCollection.java b/ccm-cms/src/com/arsdigita/cms/AuthoringStepCollection.java
index bd8e230e8..685037e02 100755
--- a/ccm-cms/src/com/arsdigita/cms/AuthoringStepCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/AuthoringStepCollection.java
@@ -26,16 +26,14 @@ import com.arsdigita.persistence.DataCollection;
* Describes a set of {@link com.arsdigita.cms.AuthoringStep authoring
* steps}.
*
- * @author Jack Chung
- * @version 1.0
- *
* @see com.arsdigita.domain.DomainCollection
* @see com.arsdigita.persistence.DataCollection
+ *
+ * @author Jack Chung
+ * @version $Id: AuthoringStepCollection.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class AuthoringStepCollection extends DomainCollection {
- public static final String versionId = "$Id: AuthoringStepCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
/**
* Constructor.
*
diff --git a/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java b/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java
index d11c94358..2194ff76c 100755
--- a/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java
+++ b/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java
@@ -38,12 +38,10 @@ import java.io.OutputStream;
* @author Jack Chung
* @author Stanislav Freidin
*
- * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: BinaryAsset.java 287 2005-02-22 00:29:02Z sskracic $
*/
public abstract class BinaryAsset extends Asset {
- public static final String versionId = "$Id: BinaryAsset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
protected BinaryAsset(OID oid) throws DataObjectNotFoundException {
super(oid);
}
diff --git a/ccm-cms/src/com/arsdigita/cms/CategoryTemplateMapping.java b/ccm-cms/src/com/arsdigita/cms/CategoryTemplateMapping.java
index 06ca2ca2f..f010c6bfa 100755
--- a/ccm-cms/src/com/arsdigita/cms/CategoryTemplateMapping.java
+++ b/ccm-cms/src/com/arsdigita/cms/CategoryTemplateMapping.java
@@ -33,7 +33,7 @@ import java.math.BigDecimal;
/**
* Represents a mapping from (category + content type) to a template.
*
- * @version $Id: CategoryTemplateMapping.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: CategoryTemplateMapping.java 1940 2009-05-29 07:15:05Z terry $
*/
public class CategoryTemplateMapping extends TemplateMapping {
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
index 8288cdafc..0549f32ab 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
@@ -53,24 +53,24 @@ import org.apache.log4j.Logger;
*
* @author Shashin Shinde
* @author Justin Ross <jross@redhat.com>
- * @version $Id: ContentBundle.java 967 2005-10-28 18:08:42Z sskracic $
+ * @version $Id: ContentBundle.java 2017 2009-10-04 09:03:45Z pboy $
*/
public class ContentBundle extends ContentItem {
private static final Logger s_log = Logger.getLogger(ContentBundle.class);
-
+
private static DomainObjectObserver s_instancesObserver =
- new AbstractDomainObjectObserver() {
- public void add(DomainObject dom, String name,
- DataObject dobj) {
- if (INSTANCES.equals(name)) {
- if (dobj != null) {
- PermissionService.setContext(dobj.getOID(), dom.getOID());
+ new AbstractDomainObjectObserver() {
+ public void add(DomainObject dom, String name,
+ DataObject dobj) {
+ if (INSTANCES.equals(name)) {
+ if (dobj != null) {
+ PermissionService.setContext(dobj.getOID(), dom.getOID());
+ }
}
}
- }
- };
-
+ };
+
/**
* The base data object type of a bundle
*/
@@ -81,19 +81,19 @@ public class ContentBundle extends ContentItem {
* The primary instances association
*/
public static final String INSTANCES = "instances";
-
+
/**
* The association to AtoZ aliases
*/
public static final String ATOZ_ALIASING_PROVIDERS = "atozAliasingProviders";
-
+
/**
* The default language property
*/
public static final String DEFAULT_LANGUAGE = "defaultLanguage";
-
+
private boolean m_wasNew = false;
-
+
/**
* Returns the data object type for this bundle.
*/
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentPage.java b/ccm-cms/src/com/arsdigita/cms/ContentPage.java
index 31d97f33f..5e68a42fe 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentPage.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentPage.java
@@ -42,7 +42,7 @@ import org.apache.log4j.Logger;
* @author Uday Mathur
* @author Jack Chung
* @author Michael Pih
- * @version $Id: ContentPage.java 1263 2006-07-17 08:18:47Z cgyg9330 $
+ * @version $Id: ContentPage.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class ContentPage extends ContentItem {
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
index b972f8927..bb408366a 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
@@ -94,7 +94,7 @@ import org.apache.log4j.Logger;
* @see ContentSection#getConfig()
*
* @author Justin Ross <jross@redhat.com>
- * @version $Id: ContentSectionConfig.java 1689 2007-10-26 11:06:23Z chrisg23 $
+ * @version $Id: ContentSectionConfig.java 2070 2010-01-28 08:47:41Z pboy $
*/
public final class ContentSectionConfig extends AbstractConfig {
@@ -641,9 +641,6 @@ public final class ContentSectionConfig extends AbstractConfig {
-
-
-
private class DHTMLEditorConfigParameter extends StringParameter {
public DHTMLEditorConfigParameter(final String name,
final int multiplicity,
@@ -819,9 +816,9 @@ public final class ContentSectionConfig extends AbstractConfig {
*
* @return
*/
- public boolean getHasContactsAuthoringStep() {
- return ((Boolean) get(m_hasContactsAuthoringStep)).booleanValue();
- }
+ public boolean getHasContactsAuthoringStep() {
+ return ((Boolean) get(m_hasContactsAuthoringStep)).booleanValue();
+ }
public final boolean getHideTextAssetUploadFile() {
return ((Boolean) get(m_hideTextAssetUploadFile)).booleanValue();
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
index a0c209361..f0958ba8d 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
+++ b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
@@ -2,7 +2,7 @@ com.arsdigita.cms.template_root_path.title=Template Root Path
com.arsdigita.cms.template_root_path.purpose=Path for the default template folder. Path is relative to webapp root
com.arsdigita.cms.template_root_path.example=/packages/content-section/templates
com.arsdigita.cms.template_root_path.format=[string]
-
+
com.arsdigita.cms.default_item_template_path.title=Default Item Template Path
com.arsdigita.cms.default_item_template_path.purpose=Path for the default item template. Path is relative to the Template Root path.
com.arsdigita.cms.default_item_template_path.example=/default/item.jsp
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentType.java b/ccm-cms/src/com/arsdigita/cms/ContentType.java
index ac2ef0392..209eed469 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentType.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentType.java
@@ -52,7 +52,7 @@ import java.net.MalformedURLException;
*
* @author Michael Pih (pihman@arsdigita.com)
* @author Jack Chung (flattop@arsdigita.com)
- * @version $Id: ContentType.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: ContentType.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class ContentType extends ACSObject {
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java b/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java
index 3cc0486f9..e73c9a5db 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java
@@ -27,16 +27,14 @@ import com.arsdigita.persistence.Filter;
* This class contains a collection of {@link
* com.arsdigita.cms.ContentType content types}.
*
- * @author Jack Chung (flattop@arsdigita.com)
- * @version $Revision: #11 $ $Date: 2004/08/17 $
- *
* @see com.arsdigita.domain.DomainCollection
* @see com.arsdigita.persistence.DataCollection
+ *
+ * @author Jack Chung (flattop@arsdigita.com)
+ * @version $Id: ContentTypeCollection.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class ContentTypeCollection extends DomainCollection {
- public static final String versionId = "$Id: ContentTypeCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
/**
* Constructor.
*
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentTypeLifecycleDefinition.java b/ccm-cms/src/com/arsdigita/cms/ContentTypeLifecycleDefinition.java
index 807c880c7..36ce2a486 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentTypeLifecycleDefinition.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentTypeLifecycleDefinition.java
@@ -33,13 +33,10 @@ import java.math.BigDecimal;
*
* @author Jack Chung (flattop@arsdigita.com)
* @author Michael Pih (pihman@arsdigita.com)
- * @version $Revision: #9 $ $Date: 2004/08/17 $
+ * @version $Id: ContentTypeLifecycleDefinition.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class ContentTypeLifecycleDefinition extends DomainObject {
- public static final String versionId = "$Id: ContentTypeLifecycleDefinition.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
-
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.cms.ContentTypeLifecycleDefinition";
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java b/ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java
index 879d4a34e..b890919bd 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java
@@ -37,13 +37,9 @@ import org.apache.log4j.Logger;
* com.arsdigita.cms.ContentSection content section}.
*
* @author Michael Pih (pihman@arsdigita.com)
- * @version $Id: ContentTypeWorkflowTemplate.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: ContentTypeWorkflowTemplate.java 1942 2009-05-29 07:53:23Z terry $
*/
public class ContentTypeWorkflowTemplate extends DomainObject {
- public static final String versionId =
- "$Id: ContentTypeWorkflowTemplate.java 287 2005-02-22 00:29:02Z sskracic $" +
- "$Author: sskracic $" +
- "$DateTime: 2004/08/17 23:15:09 $";
private static final Logger s_log = Logger.getLogger
(ContentTypeWorkflowTemplate.class);
diff --git a/ccm-cms/src/com/arsdigita/cms/DataQueryExistsListener.java b/ccm-cms/src/com/arsdigita/cms/DataQueryExistsListener.java
index 92f533f08..614fe5e1c 100755
--- a/ccm-cms/src/com/arsdigita/cms/DataQueryExistsListener.java
+++ b/ccm-cms/src/com/arsdigita/cms/DataQueryExistsListener.java
@@ -35,11 +35,10 @@ import com.arsdigita.persistence.DataQuery;
*
* @author Uday Mathur (umathur@arsdigita.com)
* @author Michael Pih (pihman@arsdigita.com)
- * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: DataQueryExistsListener.java 287 2005-02-22 00:29:02Z sskracic $
*/
public abstract class DataQueryExistsListener
implements FormValidationListener {
- public static final String versionId = "$Id: DataQueryExistsListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
protected String m_errorMsg;
diff --git a/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java b/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
index 94e292ea0..1a28f5ef8 100755
--- a/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
+++ b/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
@@ -24,10 +24,9 @@ import com.arsdigita.domain.DomainServiceInterfaceExposer;
* Exposes all methods in {@link com.arsdigita.domain.DomainService}.
*
* @author Stanislav Freidin (sfreidin@arsdigita.com)
- * @version $Id: DefaultDomainService.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: DefaultDomainService.java 1940 2009-05-29 07:15:05Z terry $
*/
public class DefaultDomainService extends DomainServiceInterfaceExposer {
- public static final String versionId = "$Id: DefaultDomainService.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
}
diff --git a/ccm-cms/src/com/arsdigita/cms/DefaultTemplateManager.java b/ccm-cms/src/com/arsdigita/cms/DefaultTemplateManager.java
index c86db2960..543887e3a 100755
--- a/ccm-cms/src/com/arsdigita/cms/DefaultTemplateManager.java
+++ b/ccm-cms/src/com/arsdigita/cms/DefaultTemplateManager.java
@@ -30,12 +30,10 @@ import com.arsdigita.mimetypes.MimeType;
* com.arsdigita.cms.TemplateManager template manager}.
*
* @author Karl Goldstein (karlg@arsdigita.com)
- * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: DefaultTemplateManager.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class DefaultTemplateManager implements TemplateManager {
- public static final String versionId = "$Id: DefaultTemplateManager.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
private static final String SECTION_ID = "sectionID";
private static final String TYPE_ID = "typeID";
private static final String USE_CONTEXT = "useContext";
diff --git a/ccm-cms/src/com/arsdigita/cms/DomainCopier.java b/ccm-cms/src/com/arsdigita/cms/DomainCopier.java
index 9e502d6b4..b7b8ab15e 100755
--- a/ccm-cms/src/com/arsdigita/cms/DomainCopier.java
+++ b/ccm-cms/src/com/arsdigita/cms/DomainCopier.java
@@ -42,13 +42,9 @@ import java.util.Iterator;
* Recursively copies a domain object.
*
* @author Justin Ross <jross@redhat.com>
- * @version $Id: DomainCopier.java 754 2005-09-02 13:26:17Z sskracic $
+ * @version $Id: DomainCopier.java 1942 2009-05-29 07:53:23Z terry $
*/
class DomainCopier extends DomainService {
- public static final String versionId =
- "$Id: DomainCopier.java 754 2005-09-02 13:26:17Z sskracic $" +
- "$Author: sskracic $" +
- "$DateTime: 2004/08/17 23:15:09 $";
private static Logger s_log = Logger.getLogger(DomainCopier.class);
diff --git a/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java b/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java
index 7bbe565f4..7ee635f34 100755
--- a/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java
+++ b/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java
@@ -14,12 +14,10 @@ import com.arsdigita.xml.Element;
* your content types may have.
*
* @author Fabrice Retkowsky (fabrice@runtime-collective.com)
- * @version $Revision: #17 $ $Date: 2004/08/17 $
+ * @version $Id: ContentType.java 285 2005-02-22 00:29:02Z sskracic $
*/
public interface ExtraXMLGenerator {
- public static final String versionId = "$Id: ContentType.java 285 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
/**
* Specify the XML for a given content item.
*/
diff --git a/ccm-cms/src/com/arsdigita/cms/FileAsset.java b/ccm-cms/src/com/arsdigita/cms/FileAsset.java
index f5f8d28f5..559973ba1 100755
--- a/ccm-cms/src/com/arsdigita/cms/FileAsset.java
+++ b/ccm-cms/src/com/arsdigita/cms/FileAsset.java
@@ -39,12 +39,10 @@ import java.util.Locale;
* file, such as an image.
*
* @author Scott Seago (scott@arsdigita.com)
- * @version $Revision: #15 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: FileAsset.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class FileAsset extends BinaryAsset {
- public static final String versionId = "$Id: FileAsset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.cms.FileAsset";
diff --git a/ccm-cms/src/com/arsdigita/cms/FileAssetCollection.java b/ccm-cms/src/com/arsdigita/cms/FileAssetCollection.java
index dd537cdf4..36da5abe1 100755
--- a/ccm-cms/src/com/arsdigita/cms/FileAssetCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/FileAssetCollection.java
@@ -27,16 +27,15 @@ import com.arsdigita.persistence.PersistenceException;
/**
* This class contains a collection of files.
*
- * @author Scott Seago
- * @version 1.0
- *
* @see com.arsdigita.domain.DomainCollection
* @see com.arsdigita.persistence.DataCollection
+ *
+ * @author Scott Seago
+ * @version 1.0
+ * @version $Id: FileAssetCollection.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class FileAssetCollection extends DomainCollection {
- public static final String versionId = "$Id: FileAssetCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
/**
* Constructor.
*
diff --git a/ccm-cms/src/com/arsdigita/cms/Folder.java b/ccm-cms/src/com/arsdigita/cms/Folder.java
index d9ff7e9d3..531db831c 100755
--- a/ccm-cms/src/com/arsdigita/cms/Folder.java
+++ b/ccm-cms/src/com/arsdigita/cms/Folder.java
@@ -70,10 +70,6 @@ import java.util.Iterator;
* @version $Id: Folder.java 1639 2007-09-17 13:20:13Z chrisg23 $
*/
public class Folder extends ContentItem {
- public static final String versionId =
- "$Id: Folder.java 1639 2007-09-17 13:20:13Z chrisg23 $" +
- "$Author: chrisg23 $" +
- "$DateTime: 2004/08/17 23:15:09 $";
private static final Logger s_log = Logger.getLogger(Folder.class);
diff --git a/ccm-cms/src/com/arsdigita/cms/ImageAsset.java b/ccm-cms/src/com/arsdigita/cms/ImageAsset.java
index 0da19767a..97e8f6d67 100755
--- a/ccm-cms/src/com/arsdigita/cms/ImageAsset.java
+++ b/ccm-cms/src/com/arsdigita/cms/ImageAsset.java
@@ -49,13 +49,9 @@ import org.apache.log4j.Logger;
* @author Jack Chung
* @author Stanislav Freidin
*
- * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: ImageAsset.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class ImageAsset extends BinaryAsset {
- public static final String versionId =
- "$Id: ImageAsset.java 287 2005-02-22 00:29:02Z sskracic $" +
- "$Author: sskracic $" +
- "$DateTime: 2004/08/17 23:15:09 $";
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.cms.ImageAsset";
diff --git a/ccm-cms/src/com/arsdigita/cms/ImageAssetCollection.java b/ccm-cms/src/com/arsdigita/cms/ImageAssetCollection.java
index 6062f8714..b7e7a5809 100755
--- a/ccm-cms/src/com/arsdigita/cms/ImageAssetCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/ImageAssetCollection.java
@@ -27,16 +27,15 @@ import com.arsdigita.persistence.PersistenceException;
/**
* This class contains a collection of images.
*
- * @author Jack Chung
- * @version 1.0
- *
* @see com.arsdigita.domain.DomainCollection
* @see com.arsdigita.persistence.DataCollection
+ *
+ * @author Jack Chung
+ * @version 1.0
+ * @version $Id: ImageAssetCollection.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class ImageAssetCollection extends DomainCollection {
- public static final String versionId = "$Id: ImageAssetCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
/**
* Constructor.
*
diff --git a/ccm-cms/src/com/arsdigita/cms/Initializer.java b/ccm-cms/src/com/arsdigita/cms/Initializer.java
index 720fcbab7..723ff9671 100755
--- a/ccm-cms/src/com/arsdigita/cms/Initializer.java
+++ b/ccm-cms/src/com/arsdigita/cms/Initializer.java
@@ -83,7 +83,7 @@ import com.arsdigita.cms.util.LanguageUtil;
* The CMS initializer.
*
* @author Justin Ross <jross@redhat.com>
- * @version $Id: Initializer.java 1428 2007-01-24 12:39:56Z sskracic $
+ * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class Initializer extends CompoundInitializer {
@@ -106,6 +106,9 @@ public class Initializer extends CompoundInitializer {
/**
* Initializes domain-coupling machinery, usually consisting of
* registering object instantiators and observers.
+ *
+ * This starts up the search threads according to the values in the
+ * properties file
*/
public void init(DomainInitEvent e) {
super.init(e);
@@ -170,6 +173,19 @@ public class Initializer extends CompoundInitializer {
XML.parse(ContentSection.getConfig().getItemAdapters(),
new TraversalHandler());
+ // Just set the class implementing methods run when for publishing
+ // or unpublishing to file. No initialisation of the class here.
+ try {
+ QueueManager.setListener((PublishToFileListener)
+ ContentSection.getConfig()
+ .getPublishToFileClass().newInstance());
+ } catch (InstantiationException ex) {
+ throw new UncheckedWrapperException
+ ("Failed to instantiate the listener class", ex);
+ } catch (IllegalAccessException ex) {
+ throw new UncheckedWrapperException
+ ("Couldn't access the listener class", ex);
+ }
MetadataProviderRegistry.registerAdapter(
FileAsset.BASE_DATA_OBJECT_TYPE,
diff --git a/ccm-cms/src/com/arsdigita/cms/ItemSelectionModel.java b/ccm-cms/src/com/arsdigita/cms/ItemSelectionModel.java
index 3e915c06e..96e0367df 100755
--- a/ccm-cms/src/com/arsdigita/cms/ItemSelectionModel.java
+++ b/ccm-cms/src/com/arsdigita/cms/ItemSelectionModel.java
@@ -47,8 +47,6 @@ import java.math.BigDecimal;
*/
public class ItemSelectionModel extends ACSObjectSelectionModel {
- public static final String versionId = "$Id: ItemSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
private BigDecimal m_typeId;
private static final Logger s_log =
diff --git a/ccm-cms/src/com/arsdigita/cms/ItemTemplateCollection.java b/ccm-cms/src/com/arsdigita/cms/ItemTemplateCollection.java
index 109cc9136..9e724ca0f 100755
--- a/ccm-cms/src/com/arsdigita/cms/ItemTemplateCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/ItemTemplateCollection.java
@@ -29,13 +29,12 @@ import com.arsdigita.mimetypes.MimeType;
* com.arsdigita.cms.ItemTemplateMapping item template mappings}.
*
* @author Stanislav Freidin (sfreidin@arsdigita.com)
- * @version $Id: ItemTemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: ItemTemplateCollection.java 1940 2009-05-29 07:15:05Z terry $
* @see com.arsdigita.domain.DomainCollection
* @see com.arsdigita.persistence.DataCollection
* @see com.arsdigita.cms.ItemTemplateCollection
*/
class ItemTemplateCollection extends TemplateCollection {
- public static final String versionId = "$Id: ItemTemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
/**
* Constructor.
diff --git a/ccm-cms/src/com/arsdigita/cms/ItemTemplateMapping.java b/ccm-cms/src/com/arsdigita/cms/ItemTemplateMapping.java
index 2fdf9882a..793ae8a68 100755
--- a/ccm-cms/src/com/arsdigita/cms/ItemTemplateMapping.java
+++ b/ccm-cms/src/com/arsdigita/cms/ItemTemplateMapping.java
@@ -38,7 +38,7 @@ import java.math.BigDecimal;
* internal templating implementation.
*
* @author Stanislav Freidin (sfreidin@arsdigita.com)
- * @version $Id: ItemTemplateMapping.java 754 2005-09-02 13:26:17Z sskracic $
+ * @version $Id: ItemTemplateMapping.java 1940 2009-05-29 07:15:05Z terry $
*/
public class ItemTemplateMapping extends TemplateMapping {
diff --git a/ccm-cms/src/com/arsdigita/cms/Loader.java b/ccm-cms/src/com/arsdigita/cms/Loader.java
index 6b1aa242b..18e054fad 100755
--- a/ccm-cms/src/com/arsdigita/cms/Loader.java
+++ b/ccm-cms/src/com/arsdigita/cms/Loader.java
@@ -26,7 +26,7 @@ import org.apache.log4j.Logger;
* The CMS loader.
*
* @author Justin Ross <jross@redhat.com>
- * @version $Id: Loader.java 754 2005-09-02 13:26:17Z sskracic $
+ * @version $Id: Loader.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class Loader extends PackageLoader {
diff --git a/ccm-cms/src/com/arsdigita/cms/ObjectCopier.java b/ccm-cms/src/com/arsdigita/cms/ObjectCopier.java
index 2951eaa4b..07d93d4e0 100755
--- a/ccm-cms/src/com/arsdigita/cms/ObjectCopier.java
+++ b/ccm-cms/src/com/arsdigita/cms/ObjectCopier.java
@@ -52,15 +52,11 @@ import org.apache.log4j.Logger;
* * * @author Stanislav Freidin - * @version $Id: ObjectCopier.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: ObjectCopier.java 1942 2009-05-29 07:53:23Z terry $ * @see ContentItem * @see ContentItem#copyProperty(ContentItem, String, ItemCopier) */ class ObjectCopier extends DomainCopier implements ItemCopier { - public static final String versionId = - "$Id: ObjectCopier.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(ObjectCopier.class); diff --git a/ccm-cms/src/com/arsdigita/cms/PageLocations.java b/ccm-cms/src/com/arsdigita/cms/PageLocations.java index 2988d60fe..383b43fd3 100755 --- a/ccm-cms/src/com/arsdigita/cms/PageLocations.java +++ b/ccm-cms/src/com/arsdigita/cms/PageLocations.java @@ -24,12 +24,9 @@ package com.arsdigita.cms; * * @author Karl Goldstein (karlg at arsdigita dot com) * - * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: PageLocations.java 287 2005-02-22 00:29:02Z sskracic $ **/ public interface PageLocations { - - public String versionId = "$Id: PageLocations.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public String SECTION_PAGE = "admin/index.jsp"; public String ITEM_PAGE = "admin/item.jsp"; } diff --git a/ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java b/ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java index b4bc973a2..d44d6ddd2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java @@ -48,13 +48,9 @@ import org.apache.log4j.Logger; * @author Scott Seago (sseago@redhat.com) * @author Stanislav Freidin * - * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ReusableImageAsset.java 754 2005-09-02 13:26:17Z sskracic $ */ public class ReusableImageAsset extends ImageAsset { - public static final String versionId = - "$Id: ReusableImageAsset.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger( ReusableImageAsset.class ); diff --git a/ccm-cms/src/com/arsdigita/cms/SearchFormatter.java b/ccm-cms/src/com/arsdigita/cms/SearchFormatter.java index 2c5429345..76c2d064f 100755 --- a/ccm-cms/src/com/arsdigita/cms/SearchFormatter.java +++ b/ccm-cms/src/com/arsdigita/cms/SearchFormatter.java @@ -25,7 +25,7 @@ import java.util.StringTokenizer; * search queries * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: SearchFormatter.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SearchFormatter.java 2070 2010-01-28 08:47:41Z pboy $ */ public class SearchFormatter { diff --git a/ccm-cms/src/com/arsdigita/cms/SectionLocaleCollection.java b/ccm-cms/src/com/arsdigita/cms/SectionLocaleCollection.java index 8d93c4a7d..fe98f13c9 100755 --- a/ccm-cms/src/com/arsdigita/cms/SectionLocaleCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/SectionLocaleCollection.java @@ -28,16 +28,14 @@ import com.arsdigita.persistence.DataCollection; * This class contains a collection of Locales associated with a * {@link com.arsdigita.cms.ContentSection}. * - * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ - * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection + * + * @author Michael Pih (pihman@arsdigita.com) + * @version $Id: SectionLocaleCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SectionLocaleCollection extends DomainCollection { - public static final String versionId = "$Id: SectionLocaleCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. */ diff --git a/ccm-cms/src/com/arsdigita/cms/SectionTemplateCollection.java b/ccm-cms/src/com/arsdigita/cms/SectionTemplateCollection.java index 372df6ced..2a7420129 100755 --- a/ccm-cms/src/com/arsdigita/cms/SectionTemplateCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/SectionTemplateCollection.java @@ -25,7 +25,7 @@ import com.arsdigita.persistence.DataCollection; * This class contains a collection of {@link SectionTemplateMapping}s * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: SectionTemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SectionTemplateCollection.java 1940 2009-05-29 07:15:05Z terry $ * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection @@ -33,8 +33,6 @@ import com.arsdigita.persistence.DataCollection; */ class SectionTemplateCollection extends TemplateCollection { - public static final String versionId = "$Id: SectionTemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. * diff --git a/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java b/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java index 2afda201e..72fc906a9 100755 --- a/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java +++ b/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java @@ -38,12 +38,10 @@ import org.apache.log4j.Logger; * internal templating implementation. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: SectionTemplateMapping.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SectionTemplateMapping.java 1940 2009-05-29 07:15:05Z terry $ */ public class SectionTemplateMapping extends TemplateMapping { - public static final String versionId = "$Id: SectionTemplateMapping.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.SectionTemplateMapping"; diff --git a/ccm-cms/src/com/arsdigita/cms/Security.java b/ccm-cms/src/com/arsdigita/cms/Security.java index 69dfa94ce..e55431ef1 100755 --- a/ccm-cms/src/com/arsdigita/cms/Security.java +++ b/ccm-cms/src/com/arsdigita/cms/Security.java @@ -28,12 +28,10 @@ import com.arsdigita.kernel.Party; *
An interface for making access checks within a content section.
* * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: Security.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface Security { - public static final String versionId = "$Id: Security.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Determine whether a party has access to a particular action. * diff --git a/ccm-cms/src/com/arsdigita/cms/SecurityManager.java b/ccm-cms/src/com/arsdigita/cms/SecurityManager.java index cd4eb1cac..8c6fc8957 100755 --- a/ccm-cms/src/com/arsdigita/cms/SecurityManager.java +++ b/ccm-cms/src/com/arsdigita/cms/SecurityManager.java @@ -49,13 +49,9 @@ import org.apache.log4j.Logger; * CMS. * * @author Michael Pih - * @version $Revision: #24 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SecurityManager.java 1344 2006-10-10 09:41:56Z sskracic $ */ public class SecurityManager implements Security, SecurityConstants { - public static final String versionId = - "$Id: SecurityManager.java 1344 2006-10-10 09:41:56Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (SecurityManager.class); diff --git a/ccm-cms/src/com/arsdigita/cms/Template.java b/ccm-cms/src/com/arsdigita/cms/Template.java index 5a05bc551..d320f64dd 100755 --- a/ccm-cms/src/com/arsdigita/cms/Template.java +++ b/ccm-cms/src/com/arsdigita/cms/Template.java @@ -34,7 +34,7 @@ import java.util.Map; * * @author Stanislav Freidin (sfreidin@arsdigita.com) * - * @version $Id: Template.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: Template.java 1942 2009-05-29 07:53:23Z terry $ */ public class Template extends TextAsset { diff --git a/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java b/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java index b0a19135d..c4efe550c 100755 --- a/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java @@ -30,7 +30,7 @@ import com.arsdigita.mimetypes.MimeType; * link attributes. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: TemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TemplateCollection.java 1940 2009-05-29 07:15:05Z terry $ * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection @@ -38,8 +38,6 @@ import com.arsdigita.mimetypes.MimeType; */ public abstract class TemplateCollection extends DomainCollection { - public static final String versionId = "$Id: TemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String USE_CONTEXT = "useContext"; public static final String IS_DEFAULT = "isDefault"; public static final String TEMPLATE = "template"; diff --git a/ccm-cms/src/com/arsdigita/cms/TemplateManager.java b/ccm-cms/src/com/arsdigita/cms/TemplateManager.java index ee5fca382..7bcfbbebd 100755 --- a/ccm-cms/src/com/arsdigita/cms/TemplateManager.java +++ b/ccm-cms/src/com/arsdigita/cms/TemplateManager.java @@ -60,11 +60,10 @@ import com.arsdigita.mimetypes.MimeType; * @author Karl Goldstein (karlg@arsdigita.com) * @author Stanislav Freidin (sfreidin@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: TemplateManager.java 287 2005-02-22 00:29:02Z sskracic $ **/ public interface TemplateManager { - public static final String versionId = "$Id: TemplateManager.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * The default use context for templates */ diff --git a/ccm-cms/src/com/arsdigita/cms/TemplateManagerFactory.java b/ccm-cms/src/com/arsdigita/cms/TemplateManagerFactory.java index 4dbba9205..b722cc792 100755 --- a/ccm-cms/src/com/arsdigita/cms/TemplateManagerFactory.java +++ b/ccm-cms/src/com/arsdigita/cms/TemplateManagerFactory.java @@ -26,11 +26,10 @@ package com.arsdigita.cms; * * @author Karl Goldstein (karlg@arsdigita.com) * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: TemplateManagerFactory.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TemplateManagerFactory { - public static final String versionId = "$Id: TemplateManagerFactory.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static TemplateManager s_templateManager = new DefaultTemplateManager(); diff --git a/ccm-cms/src/com/arsdigita/cms/TextAsset.java b/ccm-cms/src/com/arsdigita/cms/TextAsset.java index 7cce3b231..713bf272f 100755 --- a/ccm-cms/src/com/arsdigita/cms/TextAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/TextAsset.java @@ -37,11 +37,10 @@ import java.math.BigDecimal; * @author Jack Chung (flattop@arsdigita.com) * * @version $Revision: #14 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: TextAsset.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TextAsset extends Asset { - public static final String versionId = "$Id: TextAsset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.TextAsset"; diff --git a/ccm-cms/src/com/arsdigita/cms/TextPage.java b/ccm-cms/src/com/arsdigita/cms/TextPage.java index 3a456cd6e..c8aaa1c47 100755 --- a/ccm-cms/src/com/arsdigita/cms/TextPage.java +++ b/ccm-cms/src/com/arsdigita/cms/TextPage.java @@ -32,7 +32,7 @@ import java.math.BigDecimal; * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ - * @version $Id: TextPage.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TextPage.java 2070 2010-01-28 08:47:41Z pboy $ **/ public class TextPage extends ContentPage { diff --git a/ccm-cms/src/com/arsdigita/cms/VersionCopier.java b/ccm-cms/src/com/arsdigita/cms/VersionCopier.java index 9bc93f803..7c36e86f6 100755 --- a/ccm-cms/src/com/arsdigita/cms/VersionCopier.java +++ b/ccm-cms/src/com/arsdigita/cms/VersionCopier.java @@ -34,13 +34,9 @@ import java.util.HashSet; * point only to other live versions. * * @author Stanislav Freidin - * @version $Id: VersionCopier.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: VersionCopier.java 1942 2009-05-29 07:53:23Z terry $ */ class VersionCopier extends ObjectCopier { - public static final String versionId = - "$Id: VersionCopier.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(VersionCopier.class); diff --git a/ccm-cms/src/com/arsdigita/cms/VersionUpdater.java b/ccm-cms/src/com/arsdigita/cms/VersionUpdater.java index 28f882d34..651c32452 100755 --- a/ccm-cms/src/com/arsdigita/cms/VersionUpdater.java +++ b/ccm-cms/src/com/arsdigita/cms/VersionUpdater.java @@ -38,13 +38,11 @@ import java.util.Set; * or care about this class. * * @author Stanislav Freidin - * @version $Id: VersionUpdater.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: VersionUpdater.java 1940 2009-05-29 07:15:05Z terry $ */ class VersionUpdater extends DomainService { - public static final String versionId = "$Id: VersionUpdater.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(VersionUpdater.class); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java index 18005c926..cb72c7c27 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java @@ -36,7 +36,7 @@ import java.math.BigDecimal; * * @author Randy Graebner (randyg@redhat.com) * - * @version $Id: ContentGroup.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentGroup.java 1967 2009-08-29 21:05:51Z pboy $ */ public class ContentGroup extends ContentItem { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java index 1e9ae4d6a..057ed9a01 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java @@ -39,7 +39,7 @@ import com.arsdigita.util.Assert; * * @author Randy Graebner (randyg@redhat.com) * - * @version $Id: ContentGroupAssociation.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentGroupAssociation.java 1967 2009-08-29 21:05:51Z pboy $ */ public class ContentGroupAssociation extends ContentItem { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java index 2d5155971..bc9b3d61a 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java @@ -50,11 +50,10 @@ import java.math.BigDecimal; /** * This displays a sortable list of items within a given content group * - * @version $Id: ContentGroupItemList.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentGroupItemList.java 1967 2009-08-29 21:05:51Z pboy $ */ class ContentGroupItemList extends SortableList { - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(ContentGroupItemList.class); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java index b8527f977..ebca00eac 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java @@ -36,7 +36,7 @@ import java.math.BigDecimal; * be nice about it. * * @author Hugh Brock (hbrock@redhat.com) - * @version $Id: ImageDisplay.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ImageDisplay.java 1967 2009-08-29 21:05:51Z pboy $ */ public class ImageDisplay extends SimpleComponent { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java index 9432f0776..c2f9d2410 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java @@ -39,7 +39,7 @@ import javax.servlet.ServletException; /** * - * @version $Id: BaseAsset.java 1571 2007-04-20 15:57:54Z apevec $ + * @version $Id: BaseAsset.java 1967 2009-08-29 21:05:51Z pboy $ */ class BaseAsset extends ResourceHandlerImpl { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java index f9d0d29ff..0cbc30610 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java @@ -101,7 +101,7 @@ import org.apache.log4j.Logger; * @author Michael Pih (pihman@arsdigita.com) * @author Uday Mathur (umathur@arsdigita.com) * @author Jack Chung (flattop@arsdigita.com) - * @version $Id: CMSDispatcher.java 1795 2009-02-07 10:47:32Z pboy $ + * @version $Id: CMSDispatcher.java 1967 2009-08-29 21:05:51Z pboy $ */ public class CMSDispatcher implements Dispatcher, ChainedDispatcher { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java index 913edc939..1fdbc808f 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java @@ -68,7 +68,7 @@ import org.apache.log4j.Logger; * * @author Michael Pih (pihman@arsdigita.com) * @author Uday Mathur (umathur@arsdigita.com) - * @version $Id: CMSPage.java 1312 2006-09-04 11:26:55Z sskracic $ + * @version $Id: CMSPage.java 1967 2009-08-29 21:05:51Z pboy $ */ public class CMSPage extends Page implements ResourceHandler { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java index fc320cc98..6b93fb329 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java @@ -22,7 +22,7 @@ package com.arsdigita.cms.dispatcher; *An interface for caching objects.
* * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: Cache.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Cache.java 1967 2009-08-29 21:05:51Z pboy $ */ public interface Cache { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java index 246ea052b..7a715602d 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java @@ -66,7 +66,7 @@ import org.apache.log4j.Logger; * * * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: ContentCenterDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentCenterDispatcher.java 1967 2009-08-29 21:05:51Z pboy $ */ public class ContentCenterDispatcher extends LockableImpl implements Dispatcher { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/FileDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/FileDispatcher.java index c84dea9f6..de0a30869 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/FileDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/FileDispatcher.java @@ -38,11 +38,10 @@ import org.apache.log4j.Logger; * * @author Karl Goldstein (karlg@arsdigita.com) * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: FileDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class FileDispatcher implements ChainedDispatcher { - public static final String versionId = "$Id: FileDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(ChainedDispatcher.class); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemResolver.java index 07848dc83..6e7d398d7 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemResolver.java @@ -45,11 +45,11 @@ import java.math.BigDecimal; * * @author Michael Pih (pihman@arsdigita.com) * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ */ + * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ItemResolver.java 287 2005-02-22 00:29:02Z sskracic $ + */ public interface ItemResolver { - public static final String versionId = "$Id: ItemResolver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Return a content item based on section, url, and use context. * diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/MasterPage.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/MasterPage.java index 335028e41..ef5921f4e 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/MasterPage.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/MasterPage.java @@ -35,11 +35,10 @@ import javax.servlet.http.HttpServletRequest; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: MasterPage.java 287 2005-02-22 00:29:02Z sskracic $ */ public class MasterPage extends CMSPage { - public static final String versionId = "$Id: MasterPage.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public MasterPage() { super("Master", new SimpleContainer()); setIdAttr("master_page"); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java index 7bd3a88bd..5d3269a23 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java @@ -48,7 +48,7 @@ import java.util.StringTokenizer; * Created Mon Jan 20 14:30:03 2003. * * @author Michael Hanisch - * @version $Id: MultilingualItemResolver.java 1795 2009-02-07 10:47:32Z pboy $ + * @version $Id: MultilingualItemResolver.java 2026 2009-11-02 10:04:34Z pboy $ */ public class MultilingualItemResolver extends AbstractItemResolver implements ItemResolver { @@ -57,7 +57,7 @@ public class MultilingualItemResolver extends AbstractItemResolver implements It private static MasterPage s_masterP = null; private static final String ADMIN_PREFIX = "admin"; - + /** * The string identifying an item's ID in the query string of a * URL. @@ -659,7 +659,7 @@ public class MultilingualItemResolver extends AbstractItemResolver implements It pos++; // skip the "=" - // ID is the string between the isEqual (at pos) and the next separator + // ID is the string between the equal (at pos) and the next separator int i = item_id.indexOf(SEPARATOR); item_id = item_id.substring(pos, Math.min(i, item_id.length() -1)); @@ -691,48 +691,48 @@ public class MultilingualItemResolver extends AbstractItemResolver implements It Folder parentFolder) { if (s_log.isDebugEnabled()) { s_log.debug("Resolving the item for live URL " + url + - " and parent folder " + parentFolder); + " and parent folder " + parentFolder); } - + if (parentFolder == null || url == null || url.equals("")) { if (s_log.isDebugEnabled()) { s_log.debug("The url is null or parent folder was null " + - "or something else is wrong, so just return " + - "the parent folder"); + "or something else is wrong, so just return " + + "the parent folder"); } - + return parentFolder; } - + int len = url.length(); int index = url.indexOf('/'); - + if (index >= 0) { s_log.debug("The URL starts with a slash; paring off the first " + - "URL element and recursing"); - + "URL element and recursing"); + // If we got first slash (index == 0), ignore it and go // on, sample '/foo/bar/item.html.en', in next recursion // will have deal with 'foo' folder. - + String name = index > 0 ? url.substring(0, index) : ""; parentFolder = "".equals(name) ? parentFolder : (Folder) parentFolder.getItem(URLEncoder.encode(name), true); url = index + 1 < len ? url.substring(index + 1) : ""; - + return getItemFromLiveURL(url, parentFolder); } else { s_log.debug("Found a file element in the URL"); - - String[] nameAndLang = getNameAndLangFromURLFrag(url); + + String[] nameAndLang = getNameAndLangFromURLFrag(url); String name = nameAndLang[0]; String lang = nameAndLang[1]; - + ContentItem item = parentFolder.getItem(URLEncoder.encode(name), false); - return getItemFromLangAndBundle(lang, item); + return getItemFromLangAndBundle(lang, item); } } - + /** * Returns an array containing the the item's name and lang based * on the URL fragment. diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/PageResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/PageResolver.java index 482c2483c..00341a41d 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/PageResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/PageResolver.java @@ -32,11 +32,10 @@ import java.util.HashMap; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #8 $ $Date: 2004/08/17 $ + * @version $Id: PageResolver.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class PageResolver { - public static final String versionId = "$Id: PageResolver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private BigDecimal m_sectionID; // Used for caching pages diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Resource.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Resource.java index 4fc2a23c7..7817858fe 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Resource.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Resource.java @@ -39,11 +39,10 @@ import java.sql.SQLException; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: Resource.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Resource extends DomainObject { - public static final String versionId = "$Id: Resource.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.Resource"; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandler.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandler.java index 7a2cf0361..5ea75baf6 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandler.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandler.java @@ -31,11 +31,10 @@ import javax.servlet.http.HttpServletRequest; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ResourceHandler.java 287 2005-02-22 00:29:02Z sskracic $ **/ public interface ResourceHandler extends Dispatcher { - public static final String versionId = "$Id: ResourceHandler.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * This method is called by the {@link com.arsdigita.dispatcher.Dispatcher} * that initializes this page. diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandlerImpl.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandlerImpl.java index 71b434bdd..839adf48f 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandlerImpl.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandlerImpl.java @@ -41,12 +41,10 @@ import javax.servlet.http.HttpServletResponse; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ResourceHandlerImpl.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class ResourceHandlerImpl implements ResourceHandler { - public static final String versionId = "$Id: ResourceHandlerImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - - /** * This method is called by the {@link com.arsdigita.dispatcher.Dispatcher} * that initializes this page. diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceMapping.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceMapping.java index bee290224..e8aac641d 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceMapping.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceMapping.java @@ -33,11 +33,10 @@ import java.math.BigDecimal; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ResourceMapping.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class ResourceMapping extends DomainObject { - public static final String versionId = "$Id: ResourceMapping.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String TYPE = "com.arsdigita.cms.ResourceMapping"; private static final String SECTION_ID = "sectionId"; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceType.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceType.java index b29314240..bfc3c6b4f 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceType.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceType.java @@ -36,11 +36,10 @@ import com.arsdigita.persistence.SessionManager; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ - **/ + * @version $Id: ResourceType.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ResourceType extends DomainObject { - public static final String versionId = "$Id: ResourceType.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.ResourceType"; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java index 0a5e8563c..b1b14b34c 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java @@ -68,12 +68,10 @@ import java.util.Map; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ServiceDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ServiceDispatcher extends LockableImpl implements Dispatcher { - public static final String versionId = "$Id: ServiceDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - - /** * The path of the file that maps resources. */ diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleCache.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleCache.java index 1675cb2cf..02791b3a6 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleCache.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleCache.java @@ -26,11 +26,10 @@ import java.util.Map; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SimpleCache.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SimpleCache extends Hashtable{ - public static final String versionId = "$Id: SimpleCache.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public SimpleCache() { super(); } diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleItemResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleItemResolver.java index 72a128da8..9d12ebfeb 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleItemResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleItemResolver.java @@ -55,11 +55,10 @@ import java.util.StringTokenizer; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #15 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SimpleItemResolver.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SimpleItemResolver extends AbstractItemResolver implements ItemResolver { - public static final String versionId = "$Id: SimpleItemResolver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(SimpleItemResolver.class.getName()); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimplePageResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimplePageResolver.java index c5d59771f..eddc6571f 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimplePageResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimplePageResolver.java @@ -39,12 +39,9 @@ import javax.servlet.ServletException; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #11 $ $Date: 2004/08/17 $ + * @version $Id: SimplePageResolver.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SimplePageResolver extends PageResolver { - public static final String versionId = - "$Id: SimplePageResolver.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (SimplePageResolver.class); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java index 5b3ea8ac7..cbb75a117 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java @@ -51,11 +51,10 @@ import java.util.Iterator; * * @author Michael Pih * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SimpleXMLGenerator.java 1651 2007-09-18 10:30:06Z chrisg23 $ */ public class SimpleXMLGenerator implements XMLGenerator { - public static final String versionId = "$Id: SimpleXMLGenerator.java 1651 2007-09-18 10:30:06Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(SimpleXMLGenerator.class); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java index cb14de400..7d60d786d 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java @@ -30,11 +30,10 @@ import com.arsdigita.cms.BinaryAsset; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: StreamAsset.java 1166 2006-06-14 11:45:15Z fabrice $ */ public class StreamAsset extends BaseAsset { - public static final String versionId = "$Id: StreamAsset.java 1166 2006-06-14 11:45:15Z fabrice $ by $Author: fabrice $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(StreamAsset.class); public final static String ASSET_ID = BaseAsset.ASSET_ID; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamImage.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamImage.java index a80c993ea..7f5df4671 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamImage.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamImage.java @@ -48,11 +48,10 @@ import org.apache.log4j.Logger; * @author Stanislav Freidin (sfreidin@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: StreamImage.java 1571 2007-04-20 15:57:54Z apevec $ */ public class StreamImage extends ResourceHandlerImpl { - public static final String versionId = "$Id: StreamImage.java 1571 2007-04-20 15:57:54Z apevec $ by $Author: apevec $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String IMAGE_ID = "image_id"; public static final String OID_PARAM = "oid"; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java index 84065b4a4..7b77c4a52 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java @@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletRequest; * * * @author Karl Goldstein (karlg@arsdigita.com) - * @version $Id: TemplateResolver.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TemplateResolver.java 1967 2009-08-29 21:05:51Z pboy $ **/ public interface TemplateResolver { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java index 2f5025c30..59394574c 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java @@ -50,7 +50,7 @@ import java.util.Map; * System. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: Utilities.java 1546 2007-03-28 14:28:57Z chrisgilbert23 $ + * @version $Id: Utilities.java 1967 2009-08-29 21:05:51Z pboy $ */ public class Utilities { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java index ed494dc27..b72a9dced 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java @@ -36,7 +36,7 @@ import com.arsdigita.xml.Element; * formats it as an XML document. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: XMLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: XMLGenerator.java 1967 2009-08-29 21:05:51Z pboy $ */ public interface XMLGenerator { diff --git a/ccm-cms/src/com/arsdigita/cms/enterprise.init b/ccm-cms/src/com/arsdigita/cms/enterprise.init index fed704e33..883cf6af7 100755 --- a/ccm-cms/src/com/arsdigita/cms/enterprise.init +++ b/ccm-cms/src/com/arsdigita/cms/enterprise.init @@ -1,6 +1,6 @@ // CMS initialization file // -// $Id: enterprise.init 1357 2006-11-06 13:02:24Z sskracic $ +// $Id: enterprise.init 2070 2010-01-28 08:47:41Z pboy $ // init com.arsdigita.cms.installer.Initializer { @@ -28,7 +28,6 @@ init com.arsdigita.cms.installer.SectionInitializer { // in integrations.properties of the respective bundle // - registerDomain(navigationKey, "/content/", null); in ldn.aplaws.Loader name = "content"; -//-- name = "intern"; // List of roles to create. First field is role name, // second is the description, third is a list of @@ -87,7 +86,6 @@ init com.arsdigita.cms.installer.SectionInitializer { // Wether to make content viewable to 'The Public', ie non-registered users public = true; -//-- public = false; // When to generate email alerts: by default, generate email alerts // on enable, finish, and rollback (happens on rejection) diff --git a/ccm-cms/src/com/arsdigita/cms/installer/SectionInitializer.java b/ccm-cms/src/com/arsdigita/cms/installer/SectionInitializer.java index 14aae18ce..2683f2ce6 100755 --- a/ccm-cms/src/com/arsdigita/cms/installer/SectionInitializer.java +++ b/ccm-cms/src/com/arsdigita/cms/installer/SectionInitializer.java @@ -44,19 +44,17 @@ import java.util.Timer; * section, thetypes is a list of content types
* to register
*
- * @author Daniel Berrange (berrange@redhat.com)
- * @author Michael Pih
- * @version $Revision: #43 $ $DateTime: 2004/08/17 23:15:09 $
- *
* XXX As of version 6.5 (pboy):
* Commented out in cms.enterprise.init since several versions. Not invoked by
* any other package of trunk. Some Parameters (as ITEM_RESOLVER_CLASS) are
* configured in ContentSectionConfig.java as a temporary measure.
+ *
+ * @author Daniel Berrange (berrange@redhat.com)
+ * @author Michael Pih
+ * @version $Id: SectionInitializer.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class SectionInitializer extends com.arsdigita.kernel.BaseInitializer {
- public static final String versionId = "$Id: SectionInitializer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
private static org.apache.log4j.Logger s_log =
org.apache.log4j.Logger.getLogger(SectionInitializer.class);
diff --git a/ccm-cms/src/com/arsdigita/cms/installer/ServiceInstaller.java b/ccm-cms/src/com/arsdigita/cms/installer/ServiceInstaller.java
index a748051c8..800b0e461 100755
--- a/ccm-cms/src/com/arsdigita/cms/installer/ServiceInstaller.java
+++ b/ccm-cms/src/com/arsdigita/cms/installer/ServiceInstaller.java
@@ -33,11 +33,10 @@ import com.arsdigita.kernel.SiteNode;
*
* @author Michael Pih (pihman@arsdigita.com)
* @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: ServiceInstaller.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class ServiceInstaller implements PackageEventListener {
- public static final String versionId = "$Id: ServiceInstaller.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
public final static String PACKAGE_KEY = "cms-service";
diff --git a/ccm-cms/src/com/arsdigita/cms/installer/WorkspaceInstaller.java b/ccm-cms/src/com/arsdigita/cms/installer/WorkspaceInstaller.java
index 638c3f7fb..152c4d8f0 100755
--- a/ccm-cms/src/com/arsdigita/cms/installer/WorkspaceInstaller.java
+++ b/ccm-cms/src/com/arsdigita/cms/installer/WorkspaceInstaller.java
@@ -34,11 +34,10 @@ import com.arsdigita.kernel.Stylesheet;
* @author Michael Pih (pihman@arsdigita.com)
* @author Jack Chung (flattop@arsdigita.com)
* @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: WorkspaceInstaller.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class WorkspaceInstaller implements PackageEventListener {
- public static final String versionId = "$Id: WorkspaceInstaller.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
public static final String PACKAGE_KEY = "content-center";
private static final String INSTANCE_NAME = "Content Center";
private static final String DISPATCHER_CLASS =
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Duration.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Duration.java
index 602e443f8..3bbcf30b0 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Duration.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Duration.java
@@ -25,7 +25,7 @@ import com.arsdigita.util.Assert;
*
* @author Michael Pih (pihman@arsdigita.com)
* @version $Revision: #11 $ $Date: 2004/08/17 $
- * @version $Id: Duration.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: Duration.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class Duration {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java
index 166b4a05f..e422c6e86 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java
@@ -34,7 +34,7 @@ import org.apache.log4j.Logger;
* to the list of initializers to be executed
*
* @author Peter Boy (pboy@barkhof.uni-bremen.de)
- * @version $Id: $
+ * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $
*
*/
public class Initializer extends com.arsdigita.runtime.GenericInitializer {
@@ -78,7 +78,7 @@ public class Initializer extends com.arsdigita.runtime.GenericInitializer {
}
s_log.debug("lifecycle background processing started");
- }
+ }
/**
*
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Lifecycle.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Lifecycle.java
index d3328b180..6970a7ede 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Lifecycle.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Lifecycle.java
@@ -44,7 +44,7 @@ import java.util.Date;
* @author Jack Chung
* @author Michael Pih
* @version $Revision: 1.1 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: Lifecycle.java 1585 2007-05-29 13:12:44Z chrisgilbert23 $
+ * @version $Id: Lifecycle.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class Lifecycle extends ACSObject {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinition.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinition.java
index 2ba7b3a81..0ee44b841 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinition.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinition.java
@@ -39,7 +39,7 @@ import java.util.Date;
* @author Jack Chung (flattop@arsdigita.com)
* @author Michael Pih (pihman@arsdigita.com)
* @version $Revision: #14 $ $Date: 2004/08/17 $
- * @version $Id: LifecycleDefinition.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: LifecycleDefinition.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class LifecycleDefinition extends ACSObject {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinitionCollection.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinitionCollection.java
index 23dc636d7..d53aa6153 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinitionCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinitionCollection.java
@@ -29,7 +29,7 @@ import com.arsdigita.persistence.DataCollection;
*
* @author Jack Chung (flattop@arsdigita.com)
* @version $Revision: #8 $ $Date: 2004/08/17 $
- * @version $Id: LifecycleDefinitionCollection.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: LifecycleDefinitionCollection.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class LifecycleDefinitionCollection extends DomainCollection {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleEvent.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleEvent.java
index bedd45211..e978f40a8 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleEvent.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleEvent.java
@@ -29,7 +29,7 @@ import java.util.Date;
*
* @author Jack Chung (flattop@arsdigita.com)
* @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: LifecycleEvent.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: LifecycleEvent.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class LifecycleEvent {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleListener.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleListener.java
index 7ff0b568e..c5a835e23 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleListener.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleListener.java
@@ -25,7 +25,7 @@ package com.arsdigita.cms.lifecycle;
*
* @author Jack Chung (flattop@arsdigita.com)
* @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: LifecycleListener.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: LifecycleListener.java 2070 2010-01-28 08:47:41Z pboy $
*/
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleService.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleService.java
index 783573171..e93dd6f61 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleService.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleService.java
@@ -40,7 +40,7 @@ import java.sql.SQLException;
*
* @author Jack Chung (flattop@arsdigita.com)
* @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: LifecycleService.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: LifecycleService.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class LifecycleService extends DomainObject{
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Phase.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Phase.java
index bdb7ae2d6..20da8e32b 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Phase.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Phase.java
@@ -38,7 +38,7 @@ import java.util.Date;
* @author Jack Chung (flattop@arsdigita.com)
* @author Michael Pih (pihman@arsdigita.com)
* @version $Revision: 1.1 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: Phase.java 1583 2007-05-25 15:32:13Z chrisgilbert23 $
+ * @version $Id: Phase.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class Phase extends ACSObject {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java
index 24378c83d..76a7f5760 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java
@@ -30,7 +30,7 @@ import org.apache.log4j.Logger;
*
* @author Michael Pih
* @author Stanislav Freidin
- * @version $Id: PublishLifecycleListener.java 754 2005-09-02 13:26:17Z sskracic $
+ * @version $Id: PublishLifecycleListener.java 1942 2009-05-29 07:53:23Z terry $
*/
public class PublishLifecycleListener implements LifecycleListener {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Scheduler.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Scheduler.java
index 66007688b..98b0b80ea 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Scheduler.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Scheduler.java
@@ -44,7 +44,7 @@ import org.apache.log4j.Logger;
* @author Stanislav Freidin (stas@arsdigita.com)
* @author Michael Pih (pihman@arsdigita.com)
* @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: Scheduler.java 1583 2007-05-25 15:32:13Z chrisgilbert23 $
+ * @version $Id: Scheduler.java 2070 2010-01-28 08:47:41Z pboy $
*/
public class Scheduler {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/SchedulerTask.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/SchedulerTask.java
index ed5946091..21c0a10e5 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/SchedulerTask.java
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/SchedulerTask.java
@@ -29,7 +29,7 @@ import java.util.TimerTask;
* created by Scheduler. It simply calls the run method of Scheduler.
*
* @author Jack Chung (flattop@arsdigita.com)
- * @version $Id: SchedulerTask.java 754 2005-09-02 13:26:17Z sskracic $
+ * @version $Id: SchedulerTask.java 2070 2010-01-28 08:47:41Z pboy $
**/
class SchedulerTask extends TimerTask {
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html b/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html
index ffa436307..6d57f8161 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html
@@ -38,7 +38,7 @@
phase becomes active. The duration is the length of time that the
phase remains active.
- Last modified:
$Id: $
Last modified:
$Id: package.html 1967 2009-08-29 21:05:51Z pboy $