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

Nachführen von Code, verschiedene Kleinigkeiten. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@684 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-01-16 09:26:28 +00:00
parent c2a22ad67e
commit 45558e8327
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ccm-weblog/src/org/undp/weblog/Initializer.java
View File

@ -11,7 +11,7 @@ import com.arsdigita.domain.DomainObjectInstantiator;
import com.arsdigita.initializer.InitializationException;
import com.arsdigita.kernel.ACSObjectInstantiator;
import com.arsdigita.kernel.PackageType;
import com.arsdigita.kernel.Stylesheet;
// import com.arsdigita.kernel.Stylesheet;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.TransactionContext;
@ -93,9 +93,12 @@ public class Initializer extends CompoundInitializer {
"WebLogs", "http://www.undp.org/weblog");
s_log.debug("Just added package type WebLog ");
Stylesheet entitySheet = Stylesheet
.createStylesheet("/packages/weblog/xsl/weblog.xsl");
entityType.addStylesheet(entitySheet);
// Old style StylesheetResolver where location of stylesheets are stored
// in db and as well as mappings to applications.
// New style is pattern based, see cpom.arsdigita.templating
// Stylesheet entitySheet = Stylesheet
// .createStylesheet("/packages/weblog/xsl/weblog.xsl");
// entityType.addStylesheet(entitySheet);
entityType.setDispatcherClass(WebLogDispatcher.class.getName());

17
ccm-webpage/src/com/arsdigita/cms/webpage/ui/WebpagePortletEditorPage.java
View File

@ -2,8 +2,8 @@ package com.arsdigita.cms.webpage.ui;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
// import java.util.ArrayList;
// import java.util.Iterator;
import org.apache.log4j.Logger;
import com.arsdigita.bebop.DimensionalNavbar;
import com.arsdigita.bebop.Form;
@ -19,19 +19,19 @@ import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.PrintEvent;
import com.arsdigita.bebop.event.PrintListener;
import com.arsdigita.bebop.form.Hidden;
import com.arsdigita.bebop.form.MultipleSelect;
// import com.arsdigita.bebop.form.MultipleSelect;
import com.arsdigita.bebop.form.Submit;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryCollection;
import com.arsdigita.cms.ContentSection;
// import com.arsdigita.categorization.Category;
// import com.arsdigita.categorization.CategoryCollection;
//import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.dispatcher.CMSPage;
import com.arsdigita.cms.ui.CMSDHTMLEditor;
import com.arsdigita.cms.webpage.Webpage;
import com.arsdigita.cms.webpage.WebpageConstants;
import com.arsdigita.cms.webpage.installer.Initializer;
// import com.arsdigita.cms.webpage.installer.Initializer;
import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.kernel.User;
import com.arsdigita.kernel.permissions.PermissionDescriptor;
@ -39,7 +39,7 @@ import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.portal.Portlet;
//import com.arsdigita.portalserver.CWPage;
import com.arsdigita.util.UncheckedWrapperException;
//import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.web.Application;
import com.arsdigita.web.Web;
@ -72,6 +72,7 @@ public class WebpagePortletEditorPage extends CMSPage {
add(footer);
}
@Override
protected void buildPage() {
super.buildPage();
setClassAttr("portalserver");

12
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
@ -37,7 +37,7 @@ ccm-cms-types-formsectionitem
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
@ -78,9 +78,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.zes
View File

@ -8,7 +8,7 @@
name="aplaws-zes"
prettyName="APLAWS plus"
version="1-1-1"
release="beta-2"
release="beta-3"
webxml="web.xml-aplaws"
webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@ -29,11 +29,11 @@
<!-- Content Types -->
<!-- - - - - - - - -->
<ccm:application name="ccm-cms-types-address"/>
<!-- <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-contact"/>
<!-- <ccm:application name="ccm-cms-types-contact"/> -->
<!-- <ccm:application name="ccm-cms-types-esdservice"/> -->
<ccm:application name="ccm-cms-types-event"/>
<!-- faqitem could be removed for ZeS, too -->
@ -57,7 +57,7 @@
<!-- <ccm:application name="ccm-cms-types-organization"/> -->
<ccm:application name="ccm-cms-types-person"/>
<!-- <ccm:application name="ccm-cms-types-person"/> -->
<!-- <ccm:application name="ccm-cms-types-pressrelease"/> -->
<!-- <ccm:application name="ccm-cms-types-researchnetwork"/> -->
<!-- <ccm:application name="ccm-cms-types-service"/> -->
@ -99,10 +99,10 @@
<!-- ZeS extension -->
<!-- - - - - - - - -->
<ccm:application name="ccm-cms-dabinimporter" />
<!-- <ccm:application name="ccm-cms-dabinimporter" />
<ccm:application name="ccm-sci-types-organization"/>
<ccm:application name="ccm-sci-publications"/>
<ccm:application name="ccm-zes-aplaws"/>
<ccm:application name="ccm-sci-publications"/> -->
<ccm:application name="ccm-zes-aplaws"/>