From de26b1e1c9490821ea3d2bcd36b1e8c1319baa30 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 4 May 2012 11:42:00 +0000
Subject: [PATCH] Fixed Upgrade Script zu ccm-atoz.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1643 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-atoz/application.xml                                   | 1 -
 ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl                   | 7 +++----
 .../upgrade/default/6.6.1-6.6.2/drop_app_table.sql         | 5 ++---
 ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql    | 1 -
 ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.1-6.6.2.sql     | 1 -
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ccm-atoz/application.xml b/ccm-atoz/application.xml
index 14f79d535..72d062470 100755
--- a/ccm-atoz/application.xml
+++ b/ccm-atoz/application.xml
@@ -11,7 +11,6 @@
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-subsite" version="6.6.0" relation="ge"/>
-    <!-- <ccm:requires name="ccm-ldn-aplaws" version="6.6.0" relation="ge"/> -->
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-util" version="6.6.0" relation="ge"/>
     <!--
diff --git a/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl
index c9090c89d..0002af494 100755
--- a/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl
+++ b/ccm-atoz/pdl/com/arsdigita/atoz/AtoZ.pdl
@@ -19,9 +19,8 @@ model com.arsdigita.atoz;
 
 import com.arsdigita.web.Application;
 
+// In contrast to other applications atoz_app is needed here and used in
+// associations, e.g. AtoZProvider.
 object type AtoZ extends Application {
- // Nothing to persist yet
-    // there is only one instance of AtoZ and
-    // no instance specific settings about to be persisted.
- // reference key (atoz_app.application_id);
+    reference key (atoz_app.application_id);
 }
diff --git a/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/drop_app_table.sql b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/drop_app_table.sql
index 842fe6f04..b1acf663c 100644
--- a/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/drop_app_table.sql
+++ b/ccm-atoz/sql/ccm-atoz/upgrade/default/6.6.1-6.6.2/drop_app_table.sql
@@ -17,7 +17,6 @@
 --
 -- $Id: drop_app_table.sql pboy $
 
--- drops table atoz_app which just contained application type id and is
--- never used for any action. 
+-- Don't do it! Application table is required with this package.
 
-drop table atoz_app ;
+-- drop table atoz_app ;
diff --git a/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql
index 2494b6f97..7084f6405 100644
--- a/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql
+++ b/ccm-atoz/sql/ccm-atoz/upgrade/oracle-se-6.6.1-6.6.2.sql
@@ -23,6 +23,5 @@
 
 -- NOTE: Order is significant
 @@ default/6.6.1-6.6.2/upd_system_tables.sql
-@@ default/6.6.1-6.6.2/drop_app_table.sql
 @@ default/6.6.1-6.6.2/ren_domainprovider_table.sql
 
diff --git a/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.1-6.6.2.sql
index 45ca210ba..4d8002e40 100644
--- a/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.1-6.6.2.sql
+++ b/ccm-atoz/sql/ccm-atoz/upgrade/postgres-6.6.1-6.6.2.sql
@@ -26,7 +26,6 @@ begin;
 
 -- NOTE: Order is significant
 \i default/6.6.1-6.6.2/upd_system_tables.sql
-\i default/6.6.1-6.6.2/drop_app_table.sql
 \i default/6.6.1-6.6.2/ren_domainprovider_table.sql
 
 commit;