diff --git a/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java b/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java
index ffdc2bf96..24876c581 100755
--- a/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java
+++ b/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java
@@ -38,7 +38,7 @@ import java.io.OutputStream;
* @author Jack Chung
* @author Stanislav Freidin
*
- * @version $Id: BinaryAsset.java 2090 2010-04-17 08:04:14Z pboy $
+ * @version $Id: BinaryAsset.java 2245 2011-11-15 08:03:57Z pboy $
*/
public abstract class BinaryAsset extends Asset {
diff --git a/ccm-cms/src/com/arsdigita/cms/CMS.java b/ccm-cms/src/com/arsdigita/cms/CMS.java
index 23a000be1..f841946f6 100755
--- a/ccm-cms/src/com/arsdigita/cms/CMS.java
+++ b/ccm-cms/src/com/arsdigita/cms/CMS.java
@@ -30,7 +30,7 @@ import org.apache.log4j.Logger;
*
* @author Daniel Berrange
* @see com.arsdigita.kernel.Kernel
- * @version $Id: CMS.java 2167 2011-06-19 21:12:12Z pboy $
+ * @version $Id: CMS.java 2286 2012-03-11 09:14:14Z pboy $
*/
public abstract class CMS {
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
index 01403f752..4b11b656a 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java
@@ -56,7 +56,7 @@ import org.apache.log4j.Logger;
*
* @author Shashin Shinde
* @author Justin Ross <jross@redhat.com>
- * @version $Id: ContentBundle.java 2140 2011-01-16 12:04:20Z pboy $
+ * @version $Id: ContentBundle.java 2273 2012-01-20 00:21:50Z pboy $
*/
public class ContentBundle extends ContentItem {
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentItem.java b/ccm-cms/src/com/arsdigita/cms/ContentItem.java
index 0668b18e9..8ce46aa8b 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentItem.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentItem.java
@@ -186,7 +186,7 @@ import java.util.Set;
* @author Stanislav Freidin <sfreidin@redhat.com>
* @author Jens Pelzetter
*
- * @version $Id: ContentItem.java 2218 2011-06-22 23:55:36Z pboy $
+ * @version $Id: ContentItem.java 2305 2012-05-01 12:26:33Z pboy $
*/
public class ContentItem extends VersionedACSObject implements CustomCopy {
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSection.java b/ccm-cms/src/com/arsdigita/cms/ContentSection.java
index cf3fb87fd..cbe430cc3 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentSection.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentSection.java
@@ -92,7 +92,7 @@ import org.apache.log4j.Logger;
* @author Jack Chung
* @author Sören Bernstein (quasi@barkhof.uni-bremen.de)
* @version $Revision: #37 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: ContentSection.java 2209 2011-06-22 07:59:10Z pboy $
+ * @version $Id: ContentSection.java 2305 2012-05-01 12:26:33Z pboy $
*/
public class ContentSection extends Application {
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSectionCollection.java b/ccm-cms/src/com/arsdigita/cms/ContentSectionCollection.java
index 200aae4e0..f56f932a5 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentSectionCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentSectionCollection.java
@@ -30,7 +30,7 @@ import com.arsdigita.persistence.DataCollection;
* @see com.arsdigita.persistence.DataCollection
*
* @author Stanislav Freidin (sfreidin@arsdigita.com)
- * @version $Id: ContentSectionCollection.java 2140 2011-01-16 12:04:20Z pboy $
+ * @version $Id: ContentSectionCollection.java 2263 2012-01-08 17:43:22Z pboy $
*/
public class ContentSectionCollection extends DomainCollection {
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentType.java b/ccm-cms/src/com/arsdigita/cms/ContentType.java
index 86384a669..40fea2ec4 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentType.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentType.java
@@ -55,7 +55,7 @@ import java.util.StringTokenizer;
*
* @author Michael Pih (pihman@arsdigita.com)
* @author Jack Chung (flattop@arsdigita.com)
- * @version $Id: ContentType.java 2070 2010-01-28 08:47:41Z pboy $
+ * @version $Id: ContentType.java 2277 2012-02-22 15:23:49Z 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 a7dad9f2d..750429971 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java
@@ -31,7 +31,7 @@ import com.arsdigita.persistence.Filter;
* @see com.arsdigita.persistence.DataCollection
*
* @author Jack Chung (flattop@arsdigita.com)
- * @version $Id: ContentTypeCollection.java 2090 2010-04-17 08:04:14Z pboy $
+ * @version $Id: ContentTypeCollection.java 2263 2012-01-08 17:43:22Z pboy $
*/
public class ContentTypeCollection extends DomainCollection {
diff --git a/ccm-cms/src/com/arsdigita/cms/ImageAsset.java b/ccm-cms/src/com/arsdigita/cms/ImageAsset.java
index e170b5ca3..217d45db5 100755
--- a/ccm-cms/src/com/arsdigita/cms/ImageAsset.java
+++ b/ccm-cms/src/com/arsdigita/cms/ImageAsset.java
@@ -53,7 +53,7 @@ import org.apache.log4j.Logger;
* @author Jack Chung
* @author Stanislav Freidin
*
- * @version $Id: ImageAsset.java 2090 2010-04-17 08:04:14Z pboy $
+ * @version $Id: ImageAsset.java 2225 2011-08-02 18:53:56Z pboy $
*/
public class ImageAsset extends BinaryAsset {
diff --git a/ccm-cms/src/com/arsdigita/cms/Initializer.java b/ccm-cms/src/com/arsdigita/cms/Initializer.java
index 2e207c1c1..a7f96ece4 100755
--- a/ccm-cms/src/com/arsdigita/cms/Initializer.java
+++ b/ccm-cms/src/com/arsdigita/cms/Initializer.java
@@ -87,7 +87,7 @@ import org.apache.log4j.Logger;
*
* @author Justin Ross <jross@redhat.com>
* @author Peter Boy <pboy@barkhof.uni-bremen.de>
- * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $
+ * @version $Id: Initializer.java 2289 2012-03-11 09:45:10Z pboy $
*/
public class Initializer extends CompoundInitializer {
diff --git a/ccm-cms/src/com/arsdigita/cms/Loader.java b/ccm-cms/src/com/arsdigita/cms/Loader.java
index c7358e8bb..f7629f456 100755
--- a/ccm-cms/src/com/arsdigita/cms/Loader.java
+++ b/ccm-cms/src/com/arsdigita/cms/Loader.java
@@ -67,7 +67,7 @@ import org.apache.log4j.Logger;
*
* @author Peter Boy <pboy@barkhof.uni-bremen.de>
* @since ccm-cms version 6.6.0
- * @version $Id: Loader.java 2212 2011-06-22 08:39:04Z pboy $
+ * @version $Id: Loader.java 2305 2012-05-01 12:26:33Z pboy $
*/
public class Loader extends PackageLoader {
diff --git a/ccm-cms/src/com/arsdigita/cms/SecurityManager.java b/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
index ffb90cfb7..ebfe0ce26 100755
--- a/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
+++ b/ccm-cms/src/com/arsdigita/cms/SecurityManager.java
@@ -48,7 +48,7 @@ import org.apache.log4j.Logger;
*
Security class used for checking and granting privileges in CMS.
*
* @author Michael Pih
- * @version $Id: SecurityManager.java 2161 2011-02-02 00:16:13Z pboy $
+ * @version $Id: SecurityManager.java 2280 2012-03-10 23:55:04Z pboy $
*/
public class SecurityManager implements Security, SecurityConstants {
diff --git a/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java b/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java
index 9aef4feb0..f43f3bb26 100755
--- a/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java
+++ b/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java
@@ -34,7 +34,7 @@ import com.arsdigita.mimetypes.MimeType;
* @see com.arsdigita.cms.ItemTemplateCollection
*
* @author Stanislav Freidin (sfreidin@arsdigita.com)
- * @version $Id: TemplateCollection.java 2090 2010-04-17 08:04:14Z pboy $
+ * @version $Id: TemplateCollection.java 2280 2012-03-10 23:55:04Z pboy $
*/
public abstract class TemplateCollection extends DomainCollection {
diff --git a/ccm-cms/src/com/arsdigita/cms/TemplateManager.java b/ccm-cms/src/com/arsdigita/cms/TemplateManager.java
index 59053a0e4..9b62305f6 100755
--- a/ccm-cms/src/com/arsdigita/cms/TemplateManager.java
+++ b/ccm-cms/src/com/arsdigita/cms/TemplateManager.java
@@ -60,7 +60,7 @@ 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 2090 2010-04-17 08:04:14Z pboy $
+ * @version $Id: TemplateManager.java 2280 2012-03-10 23:55:04Z pboy $
*/
public interface TemplateManager {
diff --git a/ccm-cms/src/com/arsdigita/cms/VersionCopier.java b/ccm-cms/src/com/arsdigita/cms/VersionCopier.java
index 0d446b07d..24635a340 100755
--- a/ccm-cms/src/com/arsdigita/cms/VersionCopier.java
+++ b/ccm-cms/src/com/arsdigita/cms/VersionCopier.java
@@ -36,7 +36,7 @@ import java.util.HashSet;
* versions.
*
* @author Stanislav Freidin
- * @version $Id: VersionCopier.java 2140 2011-01-16 12:04:20Z pboy $
+ * @version $Id: VersionCopier.java 2291 2012-04-22 15:41:24Z pboy $
*/
class VersionCopier extends ObjectCopier {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionPage.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionPage.java
index a655b2b1a..efef16eb0 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionPage.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionPage.java
@@ -60,7 +60,7 @@ import javax.servlet.http.HttpServletRequest;
* @author Michael Pih
* @author Xixi D'Moon <xdmoon@redhat.com>
* @author Justin Ross <jross@redhat.com>
- * @version $Id: ContentSectionPage.java 754 2005-09-02 13:26:17Z sskracic $
+ * @version $Id: ContentSectionPage.java 2224 2011-08-01 07:45:23Z pboy $
*/
public class ContentSectionPage extends CMSPage implements ActionListener {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionRequestLocal.java
index f1c0c18e8..d9304eef8 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionRequestLocal.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionRequestLocal.java
@@ -26,7 +26,7 @@ import org.apache.log4j.Logger;
/**
*
- * @version $Id: ContentSectionRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: ContentSectionRequestLocal.java 2090 2010-04-17 08:04:14Z pboy $
*/
public final class ContentSectionRequestLocal extends RequestLocal {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/WorkspaceContextBar.java b/ccm-cms/src/com/arsdigita/cms/ui/WorkspaceContextBar.java
index 1a1ee926e..036bfe3fd 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/WorkspaceContextBar.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/WorkspaceContextBar.java
@@ -30,7 +30,7 @@ import java.util.List;
* The context bar of the content center UI.
*
* @author Justin Ross <jross@redhat.com>
- * @version $Id: WorkspaceContextBar.java 2090 2010-04-17 08:04:14Z pboy $
+ * @version $Id: WorkspaceContextBar.java 2286 2012-03-11 09:14:14Z pboy $
*/
class WorkspaceContextBar extends ContextBar {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/WorkspacePage.java b/ccm-cms/src/com/arsdigita/cms/ui/WorkspacePage.java
index 48e871dcd..b363ac498 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/WorkspacePage.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/WorkspacePage.java
@@ -46,7 +46,7 @@ import com.arsdigita.ui.DebugPanel;
*
* @author Jack Chung (flattop@arsdigita.com)
* @author Michael Pih (pihman@arsdigita.com)
- * @version $Id: CMSPageWorkspacePage.java 2090 2010-04-17 08:04:14Z pboy $
+ * @version $Id: WorkspacePage.java 2280 2012-03-10 23:55:04Z pboy $
*/
public class WorkspacePage extends CMSPage implements ActionListener {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java
index d12060e81..5fee48cc3 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java
@@ -52,7 +52,7 @@ import com.arsdigita.util.Assert;
*
* WARNING: The code to actually list the items is currently a travesty.
* It needs to be re-written from scratch, by using custom data queries.
- * @version $Id: CategoryItemsBrowser.java 754 2005-09-02 13:26:17Z sskracic $
+ * @version $Id: CategoryItemsBrowser.java 2090 2010-04-17 08:04:14Z pboy $
*/
public class CategoryItemsBrowser extends Grid {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryIteratorListModel.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryIteratorListModel.java
index 46d772995..78cd53137 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryIteratorListModel.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryIteratorListModel.java
@@ -25,7 +25,7 @@ import java.util.Iterator;
/**
* A {@link ListModel} that iterates over categories via an iterator
- * @version $Id: CategoryIteratorListModel.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: CategoryIteratorListModel.java 2090 2010-04-17 08:04:14Z pboy $
*/
public class CategoryIteratorListModel implements ListModel {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLinks.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLinks.java
index e523ef8d9..2d2db9c3d 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLinks.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLinks.java
@@ -37,7 +37,7 @@ import com.arsdigita.util.LockableImpl;
*
* @author Stanislav Freidin (stas@arsdigita.com)
* @author Michael Pih (pihman@arsdigita.com)
- * @version $Id: CategoryLinks.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: CategoryLinks.java 2140 2011-01-16 12:04:20Z pboy $
*/
public class CategoryLinks extends List {
public final static String SUB_CATEGORY = "sc";
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java
index dcc7e32a0..bb6bba1a2 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java
@@ -33,7 +33,7 @@ import org.apache.log4j.Logger;
* content section.
*
* @author Scott Seago
- * @version $Id: CategoryUseContextModelBuilder.java 1942 2009-05-29 07:53:23Z terry $
+ * @version $Id: CategoryUseContextModelBuilder.java 2090 2010-04-17 08:04:14Z pboy $
*/
class CategoryUseContextModelBuilder extends AbstractListModelBuilder {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/OrderedCategorizedObjectsList.java b/ccm-cms/src/com/arsdigita/cms/ui/category/OrderedCategorizedObjectsList.java
index e9c4158d6..1479283ba 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/OrderedCategorizedObjectsList.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/OrderedCategorizedObjectsList.java
@@ -48,7 +48,7 @@ import javax.servlet.ServletException;
*
* @author Randy Graebner (randyg@alum.mit.edu)
* @version $Revision: #11 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: OrderedCategorizedObjectsList.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: OrderedCategorizedObjectsList.java 2090 2010-04-17 08:04:14Z pboy $
*/
public class OrderedCategorizedObjectsList extends CategorizedObjectsList {
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/PurposeForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/PurposeForm.java
index 55681bcc5..0d5144dbe 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/PurposeForm.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/PurposeForm.java
@@ -66,7 +66,7 @@ import java.util.TooManyListenersException;
*
*
* @author Scott Seago (scott@arsdigita.com)
- * @version $Id: PurposeForm.java 754 2005-09-02 13:26:17Z sskracic $
+ * @version $Id: PurposeForm.java 2140 2011-01-16 12:04:20Z pboy $
*/
public class PurposeForm extends Form
implements FormProcessListener, FormValidationListener,
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSUserObjectStruct.java b/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSUserObjectStruct.java
index 421c98895..f0f44099c 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSUserObjectStruct.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSUserObjectStruct.java
@@ -42,7 +42,7 @@ import java.math.BigDecimal;
* the party_id and the corresponding entity.
*
* @author Stefan Deusch (sdeusch@arsdigita.com)
- * @version $Id: CMSUserObjectStruct.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: CMSUserObjectStruct.java 2090 2010-04-17 08:04:14Z pboy $
*/
class CMSUserObjectStruct implements CMSPermissionsConstants {
diff --git a/ccm-core/src/com/arsdigita/util/cmd/CommandLine.java b/ccm-core/src/com/arsdigita/util/cmd/CommandLine.java
index 0ad015723..d46f169e5 100755
--- a/ccm-core/src/com/arsdigita/util/cmd/CommandLine.java
+++ b/ccm-core/src/com/arsdigita/util/cmd/CommandLine.java
@@ -26,15 +26,13 @@ import java.util.List;
import java.util.Map;
/**
- * @deprecated Use CLI (http://jakarta.apache.org/commons/cli/index.html) instead.
* @author rhs@mit.edu
* @version $Revision: #8 $ $Date: 2004/08/16 $
- **/
-
+ * @version $Id: CommandLine.java 287 2005-02-22 00:29:02Z sskracic $
+ * @deprecated Use CLI (http://jakarta.apache.org/commons/cli/index.html) instead.
+ */
public class CommandLine {
- public final static String versionId = "$Id: CommandLine.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
private String m_name;
private String m_usage;
private Map m_switches = new HashMap();
diff --git a/ccm-core/src/com/arsdigita/util/cmd/StringSwitch.java b/ccm-core/src/com/arsdigita/util/cmd/StringSwitch.java
index 8b18895df..58d4ccae8 100755
--- a/ccm-core/src/com/arsdigita/util/cmd/StringSwitch.java
+++ b/ccm-core/src/com/arsdigita/util/cmd/StringSwitch.java
@@ -22,12 +22,11 @@ package com.arsdigita.util.cmd;
* @deprecated Use CLI (http://jakarta.apache.org/commons/cli/index.html) instead.
* @author rhs@mit.edu
* @version $Revision: #7 $ $Date: 2004/08/16 $
+ * @version $Id: StringSwitch.java 287 2005-02-22 00:29:02Z sskracic $
**/
public class StringSwitch extends Switch {
- public final static String versionId = "$Id: StringSwitch.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
public StringSwitch(String name, String usage, String defValue) {
super(name, PARAMETER, usage, defValue);
}
diff --git a/ccm-core/src/com/arsdigita/util/cmd/Switch.java b/ccm-core/src/com/arsdigita/util/cmd/Switch.java
index 168b8d115..e62141292 100755
--- a/ccm-core/src/com/arsdigita/util/cmd/Switch.java
+++ b/ccm-core/src/com/arsdigita/util/cmd/Switch.java
@@ -22,15 +22,15 @@ import com.arsdigita.util.Assert;
import java.util.List;
/**
- * @deprecated Use CLI (http://jakarta.apache.org/commons/cli/index.html) instead.
+ * (Obviously) a command line option
+ *
* @author rhs@mit.edu
* @version $Revision: #8 $ $Date: 2004/08/16 $
- **/
-
+ * @version $Id: Switch.java 287 2005-02-22 00:29:02Z sskracic $
+ * @deprecated Use CLI (http://jakarta.apache.org/commons/cli/index.html) instead.
+ */
public abstract class Switch {
- public final static String versionId = "$Id: Switch.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
public static abstract class Type {
abstract String[] parse(CommandLine cmd, List args);
}
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeForm.java
index 6695be751..e38b0c634 100755
--- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeForm.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeForm.java
@@ -111,7 +111,10 @@ public class PortletTypeForm extends Form {
}
};
- public PortletTypeForm() {
+ /**
+ * Default constructor
+ */
+ public PortletTypeForm() {
this("portletTypeForm");
}
diff --git a/ccm-sci-bundle/bundles/custom/AUTHORS b/ccm-sci-bundle/bundles/custom/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/custom/ChangeLog b/ccm-sci-bundle/bundles/custom/ChangeLog
new file mode 100644
index 000000000..dc5e551f4
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/ChangeLog
@@ -0,0 +1,3 @@
+* Thu May 01 2012
+- Initial build.
+
diff --git a/ccm-sci-bundle/bundles/custom/NEWS b/ccm-sci-bundle/bundles/custom/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/custom/README b/ccm-sci-bundle/bundles/custom/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/custom/bundle.in b/ccm-sci-bundle/bundles/custom/bundle.in
new file mode 100644
index 000000000..38264254a
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/bundle.in
@@ -0,0 +1,4 @@
+BUNDLE_NAME=scientificcms-custom
+BUNDLE_PRETTY_NAME="ScientificCMS custom bundle, minimal set of required modules"
+VERSION=2.0.0
+RELEASE=1
diff --git a/ccm-sci-bundle/bundles/custom/cfg/integration.properties b/ccm-sci-bundle/bundles/custom/cfg/integration.properties
new file mode 100644
index 000000000..264bae6d0
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/cfg/integration.properties
@@ -0,0 +1,161 @@
+# Scientific CMS devel bundle integration.properties
+#
+waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
+; To use FCKeditor configure:
+; waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+
+waf.dispatcher.default_expiry=3600
+;
+waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
+; if you activate screen_name, forum loader does not work.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=de,en
+waf.kernel.language_independent_items=true
+
+; security.properties:
+waf.auto_registration_on=false
+
+; Searches for localized style sheet (among others)
+waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
+
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
+
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@localhost.localdomain
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+# ccm-cms parameters
+# In order to create several content-section uncomment the line below and
+# list the desired content section names
+#com.arsdigita.cms.loader.section_names=generic,openccm,sci,libre,homepages
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker
+
+com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+; Xinha is default and does work out of the box
+; A CCM specific configuration file is used to prevent a mess with the standard
+; configuration, default is:
+; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js
+
+; to use FCKeditor:
+; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+; com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+
+com.arsdigita.cms.allow_content_create_in_section_listing=false
+com.arsdigita.cms.disable_item_pfs=true
+
+com.arsdigita.cms.hide_admin_tabs=true
+com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.hide_launch_date=true
+com.arsdigita.cms.hide_templates_tab=true
+com.arsdigita.cms.hide_timezone=true
+com.arsdigita.cms.hide_udct_ui=true
+
+com.arsdigita.cms.use_section_categories=false
+com.arsdigita.cms.use_streamlined_creation=true
+
+com.arsdigita.cms.image_browser.thumbnail_max_width=200
+com.arsdigita.cms.image_browser.thumbnail_max_height=150
+
+# ccm-cms-types-event parameters
+com.arsdigita.cms.contenttypes.event.hide_cost=true
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
+
+
+# ccm-cms-types-newsitem parameters
+com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+com.arsdigita.cms.contenttypes.newsitem.start_year=2000
+com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
+
+
+# Forum application
+com.arsdigita.forum.show_new_tabs=true
+com.arsdigita.forum.use_wysiwyg_editor=true
+com.arsdigita.forum.allow_quick_finish=true
+com.arsdigita.forum.disable_page_caching=true
+
+
+# ccm-navigation application
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
+com.arsdigita.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
+com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
+
+
+# ccm-search application
+com.arsdigita.london.search.show_sponsored_links=true
+; Comment this out or increase the num_of_threads if you really use remote search
+com.arsdigita.london.search.num_threads=0
+
+
+# ccm-subsite application
+com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+
+# ccm-themedirector application
+themedirector.default_theme_context=
+# themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+themedirector.default_theme_path=themes/static/aplaws-generic
+
+# atoz
+com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+# ccm-auth-http application
+auth.http.admin_email=webmaster@scientificcms.org
+auth.http.admin_identifier=webmaster
+
+# ccm-sci-bundle (Loader only)
+#com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
+#com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu
+#com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
+# =============================================================================================
+# runtime specific configurations
+
+; waf.admin.email=
+; waf.admin.name.given=
+; waf.admin.name.family=
+; waf.admin.password=
+; waf.admin.password.question=
+; waf.admin.password.answer=
+
+; waf.runtime.jdbc_url=
+; waf.runtime.jdbc_pool_size=
+
+; waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
+# waf.debug=true
+# waf.bebop.fancy_xsl_errors=true
+
diff --git a/ccm-sci-bundle/bundles/custom/cfg/project.xml b/ccm-sci-bundle/bundles/custom/cfg/project.xml
new file mode 100644
index 000000000..846608928
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/cfg/project.xml
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/custom/cfg/web-sci.xml b/ccm-sci-bundle/bundles/custom/cfg/web-sci.xml
new file mode 100644
index 000000000..88529ccfc
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/cfg/web-sci.xml
@@ -0,0 +1,598 @@
+
+
+
+ Scientific CMS
+ Content and Collaboration Management for Scientific Institutions
+
+
+
+ log4j-conf-file
+ WEB-INF/conf/log4j.properties
+
+
+
+
+
+
+
+ shortcuts
+ com.arsdigita.shortcuts.ShortcutFilter
+
+
+
+ subsite
+ com.arsdigita.subsite.SubsiteFilter
+
+
+
+
+
+
+ subsite
+ /*
+
+
+
+ shortcuts
+ /*
+
+
+
+
+ com.arsdigita.web.CCMApplicationContextListener
+
+
+
+
+
+ reg
+ com.arsdigita.web.ContextRegistrationServlet
+
+ uri
+ /
+
+ 1
+
+
+
+
+ ccm-dispatcher
+ com.arsdigita.web.DispatcherServlet
+
+ 2
+
+
+
+ cache-manager
+ com.arsdigita.caching.CacheServlet
+
+
+
+ db-test
+ com.arsdigita.web.monitoring.DBTestServlet
+
+
+
+ versioning-log
+ com.arsdigita.versioning.VersioningServlet
+
+
+
+ login
+ com.arsdigita.ui.login.LoginServlet
+
+
+
+ webadmin
+ com.arsdigita.ui.admin.AdminServlet
+
+
+
+ webadmin-permissions
+ com.arsdigita.ui.permissions.PermissionsServlet
+
+
+
+ webdevsupport
+ com.arsdigita.webdevsupport.WebDevSupportServlet
+
+
+
+ oid-redirect
+ com.arsdigita.web.OIDRedirectServlet
+
+
+
+ resource-resolver
+ com.arsdigita.web.ResourceServlet
+
+
+
+
+
+ content-center
+ com.arsdigita.cms.WorkspaceServlet
+
+
+
+ content-section
+ com.arsdigita.cms.ContentSectionServlet
+
+
+
+ cms-service
+ com.arsdigita.cms.ServiceServlet
+
+
+
+ content-type-xsl
+ com.arsdigita.cms.dispatcher.ContentTypeXSLServlet
+
+
+
+ content-item-xsl
+ com.arsdigita.cms.dispatcher.ContentItemXSLServlet
+
+
+
+ template-xsl
+ com.arsdigita.cms.dispatcher.TemplateXSLServlet
+
+
+
+ TextOnlyServlet
+ Text Only Servlet
+
+ com.arsdigita.web.InternalPrefixerServlet
+
+
+ prefix
+ /text
+
+
+
+
+ PrintFriendlyServlet
+ Printer Friendly Output Servlet
+
+ com.arsdigita.web.InternalPrefixerServlet
+
+
+ prefix
+ /print
+
+
+
+
+
+
+
+
+ forum-main
+ com.arsdigita.forum.ForumServlet
+
+
+
+
+ portalworkspace-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-portalworkspace
+
+
+
+
+ navigation-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-navigation
+
+
+ file-resolver
+ com.arsdigita.navigation.NavigationFileResolver
+
+
+
+
+ portlet-type-xsl
+ com.arsdigita.dispatcher.PortletTypeXSLServlet
+
+
+
+
+ rssfeed-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-rssfeed
+
+
+ file-resolver
+ com.arsdigita.rssfeed.RSSFileResolver
+
+
+
+
+
+
+ search-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-search
+
+
+
+
+ AxisServlet
+ Apache-Axis Servlet
+
+ org.apache.axis.transport.http.AxisServlet
+
+
+
+
+
+
+ shortcuts-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-shortcuts
+
+
+
+
+
+ subsite-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-subsite
+
+
+
+
+
+
+ terms-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-terms
+
+
+
+
+
+
+ theme-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-themedirector
+
+
+
+
+ ThemeDownload
+ com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet
+
+
+
+ ThemePreviewServlet
+ Servlet to allow admins to preview look/feel
+
+ com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
+
+
+ prefix
+ /theme
+
+
+
+
+
+
+
+
+
+ forum-main
+ /forum-main/main/*
+
+
+
+
+ portlet-type-xsl
+ /themes/servlet/portlet-type/*
+
+
+
+ portalworkspace-files
+ /ccm-portalworkspace/files/*
+
+
+
+ navigation-files
+ /ccm-navigation/files/*
+
+
+
+
+ rssfeed-files
+ /ccm-rssfeed/files/*
+
+
+
+
+
+ search-files
+ /ccm-ldn-search/files/*
+
+
+
+ AxisServlet
+ /services/*
+
+
+
+
+
+ shortcuts-files
+ /ccm-shortcuts/files/*
+
+
+
+
+ subsite-files
+ /ccm-subsite/files/*
+
+
+
+
+
+ terms-files
+ /ccm-ldn-terms/files/*
+
+
+
+
+
+ theme-files
+ /theme-files/*
+
+
+
+ ThemeDownload
+ /theme-files/download/*
+
+
+
+ ThemePreviewServlet
+ /theme/*
+
+
+
+
+
+
+
+ reg
+ /themes/null/reg/*
+
+
+
+ ccm-dispatcher
+ /ccm/*
+
+
+
+ cache-manager
+ /expireCache/*
+
+
+
+ db-test
+ /dbtest
+
+
+
+ versioning-log
+ /versioning/*
+
+
+
+ login
+ /login/*
+
+
+
+ webadmin
+ /admin/*
+
+
+
+ webadmin-permissions
+ /admin-permissions/*
+
+
+
+ webdevsupport
+ /webdevsupport/*
+
+
+
+ oid-redirect
+ /redirect/*
+
+
+
+ resource-resolver
+ /resource/*
+
+
+
+
+
+ content-center
+ /templates/servlet/content-center/*
+
+
+
+ content-section
+ /templates/servlet/content-section/*
+
+
+
+ cms-service
+ /templates/servlet/cms-service/*
+
+
+
+ content-item-xsl
+ /templates/servlet/content-item/*
+
+
+
+ content-type-xsl
+ /themes/servlet/content-type/*
+
+
+
+ template-xsl
+ /themes/servlet/template/*
+
+
+
+ TextOnlyServlet
+ /text/*
+
+
+
+ PrintFriendlyServlet
+ /print/*
+
+
+
+
+
+ com.arsdigita.dispatcher.AccessDeniedException
+ /error/access-denied.jsp
+
+
+
+ com.arsdigita.dispatcher.ObjectNotFoundException
+ /error/object-not-found.jsp
+
+
+
+ com.arsdigita.kernel.permissions.PermissionException
+ /error/permission-denied.jsp
+
+
+
+ com.arsdigita.persistence.DbNotAvailableException
+ /error/db-not-available.jsp
+
+
+
+ com.arsdigita.db.DbNotAvailableException
+ /error/db-not-available.jsp
+
+
+
+ java.lang.Exception
+ /error/general.jsp
+
+
+
+ java.lang.Error
+ /error/general.jsp
+
+
+
+
+
+ /WEB-INF/bebop-show.tld
+ /WEB-INF/bebop-show.tld
+
+
+
+ /WEB-INF/bebop-define.tld
+ /WEB-INF/bebop-define.tld
+
+
+
diff --git a/ccm-sci-bundle/bundles/custom/res/bundle/categories/placeholder.info b/ccm-sci-bundle/bundles/custom/res/bundle/categories/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/bundle/categories/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory may optionally contain one or more local site specific
+import xml files for Terms domain categories.
+
diff --git a/ccm-sci-bundle/bundles/custom/res/bundle/categories/sci-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/custom/res/bundle/categories/sci-nav-domain-1.00.xml
new file mode 100644
index 000000000..31486e212
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/bundle/categories/sci-nav-domain-1.00.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/custom/res/bundle/categories/sci-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/custom/res/bundle/categories/sci-nav-hierarchy-1.00.xml
new file mode 100644
index 000000000..cfce50400
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/bundle/categories/sci-nav-hierarchy-1.00.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-domain.xml b/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-domain.xml
new file mode 100644
index 000000000..87ee0c8c2
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-domain.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-hierarchy.xml
new file mode 100644
index 000000000..ed6c7c16b
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-hierarchy.xml
@@ -0,0 +1,1034 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
new file mode 100644
index 000000000..b983bd2d7
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
new file mode 100644
index 000000000..34b25d21e
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-sci-bundle/bundles/custom/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/custom/res/bundle/navigation/sci-templates.txt
new file mode 100755
index 000000000..008184981
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/bundle/navigation/sci-templates.txt
@@ -0,0 +1,9 @@
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp
diff --git a/ccm-sci-bundle/bundles/custom/res/placeholder.info b/ccm-sci-bundle/bundles/custom/res/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/res/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory may optionally contain one or more local site specific
+import xml files for Terms domain categories.
+
diff --git a/ccm-sci-bundle/bundles/custom/templates/placeholder.info b/ccm-sci-bundle/bundles/custom/templates/placeholder.info
new file mode 100644
index 000000000..c78cf06e6
--- /dev/null
+++ b/ccm-sci-bundle/bundles/custom/templates/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory