diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java index dd9a41599..4c8d7b054 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java @@ -69,7 +69,7 @@ import org.apache.log4j.Logger; * @author Jack Chung * @author Sören Bernstein (quasimodo) * - * @version $Id: ContentItemPage.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: ContentItemPage.java 2245 2011-11-15 08:03:57Z pboy $ */ public class ContentItemPage extends CMSPage implements ActionListener { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java index 0e9ee7c26..7baf624ad 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java @@ -89,8 +89,7 @@ import com.arsdigita.workflow.simple.WorkflowTemplate; * @author Xixi D'moon <xdmoon@redhat.com> * @author Justin Ross <jross@redhat.com> * @author Jens Pelzetter jens@jp-digital.de - * @version $Id: ItemLifecycleSelectForm.java 1643 2007-09-17 14:19:06Z chrisg23 - * $ + * @version $Id: ItemLifecycleSelectForm.java 2267 2012-01-09 16:50:14Z pboy $ */ class ItemLifecycleSelectForm extends BaseForm { diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java index e7c5dc419..61c71038b 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java @@ -190,10 +190,12 @@ public class Loader extends PackageLoader { "Portal Workspace", Workspace.BASE_DATA_OBJECT_TYPE ); type.setDescription("Portal based collaborative workspaces"); + /* Create an application type specific group in user administration * * which serves as a container for subgroups, each subgroup coupled * * to an application (instances) of this type. */ type.createGroup(); + return type; } diff --git a/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml b/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml index 2d5250201..b11d050a7 100644 --- a/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml +++ b/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml @@ -7,7 +7,7 @@ - + portalworkspace-files com.arsdigita.web.ApplicationFileServlet diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties index e7642cf34..3061e32bf 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties +++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties @@ -46,7 +46,7 @@ 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 should work out of the box +; 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 diff --git a/ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java b/ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java index 92a8cc0f5..4859a36fa 100755 --- a/ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java +++ b/ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java @@ -24,7 +24,7 @@ import com.arsdigita.domain.DomainObject; import com.arsdigita.kernel.ACSObjectInstantiator; -import com.arsdigita.persistence.pdl.ManifestSource; +// import com.arsdigita.persistence.pdl.ManifestSource; import com.arsdigita.persistence.pdl.NameFilter; import com.arsdigita.persistence.pdl.ManifestSource; import com.arsdigita.persistence.DataObject; @@ -59,12 +59,14 @@ public class Initializer extends CompoundInitializer { * Implementation of the init(DomainInitEvent) initializer. * @param e */ + @Override public void init(DomainInitEvent e) { super.init(e); e.getFactory().registerInstantiator( Shortcuts.BASE_DATA_OBJECT_TYPE, new ACSObjectInstantiator() { + @Override public DomainObject doNewInstance(DataObject dataObject) { return new Shortcuts(dataObject); } diff --git a/ccm-shortcuts/src/com/arsdigita/shortcuts/Loader.java b/ccm-shortcuts/src/com/arsdigita/shortcuts/Loader.java index e22463bec..6339a78ca 100755 --- a/ccm-shortcuts/src/com/arsdigita/shortcuts/Loader.java +++ b/ccm-shortcuts/src/com/arsdigita/shortcuts/Loader.java @@ -53,6 +53,8 @@ public class Loader extends PackageLoader { new KernelExcursion() { public void excurse() { setEffectiveParty(Kernel.getSystemParty()); + + // setup application setupShortcuts(); } }.run(); diff --git a/ccm-subsite/src/com/arsdigita/subsite/Loader.java b/ccm-subsite/src/com/arsdigita/subsite/Loader.java index b118b5167..9d66a4316 100755 --- a/ccm-subsite/src/com/arsdigita/subsite/Loader.java +++ b/ccm-subsite/src/com/arsdigita/subsite/Loader.java @@ -42,6 +42,11 @@ public class Loader extends PackageLoader { private static final Logger s_log = Logger.getLogger(Loader.class); + /** + * Run script invoked by com.arsdigita.packing loader script. + * + * @param ctx + */ public void run(final ScriptContext ctx) { new KernelExcursion() { public void excurse() { diff --git a/ccm-subsite/src/com/arsdigita/subsite/Subsite.java b/ccm-subsite/src/com/arsdigita/subsite/Subsite.java index f37c4fff2..64aabcec0 100755 --- a/ccm-subsite/src/com/arsdigita/subsite/Subsite.java +++ b/ccm-subsite/src/com/arsdigita/subsite/Subsite.java @@ -107,13 +107,13 @@ public class Subsite extends Application { * com.arsdigita.web.ApplicationFileServlet * * template-path - * /templates/ccm-ldn-subsite + * /templates/ccm-subsite * * * * * subsite-files - * /ccm-ldn-subsite/files/* + * /ccm-subsite/files/* * * * @return path name to the applications servlet/JSP