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

Anpassungen für Postgres 9.0 

* ccm-gen-aplaws angepaßt
* Defektes PDL für CT Organization korrigiert

git-svn-id: https://svn.libreccm.org/ccm/trunk@882 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2011-04-30 11:17:30 +00:00
parent cd25420e23
commit 9c6280a585
3 changed files with 65 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms-types-organization/pdl/com/arsdigita/content-types/Organization.pdl
View File

@ -25,7 +25,7 @@ object type Organization extends ContentPage {
String [0..1] link = ct_organization.link VARCHAR(1000); String [0..1] link = ct_organization.link VARCHAR(1000);
String [0..1] contact = ct_organization.contact VARCHAR(2000); String [0..1] contact = ct_organization.contact VARCHAR(2000);
BigDecimal[0..1] imageID = ct_organization.image_id; // BigDecimal[0..1] imageID = ct_organization.image_id;
composite ImageAsset[0..1] image = join ct_organization.image_id to cms_images.image_id; composite ImageAsset[0..1] image = join ct_organization.image_id to cms_images.image_id;
reference key (ct_organization.organization_item_id); reference key (ct_organization.organization_item_id);

58
ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
View File

@ -13,62 +13,60 @@ ccm-cms-assets-relatedlink
## -- ccm-ldn-dublin ## -- ccm-ldn-dublin
# Content types # Content types
# -- ccm-cms-types-address ccm-cms-types-address
# -- ccm-cms-types-agenda ccm-cms-types-agenda
ccm-cms-types-article ccm-cms-types-article
ccm-cms-types-bookmark ccm-cms-types-bookmark
# -- ccm-cms-types-contact ccm-cms-types-contact
ccm-cms-types-event ccm-cms-types-event
ccm-cms-types-faqitem ccm-cms-types-faqitem
ccm-cms-types-filestorageitem ccm-cms-types-filestorageitem
ccm-cms-types-formitem ccm-cms-types-formitem
ccm-cms-types-formsectionitem ccm-cms-types-formsectionitem
ccm-cms-types-glossaryitem ccm-cms-types-glossaryitem
# -- ccm-cms-types-htmlform ccm-cms-types-htmlform
# -- ccm-cms-types-inlinesite ccm-cms-types-inlinesite
# -- ccm-cms-types-job ccm-cms-types-job
# -- ccm-cms-types-legalnotice ccm-cms-types-legalnotice
ccm-cms-types-member ccm-cms-types-member
# -- ccm-cms-types-minutes ccm-cms-types-minutes
# -- ccm-cms-types-motditem ccm-cms-types-motditem
ccm-cms-types-mparticle ccm-cms-types-mparticle
ccm-cms-types-newsitem ccm-cms-types-newsitem
# -- ccm-cms-types-organization ccm-cms-types-organization
# ccm-cms-types-person ccm-cms-types-person
# -- ccm-cms-types-pressrelease ccm-cms-types-pressrelease
# -- ccm-cms-types-researchnetwork ccm-cms-types-service
# -- ccm-cms-types-service
# ## Fuer OpenCCM aktivieren: # ## Fuer OpenCCM aktivieren:
# -- ccm-cms-types-siteproxy ccm-cms-types-siteproxy
# -- ccm-cms-types-xmlfeed ccm-cms-types-xmlfeed
ccm-sci-publications
ccm-sci-types-organization
# Applications # Applications
# ------------ # ------------
# -- ccm-auth-http ccm-bookmarks
# -- ccm-bookmarks ccm-formbuilder-pdf
ccm-docmgr
# -- ccm-formbuilder-pdf
ccm-forum ccm-forum
# ccm-forum-categorised ccm-forum-categorised
# ccm-portalserver
ccm-portalserver ccm-portalserver
ccm-portalworkspace ccm-portalworkspace
# -- ccm-simplesurvey # -- ccm-simplesurvey
ccm-themedirector ccm-themedirector
# ccm-user-preferences ccm-user-preferences
# -- ccm-weblog ccm-weblog
# -- ccm-webpage
# ldn extensions # ldn extensions
# -------------- # --------------
# -- ccm-ldn-aplaws
# -- ccm-ldn-atoz # -- ccm-ldn-atoz
# -- ccm-ldn-dublin ccm-ldn-dublin
# -- ccm-ldn-exporter # -- ccm-ldn-exporter
# -- ccm-ldn-freeform ccm-ldn-freeform
# -- ccm-ldn-importer ccm-ldn-importer
ccm-ldn-navigation ccm-ldn-navigation
# ccm-ldn-rss ccm-ldn-rss
ccm-ldn-search ccm-ldn-search
ccm-ldn-shortcuts ccm-ldn-shortcuts
ccm-ldn-subsite ccm-ldn-subsite

48
environment/project.xml.complete
View File

@ -3,14 +3,16 @@
<!-- project.xml -complete- containing all modules as of aplaws 1.0.5 --> <!-- project.xml -complete- containing all modules as of aplaws 1.0.5 -->
<!-- This file should be synchronized with an install bundle, e.g. aplaws-plus-devel-complete --> <!-- This file should be synchronized with an install bundle, e.g. aplaws-plus-devel-complete -->
<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ccm="http://ccm.redhat.com/ccm-project" xmlns:ccm="http://ccm.redhat.com/ccm-project"
ccmVersion="6.1" ccmVersion="6.1"
name="aplaws" name="aplaws-zes"
version="2.9.2" prettyName="APLAWS plus"
release="1" version="1-1-2"
webxml="web.xml-aplaws" release="-complete"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:///usr/share/ccm-devel/xsd/project.xsd"> webxml="web.xml-aplaws"
webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
<ccm:build> <ccm:build>
<ccm:application name="ccm-auth-http"/> <ccm:application name="ccm-auth-http"/>
@ -27,7 +29,6 @@
<ccm:application name="ccm-cms-types-article"/> <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-contact"/>
<ccm:application name="ccm-cms-types-esdservice"/>
<ccm:application name="ccm-cms-types-event"/> <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-filestorageitem"/>
@ -35,47 +36,70 @@
<ccm:application name="ccm-cms-types-formsectionitem"/> <ccm:application name="ccm-cms-types-formsectionitem"/>
<ccm:application name="ccm-cms-types-glossaryitem"/> <ccm:application name="ccm-cms-types-glossaryitem"/>
<ccm:application name="ccm-cms-types-htmlform"/> <ccm:application name="ccm-cms-types-htmlform"/>
<ccm:application name="ccm-cms-types-image"/>
<ccm:application name="ccm-cms-types-inlinesite"/> <ccm:application name="ccm-cms-types-inlinesite"/>
<ccm:application name="ccm-cms-types-job"/> <ccm:application name="ccm-cms-types-job"/>
<ccm:application name="ccm-cms-types-legalnotice"/> <ccm:application name="ccm-cms-types-legalnotice"/>
<ccm:application name="ccm-cms-types-member"/>
<ccm:application name="ccm-cms-types-minutes"/> <ccm:application name="ccm-cms-types-minutes"/>
<ccm:application name="ccm-cms-types-motditem"/> <ccm:application name="ccm-cms-types-motditem"/>
<ccm:application name="ccm-cms-types-mparticle"/> <ccm:application name="ccm-cms-types-mparticle"/>
<ccm:application name="ccm-cms-types-newsitem"/> <ccm:application name="ccm-cms-types-newsitem"/>
<ccm:application name="ccm-cms-types-organization"/> <ccm:application name="ccm-cms-types-organization"/>
<ccm:application name="ccm-cms-types-person"/>
<ccm:application name="ccm-cms-types-pressrelease"/> <ccm:application name="ccm-cms-types-pressrelease"/>
<ccm:application name="ccm-cms-types-service"/> <ccm:application name="ccm-cms-types-service"/>
<ccm:application name="ccm-cms-types-simpleaddress"/>
<ccm:application name="ccm-cms-types-siteproxy"/> <ccm:application name="ccm-cms-types-siteproxy"/>
<ccm:application name="ccm-cms-types-xmlfeed"/>
<ccm:application name="ccm-core"/> <ccm:application name="ccm-core"/>
<!-- temporarly disabled, prevents creation of the build script <!-- temporarly disabled, prevents creation of the build script
<ccm:application name="ccm-docmngr"/> <ccm:application name="ccm-docmngr"/>
<ccm:application name="ccm-docrepo"/>
--> -->
<ccm:application name="ccm-faq"/>
<ccm:application name="ccm-formbuilder-pdf"/> <ccm:application name="ccm-formbuilder-pdf"/>
<ccm:application name="ccm-forum"/> <ccm:application name="ccm-forum"/>
<ccm:application name="ccm-forum-categorised"/>
<ccm:application name="ccm-ldn-aplaws"/> <ccm:application name="ccm-gen-aplaws"/>
<!--
<ccm:application name="ccm-ldn-atoz"/> <ccm:application name="ccm-ldn-atoz"/>
-->
<ccm:application name="ccm-ldn-dublin"/> <ccm:application name="ccm-ldn-dublin"/>
<ccm:application name="ccm-ldn-exporter"/> <ccm:application name="ccm-ldn-exporter"/>
<ccm:application name="ccm-ldn-freeform"/> <ccm:application name="ccm-ldn-freeform"/>
<ccm:application name="ccm-ldn-importer"/> <ccm:application name="ccm-ldn-importer"/>
<ccm:application name="ccm-ldn-navigation"/> <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-search"/>
<ccm:application name="ccm-ldn-shortcuts"/> <ccm:application name="ccm-ldn-shortcuts"/>
<ccm:application name="ccm-ldn-subsite"/> <ccm:application name="ccm-ldn-subsite"/>
<ccm:application name="ccm-ldn-terms"/> <ccm:application name="ccm-ldn-terms"/>
<ccm:application name="ccm-ldn-theme"/>
<ccm:application name="ccm-ldn-types-contact"/>
<!--
<ccm:application name="ccm-ldn-types-esdservice"/>
-->
<ccm:application name="ccm-ldn-util"/> <ccm:application name="ccm-ldn-util"/>
<ccm:application name="ccm-ldn-xmlfeed"/> <ccm:application name="ccm-portalserver"/>
<ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-sci-publications"/>
<ccm:application name="ccm-sci-types-organization"/>
<ccm:application name="ccm-simplesurvey"/> <ccm:application name="ccm-simplesurvey"/>
<ccm:application name="ccm-themedirector"/>
<ccm:application name="ccm-user-preferences"/> <ccm:application name="ccm-user-preferences"/>
<ccm:application name="ccm-weblog"/> <ccm:application name="ccm-weblog"/>
<!--
<ccm:application name="ccm-webpage"/> <ccm:application name="ccm-webpage"/>
-->
<!-- tools will be downloaded from trunk, but does not <!-- tools will be downloaded from trunk, but does not
contain java code to be compiled! contain java code to be compiled!