From ead5180640a60c53c559a14c76af5e967c54b11b Mon Sep 17 00:00:00 2001 From: pb Date: Thu, 20 May 2010 11:05:13 +0000 Subject: [PATCH] =?UTF-8?q?ccm-cms-assets-filestorageitem=20Directory=20St?= =?UTF-8?q?ruktur=20an=20Standard=20angepasst,=20ccm-cms=20und=20gen-bundl?= =?UTF-8?q?e=20an=20=C3=84nderungen=20angepasst.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@433 8810af33-2d31-482b-a856-94f89814c4df --- .../src/ccm-cms-assets-fileattachment.config | 2 +- .../contenttypes/ui/FileAttachmentsStep.java | 30 ------------------- .../cms/AuthoringKitStepAssociation.java | 2 +- .../bundles/handbook/cfg/applications.cfg | 3 +- environment/project.xml.handbook | 7 +++-- 5 files changed, 8 insertions(+), 36 deletions(-) delete mode 100755 ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contenttypes/ui/FileAttachmentsStep.java diff --git a/ccm-cms-assets-fileattachment/src/ccm-cms-assets-fileattachment.config b/ccm-cms-assets-fileattachment/src/ccm-cms-assets-fileattachment.config index 2be3502f3..a8d55bf8f 100755 --- a/ccm-cms-assets-fileattachment/src/ccm-cms-assets-fileattachment.config +++ b/ccm-cms-assets-fileattachment/src/ccm-cms-assets-fileattachment.config @@ -1,5 +1,5 @@ + storage="ccm-cms-assets/fileattachment.properties"/> diff --git a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contenttypes/ui/FileAttachmentsStep.java b/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contenttypes/ui/FileAttachmentsStep.java deleted file mode 100755 index 5d5b5e65e..000000000 --- a/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contenttypes/ui/FileAttachmentsStep.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2004 Red Hat Inc. All Rights Reserved. - * - * The contents of this file are subject to the Open Software License v2.1 - * (the "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * http://rhea.redhat.com/licenses/osl2.1.html. - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - */ -package com.arsdigita.cms.contenttypes.ui; - -import com.arsdigita.cms.ItemSelectionModel; -import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; - -/** - * @deprecated use {@link - * com.arsdigita.cms.contentassets.ui.FileAttachmentsStep} instead - */ -public class FileAttachmentsStep - extends com.arsdigita.cms.contentassets.ui.FileAttachmentsStep { - public FileAttachmentsStep(ItemSelectionModel itemModel, - AuthoringKitWizard parent) { - super(itemModel, parent); - } -} diff --git a/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java b/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java index fbf6935a1..c6d95982e 100755 --- a/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java +++ b/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java @@ -33,7 +33,7 @@ import java.math.BigDecimal; * @author Jack Chung (flattop@arsdigita.com) * @version $Id: AuthoringKitStepAssociation.java 287 2005-02-22 00:29:02Z sskracic $ */ -class AuthoringKitStepAssociation extends DomainObject { +public class AuthoringKitStepAssociation extends DomainObject { public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.AuthoringKitStepAssociation"; diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/applications.cfg b/ccm-gen-aplaws/bundles/handbook/cfg/applications.cfg index 2353733a6..c13c6e098 100755 --- a/ccm-gen-aplaws/bundles/handbook/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/handbook/cfg/applications.cfg @@ -4,6 +4,7 @@ ccm-cms # Content assets ccm-cms-assets-fileattachment +ccm-cms-assets-imagestep ccm-cms-assets-notes ccm-cms-assets-relatedlink ## -- ccm-ldn-dublin ist das eigentlich ein asset? @@ -29,7 +30,7 @@ ccm-forum ccm-user-preferences # LDN extensions -ccm-ldn-image-step +# ## ccm-ldn-image-step ccm-ldn-navigation ccm-ldn-portal ccm-ldn-rss diff --git a/environment/project.xml.handbook b/environment/project.xml.handbook index 0a0a105b4..33b762654 100644 --- a/environment/project.xml.handbook +++ b/environment/project.xml.handbook @@ -7,8 +7,8 @@ ccmVersion="6.1" name="aplaws-handbook" prettyName="APLAWS plus" - version="1-0-9" - release="rc-5" + version="1-1-0" + release="423" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> @@ -23,6 +23,7 @@ + @@ -76,7 +77,7 @@ - +