LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zsr configuration angepasst. Div. Formatierungen. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@765 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-02-24 06:46:51 +00:00
parent b78a52057d
commit 43cf93a12b
8 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ItemImageAttachmentInitializer.java
View File

@ -57,7 +57,6 @@ public class ItemImageAttachmentInitializer extends ContentAssetInitializer {
protected DomainObject doNewInstance( DataObject obj ) {
return new ItemImageAttachment( obj );
}
@Override
public DomainObjectInstantiator resolveInstantiator( DataObject obj ) {
return this;

6
ccm-cms/src/com/arsdigita/cms/CMSConfig.java
View File

@ -107,20 +107,18 @@ public final class CMSConfig extends AbstractConfig {
public static final synchronized CMSConfig getInstance() {
if (s_config == null) {
s_config = new CMSConfig();
// deprecated
// s_config.require("ccm-core/runtime.properties");
// use instead:
// read values from the persistent storage
s_config.load();
}
return s_config;
}
/**
* Storage (map) for method getAssetStepsToSkip(ContentType type) to store
* mapping of steps that are deemed irrelevant for the passid in type.
*/
private static Map s_skipAssetSteps = null;
/**
* Item category add form speciofies Subclass of ItemCategoryForm
* to use for the assign categories step.

23
ccm-cms/src/com/arsdigita/cms/Loader.java
View File

@ -18,21 +18,12 @@
*/
package com.arsdigita.cms;
// import com.arsdigita.cms.CMS;
// import com.arsdigita.cms.installer.ContentSectionSetup;
import com.arsdigita.cms.contentsection.ContentSectionSetup;
// import com.arsdigita.cms.installer.PageClassConfigHandler;
import com.arsdigita.cms.util.Util;
import com.arsdigita.cms.installer.xml.XMLContentTypeHandler;
// import com.arsdigita.cms.installer.WorkspaceInstaller;
//import com.arsdigita.cms.portlet.ContentDirectoryPortlet;
import com.arsdigita.cms.portlet.ContentItemPortlet;
//import com.arsdigita.cms.portlet.ContentSectionsPortlet;
import com.arsdigita.cms.portlet.TaskPortlet;
import com.arsdigita.domain.DomainObject;
// import com.arsdigita.domain.DomainObjectFactory;
// import com.arsdigita.domain.DomainObjectInstantiator;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.formbuilder.util.FormbuilderSetup;
import com.arsdigita.kernel.ACSObjectInstantiator;
@ -49,28 +40,14 @@ import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.runtime.ConfigError;
import com.arsdigita.runtime.ScriptContext;
// import com.arsdigita.util.UncheckedWrapperException;
//import com.arsdigita.util.parameter.Parameter;
// import com.arsdigita.util.parameter.BooleanParameter;
//import com.arsdigita.util.parameter.StringParameter;
//import com.arsdigita.util.parameter.URLParameter;
import com.arsdigita.web.Application;
import com.arsdigita.web.ApplicationSetup;
import com.arsdigita.web.ApplicationType;
import com.arsdigita.xml.XML;
// import java.io.IOException;
// import java.io.InputStream;
// import java.util.HashMap;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
// import javax.xml.parsers.ParserConfigurationException;
// import javax.xml.parsers.SAXParser;
// import javax.xml.parsers.SAXParserFactory;
// import org.xml.sax.InputSource;
// import org.xml.sax.SAXException;
import org.apache.log4j.Logger;

9
ccm-core/src/com/arsdigita/kernel/BaseInitializer.java → ccm-core/src/com/arsdigita/kernel/BaseInitializer.java.nolongerInUse
View File

@ -25,6 +25,15 @@ import com.arsdigita.persistence.OID;
import java.math.BigDecimal;
// ////////////////////////////////////////////////////////////////
//
// Part of the old initializer system based on enterprise.ini file
// Deprecated and removed.
//
// ////////////////////////////////////////////////////////////////
/**
* Base initializer for all WAF applications. Extend this class to
* implement your own initializer. Runs each initializer in a

12
ccm-gen-aplaws/bundles/zsr/cfg/applications.cfg
View File

@ -12,9 +12,9 @@ ccm-cms-assets-relatedlink
# Content types
#ccm-cms-types-address
ccm-cms-types-article
#ccm-cms-types-bookmark
ccm-cms-types-bookmark
#ccm-cms-types-contact
#ccm-cms-types-faqitem
ccm-cms-types-faqitem
ccm-cms-types-filestorageitem
ccm-cms-types-formitem
ccm-cms-types-formsectionitem
@ -25,15 +25,15 @@ ccm-cms-types-mparticle
ccm-cms-types-newsitem
# Applications
ccm-bookmarks
#ccm-docmgr
#ccm-forum
ccm-forum
#ccm-user-preferences
# LDN extensions
# ## ccm-ldn-image-step
ccm-ldn-navigation
ccm-ldn-portal
#ccm-ldn-rss
ccm-ldn-rss
ccm-ldn-search
ccm-ldn-shortcuts
ccm-ldn-subsite
@ -41,6 +41,8 @@ ccm-ldn-terms
ccm-ldn-theme
ccm-ldn-util
ccm-sci-publications
# integration layer app
ccm-gen-aplaws

21
ccm-webpage/src/com/arsdigita/cms/webpage/installer/Initializer.java
View File

@ -22,35 +22,34 @@ import com.arsdigita.cms.webpage.ui.WebpagePortletEditor;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.TransactionContext;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.pdl.ManifestSource;
import com.arsdigita.persistence.pdl.NameFilter;
//import com.arsdigita.persistence.pdl.ManifestSource;
//import com.arsdigita.persistence.pdl.NameFilter;
import com.arsdigita.domain.DataObjectNotFoundException;
// import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObject;
import com.arsdigita.domain.DomainObjectFactory;
//import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.portal.Portlet;
//import com.arsdigita.portal.Portlet;
import com.arsdigita.portal.PortletSetup;
import com.arsdigita.portal.PortletType;
import com.arsdigita.kernel.ACSObjectInstantiator;
import com.arsdigita.kernel.ResourceType;
import com.arsdigita.kernel.BaseInitializer;
import com.arsdigita.kernel.ResourceTypeConfig;
import com.arsdigita.kernel.ui.ResourceConfigComponent;
// import com.arsdigita.kernel.ui.ResourceConfigComponent;
import com.arsdigita.kernel.ui.ResourceConfigFormSection;
import com.arsdigita.runtime.CompoundInitializer;
import com.arsdigita.runtime.DomainInitEvent;
import com.arsdigita.runtime.PDLInitializer;
//import com.arsdigita.runtime.PDLInitializer;
import com.arsdigita.runtime.RuntimeConfig;
import org.apache.log4j.Logger;
import com.arsdigita.util.UncheckedWrapperException;
import java.util.Iterator;
import java.util.List;
//import com.arsdigita.util.UncheckedWrapperException;
//import java.util.Iterator;
//import java.util.List;
import com.arsdigita.util.Assert;
import com.arsdigita.db.DbHelper;

15
ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
View File

@ -9,11 +9,11 @@ ccm-cms-assets-notes
ccm-cms-assets-relatedlink
# Content types
#ccm-cms-types-address
ccm-cms-types-address
# -- ccm-cms-types-agenda
ccm-cms-types-article
ccm-cms-types-bookmark
#ccm-cms-types-contact
ccm-cms-types-contact
# -- ccm-cms-types-esdservice
ccm-cms-types-event
# -- faqitem koennte bei zes auch entfallen
@ -31,13 +31,13 @@ ccm-cms-types-formsectionitem
# -- ccm-cms-types-inlinesite
# -- ccm-cms-types-job
# -- ccm-cms-types-legalnotice
# ccm-cms-types-member
# -- ccm-cms-types-member
# -- ccm-cms-types-minutes
# -- ccm-cms-types-motditem
ccm-cms-types-mparticle
ccm-cms-types-newsitem
# -- ccm-cms-types-organization
#ccm-cms-types-person
ccm-cms-types-person
# -- ccm-cms-types-pressrelease
# -- ccm-cms-types-researchnetwork
# -- ccm-cms-types-service
@ -64,7 +64,6 @@ ccm-user-preferences
# -- ccm-ldn-dublin
# -- ccm-ldn-exporter
# -- ccm-ldn-freeform
#ccm-ldn-image-step
# -- ccm-ldn-importer
ccm-ldn-navigation
ccm-ldn-portal
@ -78,9 +77,9 @@ ccm-ldn-util
# sci extensions
# --------------
#ccm-cms-dabinimporter
#ccm-sci-publications
#ccm-sci-types-organization
ccm-cms-dabinimporter
ccm-sci-publications
ccm-sci-types-organization
# integration layer
ccm-zes-aplaws

14
environment/project.xml.zsr
View File

@ -8,7 +8,7 @@
name="aplaws-zsr"
prettyName="APLAWS plus"
version="1-1-1"
release="754"
release="765"
webxml="web.xml-aplaws"
webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@ -32,11 +32,11 @@
<!-- <ccm:application name="ccm-cms-types-address"/> -->
<!-- <ccm:application name="ccm-cms-types-agenda"/> -->
<ccm:application name="ccm-cms-types-article"/>
<!-- <ccm:application name="ccm-cms-types-bookmark"/> -->
<ccm:application name="ccm-cms-types-bookmark"/>
<!-- <ccm:application name="ccm-cms-types-contact"/> -->
<!-- <ccm:application name="ccm-cms-types-esdservice"/> -->
<!-- <ccm:application name="ccm-cms-types-event"/> -->
<!-- <ccm:application name="ccm-cms-types-faqitem"/> -->
<ccm:application name="ccm-cms-types-faqitem"/>
<ccm:application name="ccm-cms-types-filestorageitem"/>
<ccm:application name="ccm-cms-types-formitem"/>
<ccm:application name="ccm-cms-types-formsectionitem"/>
@ -60,11 +60,11 @@
<!-- Applications -->
<!-- - - - - - - -->
<!-- <ccm:application name="ccm-auth-http"/> -->
<!-- <ccm:application name="ccm-bookmarks"/> -->
<ccm:application name="ccm-bookmarks"/>
<!-- had been temporarily excluded, produces errors in the build process -->
<!-- <ccm:application name="ccm-docmgr"/> -->
<!-- <ccm:application name="ccm-formbuilder-pdf"/> -->
<!-- <ccm:application name="ccm-forum"/> -->
<ccm:application name="ccm-forum"/>
<!-- <ccm:application name="ccm-simplesurvey"/> -->
<!-- <ccm:application name="ccm-user-preferences"/> -->
<!-- <ccm:application name="ccm-weblog"/> -->
@ -80,7 +80,7 @@
<!-- <ccm:application name="ccm-ldn-importer"/> -->
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-portal"/>
<!-- <ccm:application name="ccm-ldn-rss"/> -->
<ccm:application name="ccm-ldn-rss"/>
<ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/>
<ccm:application name="ccm-ldn-subsite"/>
@ -89,6 +89,8 @@
<ccm:application name="ccm-ldn-util"/>
<ccm:application name="ccm-sci-publications"/>
<!-- gen integration layer -->
<!-- - - - - - - - -->
<ccm:application name="ccm-gen-aplaws"/>