From 086a958641f84870c02cf17f818ce642a707b401 Mon Sep 17 00:00:00 2001 From: quasi Date: Mon, 29 Jun 2009 17:59:26 +0000 Subject: [PATCH] BaseAddress MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Authoringkit hinzugefügt. Ungetestet, da meine Devel-Umgebung mal wieder nicht funktioniert. Es fhelt noch die korrekte Einstellung der SingleSelect-Box für das Land. git-svn-id: https://svn.libreccm.org/ccm/trunk@204 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/content-types/BaseAddress.pdl | 2 +- .../sql/ccm-zes-dbde/oracle-se-create.sql | 22 --------------- .../sql/ccm-zes-dbde/postgres-create.sql | 23 --------------- .../cms/contenttypes/BaseAddress.xml | 28 +++++++++++++++++++ .../cms/contenttypes/BaseAddress.java | 4 +-- 5 files changed, 31 insertions(+), 48 deletions(-) delete mode 100755 ccm-cms-types-baseAddress/sql/ccm-zes-dbde/oracle-se-create.sql delete mode 100755 ccm-cms-types-baseAddress/sql/ccm-zes-dbde/postgres-create.sql create mode 100644 ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml diff --git a/ccm-cms-types-baseAddress/pdl/com/arsdigita/content-types/BaseAddress.pdl b/ccm-cms-types-baseAddress/pdl/com/arsdigita/content-types/BaseAddress.pdl index f9299b601..fd70eff04 100644 --- a/ccm-cms-types-baseAddress/pdl/com/arsdigita/content-types/BaseAddress.pdl +++ b/ccm-cms-types-baseAddress/pdl/com/arsdigita/content-types/BaseAddress.pdl @@ -11,6 +11,6 @@ object type BaseAddress extends ContentItem { String [0..1] state = ct_baseAddresses.state VARCHAR(200); String [0..1] isoCountryCode = ct_baseAddresses.isoCountryCode VARCHAR(2); - reference key ( ct_baseAddress.address_id ); + reference key ( ct_baseAddresses.address_id ); } diff --git a/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/oracle-se-create.sql b/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/oracle-se-create.sql deleted file mode 100755 index 733784c1c..000000000 --- a/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/oracle-se-create.sql +++ /dev/null @@ -1,22 +0,0 @@ --- --- Copyright (C) 2003-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 --- --- $Id: oracle-se-create.sql 287 2005-02-22 00:29:02Z sskracic $ --- $DateTime: 2004/08/17 23:15:09 $ -@ ddl/oracle-se/create.sql - -@ ddl/oracle-se/deferred.sql diff --git a/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/postgres-create.sql b/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/postgres-create.sql deleted file mode 100755 index 7ea108389..000000000 --- a/ccm-cms-types-baseAddress/sql/ccm-zes-dbde/postgres-create.sql +++ /dev/null @@ -1,23 +0,0 @@ --- --- Copyright (C) 2003-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 --- --- $Id: postgres-create.sql 287 2005-02-22 00:29:02Z sskracic $ --- $DateTime: 2004/08/17 23:15:09 $ -begin; -\i ddl/postgres/create.sql -\i ddl/postgres/deferred.sql -end; diff --git a/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml b/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml new file mode 100644 index 000000000..8c99f5d9e --- /dev/null +++ b/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + diff --git a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java index e3e03e12e..f36d0e560 100755 --- a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java +++ b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java @@ -21,7 +21,7 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.globalization.LocaleNegotiator; import com.arsdigita.cms.ContentType; -import com.arsdigita.cms.ContentItem; +import com.arsdigita.cms.ContentPage; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; @@ -43,7 +43,7 @@ import java.util.Locale; * * @author Sören Bernstein **/ -public class BaseAddress extends ContentItem { +public class BaseAddress extends ContentPage { /** PDL property name for address */ public static final String ADDRESS = "address";