From 9b643491bcbee8b204c0ce8803f605cdaa5e583b Mon Sep 17 00:00:00 2001
From: baka <baka@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 17 May 2017 12:17:03 +0000
Subject: [PATCH] Ticket #2685 - Forgot the annotations and resource bundles

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4739 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-cms/src/main/java/org/librecms/Cms.java          | 12 +++---------
 .../main/java/org/librecms/assets/AudioAsset.java    |  8 ++++++++
 .../resources/org/librecms/CmsResources.properties   |  2 ++
 .../org/librecms/CmsResources_de.properties          |  1 +
 .../org/librecms/CmsResources_fr.properties          |  1 +
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/Cms.java b/ccm-cms/src/main/java/org/librecms/Cms.java
index 15528811a..e58860844 100644
--- a/ccm-cms/src/main/java/org/librecms/Cms.java
+++ b/ccm-cms/src/main/java/org/librecms/Cms.java
@@ -19,14 +19,7 @@ import org.libreccm.modules.ShutdownEvent;
 import org.libreccm.modules.UnInstallEvent;
 import org.libreccm.web.ApplicationType;
 import org.libreccm.web.CcmApplication;
-import org.librecms.assets.AssetTypes;
-import org.librecms.assets.Bookmark;
-import org.librecms.assets.ExternalAudioAsset;
-import org.librecms.assets.ExternalVideoAsset;
-import org.librecms.assets.FileAsset;
-import org.librecms.assets.Image;
-import org.librecms.assets.LegalMetadata;
-import org.librecms.assets.SideNote;
+import org.librecms.assets.*;
 import org.librecms.contentsection.ContentSection;
 import org.librecms.contentsection.ContentSectionCreator;
 import org.librecms.contentsection.ContentSectionSetup;
@@ -70,7 +63,8 @@ import java.util.Properties;
                Event.class,
                MultiPartArticle.class,
                News.class})
-@AssetTypes({Bookmark.class,
+@AssetTypes({AudioAsset.class,
+             Bookmark.class,
              ExternalVideoAsset.class,
              ExternalAudioAsset.class,
              FileAsset.class,
diff --git a/ccm-cms/src/main/java/org/librecms/assets/AudioAsset.java b/ccm-cms/src/main/java/org/librecms/assets/AudioAsset.java
index a0763e874..7bcf8003b 100644
--- a/ccm-cms/src/main/java/org/librecms/assets/AudioAsset.java
+++ b/ccm-cms/src/main/java/org/librecms/assets/AudioAsset.java
@@ -18,6 +18,8 @@
  */
 package org.librecms.assets;
 
+import com.arsdigita.cms.ui.assets.forms.AudioForm;
+import com.arsdigita.cms.ui.assets.forms.ExternalVideoAssetForm;
 import org.hibernate.envers.Audited;
 
 import java.io.Serializable;
@@ -29,6 +31,7 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 import static org.librecms.CmsConstants.*;
+import static org.librecms.assets.AssetConstants.ASSETS_BUNDLE;
 
 /**
  * An asset for audio files, for example podcasts of music.
@@ -38,6 +41,11 @@ import static org.librecms.CmsConstants.*;
 @Entity
 @Table(name = "AUDIO_ASSETS", schema = DB_SCHEMA)
 @Audited
+@AssetType(assetForm = AudioForm.class,
+        labelKey = "audio_asset.label",
+        labelBundle = ASSETS_BUNDLE,
+        descriptionKey = "audio_asset.description",
+        descriptionBundle = ASSETS_BUNDLE)
 public class AudioAsset extends BinaryAsset implements Serializable {
 
     private static final long serialVersionUID = -2290028707028530325L;
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
index 5451c1abb..5cf3992cc 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
@@ -275,6 +275,8 @@ cms.ui.assets.binaryasset.size=Size (bytes)
 cms.ui.assets.image.width.label=Width
 cms.ui.assets.image.height.label=Height
 cms.ui.assets.image.legal_metadata.label=Legal metadata
+cms.ui.assets.audio.legal_metadata.label=Legal metadata
+
 cms.ui.categories=Categories
 cms.ui.new_item=Create new content item
 cms.ui.authoring.content_type=Content Type: 
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
index e289374fa..c687cb24f 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
@@ -273,6 +273,7 @@ cms.ui.assets.binaryasset.size=Gr\u00f6\u00dfe (Bytes)
 cms.ui.assets.image.width.label=Breite
 cms.ui.assets.image.height.label=H\u00f6he
 cms.ui.assets.image.legal_metadata.label=Rechtliche Informationen
+cms.ui.assets.audio.legal_metadata.label=Rechtliche Informationen
 cms.ui.categories=Kategorien
 cms.ui.new_item=Neues Content Item angelegen
 cms.ui.authoring.content_type=Content Typ: 
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
index ee5323668..d610e1821 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
@@ -232,6 +232,7 @@ cms.ui.assets.binaryasset.size=Size (bytes)
 cms.ui.assets.image.width.label=Width
 cms.ui.assets.image.height.label=Height
 cms.ui.assets.image.legal_metadata.label=Legal metadata
+cms.ui.assets.audio.legal_metadata.label=Legal metadata
 cms.ui.categories=Categories
 cms.ui.new_item=New item
 cms.ui.authoring.content_type=Content Type: