From bba7fe7f994a991fb5b7321c5c3dde066a057b10 Mon Sep 17 00:00:00 2001 From: pb Date: Mon, 26 Dec 2011 16:22:23 +0000 Subject: [PATCH] =?UTF-8?q?ccm-ldn-shortcuts=20umbenannt=20nach=20ccm-shor?= =?UTF-8?q?tcuts=20und=20refactored=20als=20legacy-free=20application.=20U?= =?UTF-8?q?pdate=20Script=20ccm-shortcuts=20--from-version=206.6.0=20=20--?= =?UTF-8?q?to-version=206.6.1=20muss=20ausgef=C3=BChrt=20werden..=20Extern?= =?UTF-8?q?e=20Themes=20wie=20Mandalay=20m=C3=BCssen=20angepasst=20werden:?= =?UTF-8?q?=20Namespace=20london/shortcuts=20=20->=20=20shortcuts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1398 8810af33-2d31-482b-a856-94f89814c4df --- .../bundles/demo/cfg/integration.properties | 24 ++-- .../bundles/devel/cfg/integration.properties | 18 ++- ccm-bundle/bundles/devel/cfg/project.xml | 6 +- .../ccm-cms/upgrade/postgres-6.6.2-6.6.3.sql | 2 - .../arsdigita/london/shortcuts/Shortcut.pdl | 11 -- .../src/ccm-ldn-shortcuts.config | 5 - .../london/content-types/Contact.pdl | 10 +- .../com/arsdigita/portalworkspace/Loader.java | 16 +-- .../bundles/demo/cfg/integration.properties | 3 +- .../bundles/devel/cfg/integration.properties | 21 ++- ccm-sci-bundle/bundles/devel/cfg/project.xml | 10 +- .../static/aplaws-generic/shortcuts-index.xsl | 2 +- .../static/aplaws-generic/subsite-index.xsl | 2 +- .../.classpath | 0 {ccm-ldn-shortcuts => ccm-shortcuts}/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.svnignore | 0 .../application.xml | 4 +- .../doc/shortcuts-standalone/README | 4 +- .../doc/shortcuts-standalone/bebop-define.tld | 0 .../doc/shortcuts-standalone/bebop-show.tld | 0 .../doc/shortcuts-standalone/web.xml | 4 +- .../doc/web.xml-shortcuts.in | 4 +- .../pdl/com/arsdigita/shortcuts/Shortcut.pdl | 28 ++++ .../com/arsdigita}/shortcuts/Shortcuts.pdl | 7 +- .../default/sequence-ss_shortcuts_seq.sql | 0 .../default/table-sc_shortcuts.sql | 0 .../sql/ccm-shortcuts}/oracle-se-create.sql | 0 .../sql/ccm-shortcuts}/postgres-create.sql | 0 .../default/6.6.0-6.6.1/drop_app_table.sql | 23 +++ .../6.6.0-6.6.1/remove_legacy_entries.sql | 131 ++++++++++++++++++ .../default/6.6.0-6.6.1/upd_system_tables.sql | 66 +++++++++ .../upgrade/oracle-se-6.6.0-6.6.1.sql | 30 ++++ .../upgrade/postgres-6.6.0-6.6.1.sql | 33 +++++ ccm-shortcuts/src/ccm-shortcuts.config | 5 + .../src/ccm-shortcuts.load | 6 +- ccm-shortcuts/src/ccm-shortcuts.upgrade | 5 + .../com/arsdigita}/shortcuts/Initializer.java | 4 +- .../src/com/arsdigita}/shortcuts/Loader.java | 45 ++++-- .../com/arsdigita}/shortcuts/Shortcut.java | 5 +- .../shortcuts/ShortcutCollection.java | 2 +- .../arsdigita}/shortcuts/ShortcutFilter.java | 2 +- .../arsdigita}/shortcuts/ShortcutUtil.java | 5 +- .../com/arsdigita}/shortcuts/Shortcuts.java | 16 +-- .../arsdigita}/shortcuts/ShortcutsConfig.java | 38 ++++- .../ShortcutsConfig_parameter.properties | 0 .../arsdigita}/shortcuts/ui/AdminPanel.java | 6 +- .../arsdigita}/shortcuts/ui/ShortcutForm.java | 6 +- .../shortcuts/ui/ShortcutsTable.java | 8 +- .../web/WEB-INF/web.ccm-shortcuts.xml | 10 +- .../web/templates/ccm-shortcuts}/index.jsp | 2 +- .../heirloom}/apps/shortcuts/xsl/index.xsl | 6 +- .../pdl/com/arsdigita/subsite/Subsite.pdl | 2 + .../heirloom/apps/subsite/xsl/index.xsl | 2 +- environment/local.ccm.properties | 15 +- tools-ng/netbeans/project.xml | 101 +++++++------- 57 files changed, 563 insertions(+), 192 deletions(-) delete mode 100755 ccm-ldn-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcut.pdl delete mode 100755 ccm-ldn-shortcuts/src/ccm-ldn-shortcuts.config rename {ccm-ldn-shortcuts => ccm-shortcuts}/.classpath (100%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/.project (100%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/.settings/org.eclipse.jdt.core.prefs (100%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/.svnignore (100%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/application.xml (93%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/doc/shortcuts-standalone/README (90%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/doc/shortcuts-standalone/bebop-define.tld (100%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/doc/shortcuts-standalone/bebop-show.tld (100%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/doc/shortcuts-standalone/web.xml (90%) rename {ccm-ldn-shortcuts => ccm-shortcuts}/doc/web.xml-shortcuts.in (78%) create mode 100755 ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcut.pdl rename {ccm-ldn-shortcuts/pdl/com/arsdigita/london => ccm-shortcuts/pdl/com/arsdigita}/shortcuts/Shortcuts.pdl (79%) rename {ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts => ccm-shortcuts/sql/ccm-shortcuts}/default/sequence-ss_shortcuts_seq.sql (100%) rename {ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts => ccm-shortcuts/sql/ccm-shortcuts}/default/table-sc_shortcuts.sql (100%) rename {ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts => ccm-shortcuts/sql/ccm-shortcuts}/oracle-se-create.sql (100%) rename {ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts => ccm-shortcuts/sql/ccm-shortcuts}/postgres-create.sql (100%) create mode 100644 ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/drop_app_table.sql create mode 100644 ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql create mode 100644 ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql create mode 100644 ccm-shortcuts/sql/ccm-shortcuts/upgrade/oracle-se-6.6.0-6.6.1.sql create mode 100644 ccm-shortcuts/sql/ccm-shortcuts/upgrade/postgres-6.6.0-6.6.1.sql create mode 100755 ccm-shortcuts/src/ccm-shortcuts.config rename ccm-ldn-shortcuts/src/ccm-ldn-shortcuts.load => ccm-shortcuts/src/ccm-shortcuts.load (58%) create mode 100755 ccm-shortcuts/src/ccm-shortcuts.upgrade rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/Initializer.java (96%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/Loader.java (51%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/Shortcut.java (95%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/ShortcutCollection.java (98%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/ShortcutFilter.java (98%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/ShortcutUtil.java (96%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/Shortcuts.java (87%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/ShortcutsConfig.java (61%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/ShortcutsConfig_parameter.properties (100%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/ui/AdminPanel.java (91%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/ui/ShortcutForm.java (98%) rename {ccm-ldn-shortcuts/src/com/arsdigita/london => ccm-shortcuts/src/com/arsdigita}/shortcuts/ui/ShortcutsTable.java (95%) rename ccm-ldn-shortcuts/web/WEB-INF/web.ccm-ldn-shortcuts.xml => ccm-shortcuts/web/WEB-INF/web.ccm-shortcuts.xml (71%) rename {ccm-ldn-shortcuts/web/templates/ccm-ldn-shortcuts => ccm-shortcuts/web/templates/ccm-shortcuts}/index.jsp (90%) rename {ccm-ldn-shortcuts/web/__ccm__ => ccm-shortcuts/web/themes/heirloom}/apps/shortcuts/xsl/index.xsl (69%) diff --git a/ccm-bundle/bundles/demo/cfg/integration.properties b/ccm-bundle/bundles/demo/cfg/integration.properties index 54b7a0858..bf42a9727 100644 --- a/ccm-bundle/bundles/demo/cfg/integration.properties +++ b/ccm-bundle/bundles/demo/cfg/integration.properties @@ -5,7 +5,8 @@ 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 +; To use FCKeditor configure: +; waf.bebop.dhtml_editor=FCKeditor waf.categorization.show_internal_name=true @@ -30,7 +31,7 @@ core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp ; workflow configuration waf.workflow.simple.alerts_enabled=true -waf.workflow.simple.alerts_sender=root@localhost.localdomain +waf.workflow.simple.alerts_sender=webmaster@libreCMS.org ; Configures the xml processing waf.xml.xsl_transformer=xalan @@ -46,17 +47,14 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch ; 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=Xinha.Config,/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=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js +; 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 ; to use FCKeditor: ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js -; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.js ; com.arsdigita.cms.dhtml_editor_hidden_buttons= -; com.arsdigita.cms.dhtml_editor_plugins= - +; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS com.arsdigita.cms.disable_item_pfs=true @@ -111,7 +109,7 @@ com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt com.arsdigita.london.search.show_sponsored_links=true -# ccm-ldn-subsite application +# ccm-subsite application com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker @@ -129,14 +127,14 @@ themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl # ============================================================================================= # runtime specific configurations -waf.admin.email=webmaster@scientificCMS.org +waf.admin.email=webmaster@libreCMS.org waf.admin.name.given=SCI waf.admin.name.family=Administrator -waf.admin.password=sci2000 +waf.admin.password=lib2000 waf.admin.password.question=12345 waf.admin.password.answer=6 -waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-sci?user\=sci&password\=sci47web&stringtype\=unspecified +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-lib?user\=ccm&password\=sci47web&stringtype\=unspecified waf.runtime.jdbc_pool_size=30 waf.web.server=localhost\:8080 diff --git a/ccm-bundle/bundles/devel/cfg/integration.properties b/ccm-bundle/bundles/devel/cfg/integration.properties index c218bb5fd..fb0cac560 100644 --- a/ccm-bundle/bundles/devel/cfg/integration.properties +++ b/ccm-bundle/bundles/devel/cfg/integration.properties @@ -5,7 +5,8 @@ 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 +; To use FCKeditor configure: +; waf.bebop.dhtml_editor=FCKeditor waf.categorization.show_internal_name=true @@ -30,7 +31,7 @@ core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp ; workflow configuration waf.workflow.simple.alerts_enabled=true -waf.workflow.simple.alerts_sender=root@localhost.localdomain +waf.workflow.simple.alerts_sender=webmaster@localhost.localdomain ; Configures the xml processing waf.xml.xsl_transformer=xalan @@ -46,17 +47,14 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch ; 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=Xinha.Config,/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=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js +; 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 ; to use FCKeditor: ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js -; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/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 @@ -111,7 +109,7 @@ com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt com.arsdigita.london.search.show_sponsored_links=true -# ccm-ldn-subsite application +# ccm-subsite application com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker @@ -132,7 +130,7 @@ themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl waf.admin.email=webmaster@openccm.org waf.admin.name.given=OpenCCM waf.admin.name.family=Administrator -waf.admin.password=WaeGgfsh +waf.admin.password=lib2000 waf.admin.password.question=12345 waf.admin.password.answer=6 diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-bundle/bundles/devel/cfg/project.xml index aae5c6c7f..87c1c4bd1 100644 --- a/ccm-bundle/bundles/devel/cfg/project.xml +++ b/ccm-bundle/bundles/devel/cfg/project.xml @@ -1,7 +1,7 @@ - + - + + + + + + @@ -74,7 +80,6 @@ - diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl index a4e103c89..e55ae29e9 100644 --- a/ccm-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl +++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl @@ -9,7 +9,7 @@ --> - + diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/subsite-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/subsite-index.xsl index cb04a688c..1a894e0f5 100644 --- a/ccm-sci-bundle/web/themes/static/aplaws-generic/subsite-index.xsl +++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/subsite-index.xsl @@ -9,7 +9,7 @@ --> - + diff --git a/ccm-ldn-shortcuts/.classpath b/ccm-shortcuts/.classpath similarity index 100% rename from ccm-ldn-shortcuts/.classpath rename to ccm-shortcuts/.classpath diff --git a/ccm-ldn-shortcuts/.project b/ccm-shortcuts/.project similarity index 100% rename from ccm-ldn-shortcuts/.project rename to ccm-shortcuts/.project diff --git a/ccm-ldn-shortcuts/.settings/org.eclipse.jdt.core.prefs b/ccm-shortcuts/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from ccm-ldn-shortcuts/.settings/org.eclipse.jdt.core.prefs rename to ccm-shortcuts/.settings/org.eclipse.jdt.core.prefs diff --git a/ccm-ldn-shortcuts/.settings/org.eclipse.jdt.ui.prefs b/ccm-shortcuts/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from ccm-ldn-shortcuts/.settings/org.eclipse.jdt.ui.prefs rename to ccm-shortcuts/.settings/org.eclipse.jdt.ui.prefs diff --git a/ccm-ldn-shortcuts/.svnignore b/ccm-shortcuts/.svnignore similarity index 100% rename from ccm-ldn-shortcuts/.svnignore rename to ccm-shortcuts/.svnignore diff --git a/ccm-ldn-shortcuts/application.xml b/ccm-shortcuts/application.xml similarity index 93% rename from ccm-ldn-shortcuts/application.xml rename to ccm-shortcuts/application.xml index babaf72c1..21dbd0047 100755 --- a/ccm-ldn-shortcuts/application.xml +++ b/ccm-shortcuts/application.xml @@ -1,8 +1,8 @@ diff --git a/ccm-ldn-shortcuts/doc/shortcuts-standalone/README b/ccm-shortcuts/doc/shortcuts-standalone/README similarity index 90% rename from ccm-ldn-shortcuts/doc/shortcuts-standalone/README rename to ccm-shortcuts/doc/shortcuts-standalone/README index c07fad383..94b48a697 100644 --- a/ccm-ldn-shortcuts/doc/shortcuts-standalone/README +++ b/ccm-shortcuts/doc/shortcuts-standalone/README @@ -1,5 +1,5 @@ Up to APLAWS version 1.0.4 shortcuts had been installed into its own -application context: [webapps]/ccm-ldn-shortcuts. +application context: [webapps]/ccm-shortcuts. Now it is installed inside the main APLAWS application context along with all other applications. @@ -8,7 +8,7 @@ If shortcuts should be installed as its own web context again following modifications are necessary: 1. remove webapp="xxx" from application.xml 2. move the files in this dir to WEB-INF/ -3. change src/com/ad/london/shortcuts/Shortcuts.java +3. change src/com/ad/shortcuts/Shortcuts.java method getServletContext() as back to "/files" 4. edit __ccm__/.../xsl/index.xsl according the comment 5. edit in ccm-ldn-aplaws /web/__ccm__/themes/aplaws/shortcuts.xml diff --git a/ccm-ldn-shortcuts/doc/shortcuts-standalone/bebop-define.tld b/ccm-shortcuts/doc/shortcuts-standalone/bebop-define.tld similarity index 100% rename from ccm-ldn-shortcuts/doc/shortcuts-standalone/bebop-define.tld rename to ccm-shortcuts/doc/shortcuts-standalone/bebop-define.tld diff --git a/ccm-ldn-shortcuts/doc/shortcuts-standalone/bebop-show.tld b/ccm-shortcuts/doc/shortcuts-standalone/bebop-show.tld similarity index 100% rename from ccm-ldn-shortcuts/doc/shortcuts-standalone/bebop-show.tld rename to ccm-shortcuts/doc/shortcuts-standalone/bebop-show.tld diff --git a/ccm-ldn-shortcuts/doc/shortcuts-standalone/web.xml b/ccm-shortcuts/doc/shortcuts-standalone/web.xml similarity index 90% rename from ccm-ldn-shortcuts/doc/shortcuts-standalone/web.xml rename to ccm-shortcuts/doc/shortcuts-standalone/web.xml index 7084c53ec..929964e2d 100755 --- a/ccm-ldn-shortcuts/doc/shortcuts-standalone/web.xml +++ b/ccm-shortcuts/doc/shortcuts-standalone/web.xml @@ -8,7 +8,7 @@ com.arsdigita.web.ContextRegistrationServlet uri - /ccm-ldn-shortcuts/ + /ccm-shortcuts/ 1 @@ -18,7 +18,7 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-shortcuts + /templates/ccm-shortcuts diff --git a/ccm-ldn-shortcuts/doc/web.xml-shortcuts.in b/ccm-shortcuts/doc/web.xml-shortcuts.in similarity index 78% rename from ccm-ldn-shortcuts/doc/web.xml-shortcuts.in rename to ccm-shortcuts/doc/web.xml-shortcuts.in index b1aa87ccd..3d831840b 100644 --- a/ccm-ldn-shortcuts/doc/web.xml-shortcuts.in +++ b/ccm-shortcuts/doc/web.xml-shortcuts.in @@ -4,13 +4,13 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-shortcuts + /templates/ccm-shortcuts shortcuts-files - /ccm-ldn-shortcuts/files/* + /ccm-shortcuts/files/* diff --git a/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcut.pdl b/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcut.pdl new file mode 100755 index 000000000..c151db86d --- /dev/null +++ b/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcut.pdl @@ -0,0 +1,28 @@ +// +// Copyright (C) 2001-2004 Red Hat Inc. 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 + +model com.arsdigita.shortcuts; + +object type Shortcut { + + BigDecimal[1..1] shortcutID = sc_shortcuts.shortcut_id INTEGER; + String[1..1] urlKey = sc_shortcuts.url_key VARCHAR(1000); + String[1..1] redirect = sc_shortcuts.redirect VARCHAR(1000); + + object key (shortcutID); +} + diff --git a/ccm-ldn-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcuts.pdl b/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcuts.pdl similarity index 79% rename from ccm-ldn-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcuts.pdl rename to ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcuts.pdl index 704dc2264..4f949cc7a 100755 --- a/ccm-ldn-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcuts.pdl +++ b/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcuts.pdl @@ -15,10 +15,13 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.london.shortcuts; +model com.arsdigita.shortcuts; import com.arsdigita.web.Application; object type Shortcuts extends Application { - reference key (sc_app.application_id); + // nothing to persist + // there is only one instance of shortcuts (the admin application) and + // no instance specific settings to be persisted. + // reference key (sc_app.application_id); } diff --git a/ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts/default/sequence-ss_shortcuts_seq.sql b/ccm-shortcuts/sql/ccm-shortcuts/default/sequence-ss_shortcuts_seq.sql similarity index 100% rename from ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts/default/sequence-ss_shortcuts_seq.sql rename to ccm-shortcuts/sql/ccm-shortcuts/default/sequence-ss_shortcuts_seq.sql diff --git a/ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts/default/table-sc_shortcuts.sql b/ccm-shortcuts/sql/ccm-shortcuts/default/table-sc_shortcuts.sql similarity index 100% rename from ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts/default/table-sc_shortcuts.sql rename to ccm-shortcuts/sql/ccm-shortcuts/default/table-sc_shortcuts.sql diff --git a/ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts/oracle-se-create.sql b/ccm-shortcuts/sql/ccm-shortcuts/oracle-se-create.sql similarity index 100% rename from ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts/oracle-se-create.sql rename to ccm-shortcuts/sql/ccm-shortcuts/oracle-se-create.sql diff --git a/ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts/postgres-create.sql b/ccm-shortcuts/sql/ccm-shortcuts/postgres-create.sql similarity index 100% rename from ccm-ldn-shortcuts/sql/ccm-ldn-shortcuts/postgres-create.sql rename to ccm-shortcuts/sql/ccm-shortcuts/postgres-create.sql diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/drop_app_table.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/drop_app_table.sql new file mode 100644 index 000000000..e8b00a5a9 --- /dev/null +++ b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/drop_app_table.sql @@ -0,0 +1,23 @@ +-- +-- Copyright (C) 2011 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 +-- +-- $Id: drop_app_table.sql pboy $ + +-- drops table subsite_app which just contained application type id and is +-- never used for any action. + +drop table sc_app ; diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql new file mode 100644 index 000000000..9e8935e0c --- /dev/null +++ b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql @@ -0,0 +1,131 @@ +-- +-- Copyright (C) 2011 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 +-- +-- $Id: remove_legacy_entries.sql $ + +-- Subsite is now initialized as a legacy free type of application so +-- entries in tables apm_package_types are no longer needed. + + +-- in case there may be several application instances! + +-- delete from object_context all entries referring to node_id in site_nodes +delete from object_context + where object_id in + (select node_id from site_nodes object_id where object_id in + ( select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%shortcuts.Shortcuts%') + ) + ); + +-- delete from acs_objects all entries referring to node_id in site_nodes +alter table site_nodes drop constraint site_nodes_node_id_f_n1m2y ; +delete from acs_objects + where object_id in + (select node_id from site_nodes where object_id in + ( select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%shortcuts.Shortcuts%') + ) + ); + +-- delete all entries in site_nodes referring to a subsite instance +delete from site_nodes + where object_id in + (select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%shortcuts.Shortcuts%') + ); +alter table site_nodes add constraint site_nodes_node_id_f_n1m2y + FOREIGN KEY (node_id) + REFERENCES acs_objects (object_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; + + + +-- delete from object_context all entries referring to package_id in apm_packages +delete from object_context + where object_id in + (select package_id from apm_packages where package_type_id = + (select package_type_id from application_types + where object_type + like 'com.arsdigita.shortcuts.Shortcuts') + ); + +-- delete from acs_objects all entries referring to package_id in apm_packages +alter table apm_packages drop constraint apm_package_package_id_f_46may ; +alter table applications drop constraint application_package_id_f_cdaho ; +delete from acs_objects + where object_id in + (select package_id from apm_packages where package_type_id = + (select package_type_id from application_types + where object_type + like 'com.arsdigita.shortcuts.Shortcuts') + ); + +-- delete all entries for subsite instances in apm_packages +-- identified by package_type_id in application_types +delete from apm_packages + where package_type_id = + (select package_type_id from application_types + where object_type + like 'com.arsdigita.shortcuts.Shortcuts') ; + +-- there seem to be no intries for a apm_packages_types entry (row) in +-- acs_objects or object_context! + +-- delete all entries for subsite in apm_package_types identified by +-- package_type_id in application_types +alter table application_types drop constraint applica_typ_pac_typ_id_f_v80ma ; +delete from apm_package_types + where package_type_id = + (select package_type_id from application_types + where object_type + like 'com.arsdigita.shortcuts.Shortcuts') ; + + +-- set package_id to null for all entries referring to a subsite instance +-- (indicating a new legacy free application) +update applications + set package_id = null + where application_type_id = + (select application_type_id from application_types + where object_type + like 'com.arsdigita.shortcuts.Shortcuts') ; + +-- set package_id to null for all entries referring to a subsite instance +-- (indicating a new legacy free application) +update application_types + set package_type_id = null + where object_type like 'com.arsdigita.shortcuts.Shortcuts' ; + +alter table application_types add constraint applica_typ_pac_typ_id_f_v80ma + FOREIGN KEY (package_type_id) + REFERENCES apm_package_types (package_type_id) + MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION ; +alter table applications add constraint application_package_id_f_cdaho + FOREIGN KEY (package_id) + REFERENCES apm_packages (package_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; +alter table apm_packages add constraint apm_package_package_id_f_46may + FOREIGN KEY (package_id) + REFERENCES acs_objects (object_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql new file mode 100644 index 000000000..6b8f03e73 --- /dev/null +++ b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql @@ -0,0 +1,66 @@ +-- +-- Copyright (C) 2011 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 +-- +-- $Id: upd_system_tables.sql pboy $ + +-- adjust various system tables to the new name of application shortcuts + +alter table init_requirements drop constraint init_requirements_init_f_cmmdn ; + +alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ; + +update inits + set class_name=replace(class_name,'london.shortcuts', 'shortcuts') + where class_name like '%london.shortcuts%' ; + +update init_requirements + set init=replace(init,'london.shortcuts', 'shortcuts') + where init like '%london.shortcuts%' ; + +update init_requirements + set required_init=replace(required_init,'london.shortcuts', 'shortcuts') + where required_init like '%london.shortcuts%' ; + +ALTER TABLE ONLY init_requirements + ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init) + REFERENCES inits (class_name) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION; + +ALTER TABLE init_requirements + ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init) + REFERENCES inits (class_name) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION; + + +update application_types + set object_type=replace(object_type,'london.shortcuts', 'shortcuts') + where object_type like '%london.shortcuts%' ; + +-- table applications doesn't require an update + +-- table apm_package_types doesn't require an update + +-- table apm_packages doesn't require an update either +-- table site_nodes doesn't require an update either + + +-- update application type in acs_objects +update acs_objects + set (object_type,default_domain_class) = + (replace(object_type,'london.shortcuts', 'shortcuts') , + replace(default_domain_class,'london.shortcuts', 'shortcuts') ) + where object_type like '%london.shortcuts%' ; diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/oracle-se-6.6.0-6.6.1.sql new file mode 100644 index 000000000..9cd2cc501 --- /dev/null +++ b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -0,0 +1,30 @@ +-- +-- Copyright (C) 2011 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: 2011/03/27 23:15:09 $ +-- $Id: oracle-se-6.6.0-6.6.1 pboy $ + +-- drop table subsite_app - not needed anyway +@@ default/6.6.0-6.6.1/drop_app_table.sql +-- rename table containing defined subsites following ccm naming conventions +@@ default/6.6.0-6.6.1/ren_sites_table.sql +-- rename application from london.subsite to subsite +@@ default/6.6.0-6.6.1/upd_system_tables.sql +-- remove legacy compatible bits +@@ default/6.6.0-6.6.1/remove_legacy_entries.sql +-- adjust class name in content_sections table +@@ default/6.6.0-6.6.1/upd_cms_tables.sql diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/postgres-6.6.0-6.6.1.sql new file mode 100644 index 000000000..453c8ce95 --- /dev/null +++ b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/postgres-6.6.0-6.6.1.sql @@ -0,0 +1,33 @@ +-- +-- Copyright (C) 2011 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 ccm-shortcuts 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL) + +begin; + +-- drop table sc_app - not needed anyway +\i default/6.6.0-6.6.1/drop_app_table.sql + +-- rename application from london.shortcuts to shortcuts +\i default/6.6.0-6.6.1/upd_system_tables.sql + +-- remove legacy compatible bits +\i default/6.6.0-6.6.1/remove_legacy_entries.sql + +commit; diff --git a/ccm-shortcuts/src/ccm-shortcuts.config b/ccm-shortcuts/src/ccm-shortcuts.config new file mode 100755 index 000000000..201a6b1a1 --- /dev/null +++ b/ccm-shortcuts/src/ccm-shortcuts.config @@ -0,0 +1,5 @@ + + + + diff --git a/ccm-ldn-shortcuts/src/ccm-ldn-shortcuts.load b/ccm-shortcuts/src/ccm-shortcuts.load similarity index 58% rename from ccm-ldn-shortcuts/src/ccm-ldn-shortcuts.load rename to ccm-shortcuts/src/ccm-shortcuts.load index fb904ca6b..11290a457 100755 --- a/ccm-ldn-shortcuts/src/ccm-ldn-shortcuts.load +++ b/ccm-shortcuts/src/ccm-shortcuts.load @@ -8,10 +8,10 @@ - + - - + + diff --git a/ccm-shortcuts/src/ccm-shortcuts.upgrade b/ccm-shortcuts/src/ccm-shortcuts.upgrade new file mode 100755 index 000000000..3ba556601 --- /dev/null +++ b/ccm-shortcuts/src/ccm-shortcuts.upgrade @@ -0,0 +1,5 @@ + + +