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

Noch kleinere Korrekturen an Update Scripten sowie ZeS Bundle. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@836 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-04-06 10:24:50 +00:00
parent 41b42e9f9a
commit c175af4662
12 changed files with 274 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ccm-core/sql/ccm-core/default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql 100644
View File

@ -0,0 +1,18 @@
--
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public License
-- as published by the Free Software Foundation; either version 2.1 of
-- the License, or (at your option) any later version.
--
-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--
-- $Id: drop_tables_acs_stylesheets.sql pboy $
drop table webapps;

15
ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_workspaces_1.sql → ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql
View File

@ -1,4 +1,6 @@
--
-- Copyright (C) 2008 Peter Boy All Rights Reserved.
--
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public License
-- as published by the Free Software Foundation; either version 2.1 of
@ -13,15 +15,10 @@
-- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--
-- $Id: upd_table_workspaces.sql pboy $
-- $Id: oracle-se-6.6.0-6.6.1.sql 293 2011-01-07 15:10:39Z pboy $
ALTER TABLE workspaces drop constraint workspace_workspace_id_p_vm9z2 CASCADE;
ALTER TABLE workspaces drop constraint workspac_defau_layo_id_f_xvb7g;
ALTER TABLE workspaces drop constraint workspace_workspace_id_f_dted3;
ALTER TABLE workspaces drop constraint workspaces_owner_id_f_mbbra;
ALTER TABLE workspaces drop constraint workspaces_party_id_f_jotdd;
ALTER TABLE workspaces drop constraint workspaces_theme_id_f_tpdju;
PROMPT Red Hat Enterprise CORE 6.6.1 -> 6.6.2 Upgrade Script (Oracle)
-- Just delete the table for web.WebApp which is unfinished work
ALTER TABLE workspaces RENAME TO pw_workspaces ;
@@ ../default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql

28
ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql 100644
View File

@ -0,0 +1,28 @@
--
-- Copyright (C) 2008 Peter Boy All Rights Reserved.
--
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public License
-- as published by the Free Software Foundation; either version 2.1 of
-- the License, or (at your option) any later version.
--
-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--
-- $DateTime: 2010/11/10 23:15:09 $
\echo Red Hat Enterprise CORE 6.6.1 -> 6.6.2 Upgrade Script (PostgreSQL)
-- Just delete the table for web.WebApp which is unfinished work
begin;
\i ../default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql
commit;

3
ccm-core/src/ccm-core.upgrade
View File

@ -37,4 +37,7 @@
<version from="6.6.0" to="6.6.1">
<script sql="ccm-core/upgrade/::database::-6.6.0-6.6.1.sql"/>
</version>
<version from="6.6.1" to="6.6.2">
<script sql="ccm-core/upgrade/::database::-6.6.0-6.6.1.sql"/>
</version>
</upgrade>

2
ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_workspaces.sql
View File

@ -24,6 +24,8 @@ ALTER TABLE workspaces drop constraint workspaces_owner_id_f_mbbra;
ALTER TABLE workspaces drop constraint workspaces_party_id_f_jotdd;
ALTER TABLE workspaces drop constraint workspaces_theme_id_f_tpdju;
DROP INDEX workspaces_party_id_idx ;
ALTER TABLE workspaces RENAME TO pw_workspaces ;

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

@ -1,4 +1,9 @@
# ZeS devel application.cfg
#
# Das devel bundle enthält die Modul Zusammensetzung der aktuellen
# Entwicklungsversion und somit der *kommenden* ZeS Produktiv-Version
#
#
# Main apps
ccm-core
ccm-cms
@ -11,57 +16,30 @@ ccm-cms-assets-relatedlink
# Content types
ccm-cms-types-address
# -- ccm-cms-types-agenda
ccm-cms-types-article
ccm-cms-types-bookmark
ccm-cms-types-contact
ccm-cms-types-event
# -- ccm-cms-types-faqitem
ccm-cms-types-filestorageitem
ccm-cms-types-formitem
ccm-cms-types-formsectionitem
# -- ccm-cms-types-glossaryitem
# -- ccm-cms-types-htmlform
# -- ccm-cms-types-inlinesite
# -- ccm-cms-types-job
# -- ccm-cms-types-legalnotice
# -- 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-pressrelease
# -- ccm-cms-types-researchnetwork
# -- ccm-cms-types-service
ccm-cms-types-siteproxy
# -- xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
ccm-cms-types-xmlfeed
# Applications
# ------------
# -- ccm-auth-http
# -- ccm-bookmarks
# -- ccm-docmngr ## temp., produces errors in build
# -- ccm-formbuilder-pdf
ccm-forum
# ccm-forum-categorised
ccm-portalworkspace
ccm-simplesurvey
ccm-themedirector
ccm-user-preferences
# -- ccm-weblog
# -- ccm-webpage
# ldn extensions
# --------------
# -- ccm-ldn-aplaws
# -- ccm-ldn-atoz
# -- ccm-ldn-dublin
# -- ccm-ldn-exporter
# -- ccm-ldn-freeform
# -- ccm-ldn-importer
ccm-ldn-navigation
ccm-ldn-rss
ccm-ldn-search

2
ccm-zes-aplaws/bundles/devel/cfg/integration.properties
View File

@ -52,7 +52,7 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.d
; Configure dhtml editor for use in cms content-center
; Xinha is default and should work out of the box
;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
; as a temporary measure a different configuration file which includes a link selection box for CCM items
; and CCM images should be specified:
com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js

49
ccm-zes-aplaws/bundles/standard/cfg/applications.cfg
View File

@ -1,4 +1,9 @@
# ZeS standard application.cfg
#
# Das standard bundle enthält die Modul Zusammensetzung der aktuellen
# Produktiv-Version auf dem Softwarestand des Trunk-Levels. Soll vor allem das
# Testen von Update-Scripten erleichtern. AKTUELL: 1.1.0 / r772
#
# Main apps
ccm-core
ccm-cms
@ -9,72 +14,48 @@ ccm-cms-assets-imagestep
ccm-cms-assets-notes
ccm-cms-assets-relatedlink
# Content types
ccm-cms-types-address
# -- ccm-cms-types-agenda
# -- ccm-cms-types-address ## kommt in die kommende Version
ccm-cms-types-article
ccm-cms-types-bookmark
ccm-cms-types-contact
# -- ccm-cms-types-contact ## kommt in die kommende Version
ccm-cms-types-event
# -- ccm-cms-types-faqitem
ccm-cms-types-filestorageitem
ccm-cms-types-formitem
ccm-cms-types-formsectionitem
# -- ccm-cms-types-glossaryitem
# -- ccm-cms-types-htmlform
# -- ccm-cms-types-inlinesite
# -- ccm-cms-types-job
# -- ccm-cms-types-legalnotice
# -- 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-pressrelease
# -- ccm-cms-types-researchnetwork
# -- ccm-cms-types-service
# -- ccm-cms-types-person ## kommt in die kommende Version
ccm-cms-types-siteproxy
# -- xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
ccm-cms-types-xmlfeed
# Applications
# ------------
# -- ccm-auth-http
# -- ccm-bookmarks
# -- ccm-docmngr
# -- ccm-formbuilder-pdf
ccm-forum
ccm-portalworkspace
ccm-simplesurvey
ccm-themedirector
ccm-user-preferences
# -- ccm-weblog
# -- ccm-webpage
# ldn extensions
# --------------
# -- ccm-ldn-aplaws
# -- ccm-ldn-atoz
# -- ccm-ldn-dublin
# -- ccm-ldn-exporter
# -- ccm-ldn-freeform
# -- ccm-ldn-importer
ccm-ldn-navigation
# ccm-ldn-portal nach ccm-portalworkspace
ccm-ldn-rss
ccm-ldn-search
ccm-ldn-shortcuts
ccm-ldn-subsite
ccm-ldn-terms
# ccm-ldn-theme nach ccm-themedirector
ccm-ldn-util
# sci extensions
# --------------
ccm-cms-dabinimporter
ccm-sci-publications
ccm-sci-types-organization
# -- ccm-cms-dabinimporter ## kommt in die kommende Version
# -- ccm-sci-publications ## kommt in die kommende Version
# -- ccm-sci-types-organization ## kommt in die kommende Version
# integration layer
ccm-zes-aplaws

31
ccm-zes-aplaws/bundles/standard/cfg/integration.properties
View File

@ -3,10 +3,12 @@
waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
#
; dhtml editor to use (system wide)
; Xinha is default
; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
#waf.bebop.dhtml_editor=FCKeditor
waf.categorization.show_internal_name=true
waf.categorization.supported_languages=de,en
waf.dispatcher.default_expiry=3600
;
@ -18,6 +20,7 @@ waf.kernel.supported_languages=de,en
; security.properties:
waf.auto_registration_on=false
# MOVED to ui.Config
#waf.pagemap.root=navigation/
#waf.pagemap.workspace=navigation/
@ -48,10 +51,17 @@ com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
; Configure dhtml editor for use in cms content-center
;com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
; Xinha is default and should work out of the box
; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
;com.arsdigita.cms.dhtml_editor_hidden_buttons=
;com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
; as a temporary measure a different configuration file which includes a link selection box for CCM items
; and CCM images should be specified:
com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/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_config=XinhaConfig,/assets/xinha/XinhaConfig.js
; com.arsdigita.cms.dhtml_editor_hidden_buttons=
; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
com.arsdigita.cms.dhtml_editor_plugins=
com.arsdigita.cms.disable_item_pfs=true
@ -113,7 +123,7 @@ com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.
# ccm-ldn-themedirector application
themedirector.default_theme_context=
themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
themedirector.default_theme_path=__ccm__/themes/aplaws-generic
themedirector.default_theme_path=themes/static/aplaws-generic
themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
@ -127,9 +137,12 @@ waf.admin.password=nge2015
waf.admin.password.question=12345
waf.admin.password.answer=6
waf.runtime.jdbc_url=jdbc\:postgresql\://134.102.3.27/zes?user\=zes&password\=zes47web
waf.runtime.jdbc_pool_size=60
waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-test?user\=zes&password\=zes47web
# waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-testupd?user\=zes&password\=zes47web
# waf.runtime.jdbc_url=jdbc\:postgresql\://134.102.3.27/zes?user\=zes&password\=zes47web
waf.runtime.jdbc_pool_size=30
waf.web.server=www.zes.uni-bremen.de\:80
waf.web.host=www.zes.uni-bremen.de\:80
waf.web.site_name=www.zes.uni-bremen.de
waf.web.server=localhost\:8080
# waf.web.server=www.zes.uni-bremen.de\:80
# waf.web.host=www.zes.uni-bremen.de\:80
# waf.web.site_name=www.zes.uni-bremen.de

15
environment/project.xml.gen-dev
View File

@ -8,8 +8,8 @@
ccmVersion="6.1"
name="aplaws-gen"
prettyName="APLAWS plus"
version="1-1-0"
release="rc-1"
version="1-1-2"
release="alpha-1"
webxml="web.xml-aplaws"
webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@ -26,7 +26,7 @@
<ccm:application name="ccm-cms"/>
<ccm:application name="ccm-cms-assets-fileattachment"/>
<!-- <ccm:application name="ccm-cms-assets-imagestep"/> -->
<ccm:application name="ccm-cms-assets-imagestep"/>
<ccm:application name="ccm-cms-assets-notes"/>
<ccm:application name="ccm-cms-assets-relatedlink"/>
@ -67,9 +67,11 @@
<!-- <ccm:application name="ccm-formbuilder-pdf"/> -->
<ccm:application name="ccm-forum"/>
<!-- <ccm:application name="ccm-forum-categorised"/> -->
<!-- <ccm:application name="ccm-portalserver"/> -->
<ccm:application name="ccm-portalworkspace"/>
<!-- <ccm:application name="ccm-simplesurvey"/> -->
<!-- <ccm:application name="ccm-themedirector"/> -->
<ccm:application name="ccm-user-preferences"/>
<ccm:application name="ccm-themedirector"/>
<!-- <ccm:application name="ccm-user-preferences"/> -->
<!-- <ccm:application name="ccm-weblog"/> -->
<!-- <ccm:application name="ccm-webpage"/> -->
@ -81,8 +83,7 @@
<!-- <ccm:application name="ccm-ldn-exporter"/> -->
<!-- <ccm:application name="ccm-ldn-freeform"/> -->
<!-- <ccm:application name="ccm-ldn-importer"/> -->
<!-- <ccm:application name="ccm-ldn-navigation"/> -->
<ccm:application name="ccm-ldn-portal"/>
<ccm:application name="ccm-ldn-navigation"/>
<!-- <ccm:application name="ccm-ldn-rss"/> -->
<ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/>

81
environment/project.xml.zes-dev 100644
View File

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- project.xml -ZeS- containing only those modules used for ZeS -->
<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ccm="http://ccm.redhat.com/ccm-project"
ccmVersion="6.1"
name="aplaws-zes"
prettyName="APLAWS plus"
version="1-1-2"
release="rc2-834"
webxml="web.xml-aplaws"
webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
<ccm:build>
<!-- Main apps -->
<!-- - - - - - -->
<ccm:application name="ccm-core"/>
<ccm:application name="ccm-cms"/>
<!-- Content Assets -->
<!-- - - - - - - - -->
<ccm:application name="ccm-cms-assets-fileattachment"/>
<ccm:application name="ccm-cms-assets-imagestep"/>
<ccm:application name="ccm-cms-assets-notes"/>
<ccm:application name="ccm-cms-assets-relatedlink"/>
<!-- Content Types -->
<!-- - - - - - - - -->
<ccm:application name="ccm-cms-types-address"/>
<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-event"/>
<ccm:application name="ccm-cms-types-filestorageitem"/>
<ccm:application name="ccm-cms-types-formitem"/>
<ccm:application name="ccm-cms-types-formsectionitem"/>
<ccm:application name="ccm-cms-types-mparticle"/>
<ccm:application name="ccm-cms-types-newsitem"/>
<ccm:application name="ccm-cms-types-person"/>
<ccm:application name="ccm-cms-types-siteproxy"/>
<ccm:application name="ccm-cms-types-xmlfeed"/>
<!-- Applications -->
<!-- - - - - - - -->
<ccm:application name="ccm-forum"/>
<ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-simplesurvey"/>
<ccm:application name="ccm-themedirector"/>
<ccm:application name="ccm-user-preferences"/>
<!-- LDN extension -->
<!-- - - - - - - - -->
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-rss"/>
<ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/>
<ccm:application name="ccm-ldn-subsite"/>
<ccm:application name="ccm-ldn-terms"/>
<ccm:application name="ccm-ldn-util"/>
<!-- ZeS extension -->
<!-- - - - - - - - -->
<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"/>
<!-- tools will be downloaded from trunk, but does not
contain java code to be compiled!
<ccm:application name="tools"/> -->
</ccm:build>
</ccm:project>

85
environment/project.xml.zes-std 100644
View File

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- project.xml -ZeS- containing only those modules used for ZeS -->
<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ccm="http://ccm.redhat.com/ccm-project"
ccmVersion="6.1"
name="aplaws-zes"
prettyName="APLAWS plus"
version="1-1-1"
release="rc2-772"
webxml="web.xml-aplaws"
webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
<ccm:build>
<!-- Main apps -->
<!-- - - - - - -->
<ccm:application name="ccm-core"/>
<ccm:application name="ccm-cms"/>
<!-- Content Assets -->
<!-- - - - - - - - -->
<ccm:application name="ccm-cms-assets-fileattachment"/>
<ccm:application name="ccm-cms-assets-imagestep"/>
<ccm:application name="ccm-cms-assets-notes"/>
<ccm:application name="ccm-cms-assets-relatedlink"/>
<!-- Content Types -->
<!-- - - - - - - - -->
<!-- <ccm:application name="ccm-cms-types-address"/> -->
<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-event"/>
<ccm:application name="ccm-cms-types-filestorageitem"/>
<ccm:application name="ccm-cms-types-formitem"/>
<ccm:application name="ccm-cms-types-formsectionitem"/>
<ccm:application name="ccm-cms-types-mparticle"/>
<ccm:application name="ccm-cms-types-newsitem"/>
<!-- <ccm:application name="ccm-cms-types-person"/> -->
<ccm:application name="ccm-cms-types-siteproxy"/>
<ccm:application name="ccm-cms-types-xmlfeed"/>
<!-- Applications -->
<!-- - - - - - - -->
<ccm:application name="ccm-forum"/>
<ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-simplesurvey"/>
<ccm:application name="ccm-themedirector"/>
<ccm:application name="ccm-user-preferences"/>
<!-- LDN extension -->
<!-- - - - - - - - -->
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-rss"/>
<ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/>
<ccm:application name="ccm-ldn-subsite"/>
<ccm:application name="ccm-ldn-terms"/>
<ccm:application name="ccm-ldn-util"/>
<!-- ZeS extension -->
<!-- - - - - - - - -->
<!-- <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"/>
<!-- tools will be downloaded from trunk, but does not
contain java code to be compiled!
<ccm:application name="tools"/> -->
</ccm:build>
</ccm:project>