diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentJsonConverter.java b/ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentJsonConverter.java index efaf54cc8..b2da3bb0f 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentJsonConverter.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentJsonConverter.java @@ -29,6 +29,7 @@ import javax.json.JsonObjectBuilder; * * @author Jens Pelzetter */ +@Deprecated public abstract class AbstractContentItemComponentJsonConverter extends AbstractComponentModelJsonConverter { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentRenderer.java index 1653fbef2..e804c3a08 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentRenderer.java @@ -55,6 +55,7 @@ import java.util.Collections; * @author Jens Pelzetter * @param */ +@Deprecated public abstract class AbstractContentItemComponentRenderer implements ComponentRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java index ce028dcfa..4584fa725 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java @@ -28,6 +28,7 @@ import static org.librecms.CmsConstants.*; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "CATEGORIZED_ITEM_COMPONENTS", schema = DB_SCHEMA) public class CategorizedItemComponent extends ContentItemComponent { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentJsonBuilder.java b/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentJsonBuilder.java index f07738ff7..edcd2340e 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentJsonBuilder.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentJsonBuilder.java @@ -32,6 +32,7 @@ import javax.json.JsonObjectBuilder; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @ConvertsComponentModel(componentModel = CategorizedItemComponent.class) public class CategorizedItemComponentJsonBuilder @@ -50,7 +51,7 @@ public class CategorizedItemComponentJsonBuilder } final CategorizedItemComponent component - = (CategorizedItemComponent) componentModel; + = (CategorizedItemComponent) componentModel; convertBasePropertiesToJson(component, objectBuilder); convertContentItemComponentPropertiesToJson(component, objectBuilder); @@ -70,7 +71,7 @@ public class CategorizedItemComponentJsonBuilder } final CategorizedItemComponent component - = (CategorizedItemComponent) componentModel; + = (CategorizedItemComponent) componentModel; readBasePropertiesFromJson(jsonObject, component); readContentItemComponentPropertiesFromJson(jsonObject, component); diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentRenderer.java index 4196d02ff..a0206d287 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentRenderer.java @@ -48,6 +48,7 @@ import org.libreccm.pagemodel.RendersComponent; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @RendersComponent(componentModel = CategorizedItemComponent.class) public class CategorizedItemComponentRenderer diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponent.java index b45af1bf3..e37099504 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponent.java @@ -33,6 +33,7 @@ import static org.librecms.CmsConstants.*; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "CATEGORY_TREE_COMPONENTS", schema = DB_SCHEMA) public class CategoryTreeComponent extends ComponentModel { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentJsonConverter.java b/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentJsonConverter.java index f07c43e2a..6d4a53d39 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentJsonConverter.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentJsonConverter.java @@ -33,6 +33,7 @@ import javax.json.JsonObjectBuilder; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @ConvertsComponentModel(componentModel = CategoryTreeComponent.class) public class CategoryTreeComponentJsonConverter diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentRenderer.java index 56b755053..9a8de7249 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentRenderer.java @@ -47,6 +47,7 @@ import org.libreccm.pagemodel.RendersComponent; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @RendersComponent(componentModel = CategoryTreeComponent.class) public class CategoryTreeComponentRenderer diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/ContentItemComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/ContentItemComponent.java index 25dd23259..87f9064ae 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/ContentItemComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/ContentItemComponent.java @@ -35,6 +35,7 @@ import static org.librecms.CmsConstants.*; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "CONTENT_ITEM_COMPONENTS", schema = DB_SCHEMA) public class ContentItemComponent extends ComponentModel { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java index 036345dc1..ce8cb4e72 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java @@ -34,6 +34,7 @@ import static org.librecms.CmsConstants.*; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "FIXED_CONTENT_ITEM_COMPONENTS", schema = DB_SCHEMA) public class FixedContentItemComponent extends ContentItemComponent { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentJsonConverter.java b/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentJsonConverter.java index ba048f8ae..464857053 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentJsonConverter.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentJsonConverter.java @@ -35,6 +35,7 @@ import javax.json.JsonObjectBuilder; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @ConvertsComponentModel(componentModel = FixedContentItemComponent.class) public class FixedContentItemComponentJsonConverter diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentRenderer.java index 4cc92d1bc..5d6ed55ba 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentRenderer.java @@ -35,6 +35,7 @@ import org.libreccm.pagemodel.RendersComponent; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @RendersComponent(componentModel = FixedContentItemComponent.class) public class FixedContentItemComponentRenderer diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponent.java index cca1aa670..179bcfcac 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponent.java @@ -32,6 +32,7 @@ import static org.librecms.CmsConstants.*; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "GREETING_ITEM_COMPONENTS", schema = DB_SCHEMA) public class GreetingItemComponent extends ContentItemComponent { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentJsonConverter.java b/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentJsonConverter.java index 372c56d84..0416ba52a 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentJsonConverter.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentJsonConverter.java @@ -32,6 +32,7 @@ import javax.json.JsonObjectBuilder; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @ConvertsComponentModel(componentModel = GreetingItemComponent.class) public class GreetingItemComponentJsonConverter diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentRenderer.java index 6444f7eb6..0aa6583a1 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentRenderer.java @@ -43,6 +43,7 @@ import org.librecms.contentsection.ContentItemVersion; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @RendersComponent(componentModel = GreetingItemComponent.class) public class GreetingItemComponentRenderer diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java index 7d1b12993..e4271b70c 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java @@ -41,6 +41,7 @@ import static org.librecms.CmsConstants.*; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "ITEM_LIST_COMPONENTS", schema = DB_SCHEMA) public class ItemListComponent extends ComponentModel { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentJsonConverter.java b/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentJsonConverter.java index dc94ebe91..0a0f84088 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentJsonConverter.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentJsonConverter.java @@ -35,6 +35,7 @@ import javax.json.JsonObjectBuilder; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @ConvertsComponentModel(componentModel = ItemListComponent.class) public class ItemListComponentJsonConverter diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentRenderer.java index 31cfa0bab..eb699cf0a 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentRenderer.java @@ -74,6 +74,7 @@ import javax.persistence.criteria.Predicate; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @RendersComponent(componentModel = ItemListComponent.class) public class ItemListComponentRenderer diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AbstractAssetRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AbstractAssetRenderer.java index ec0bd9ee0..6fd2de387 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AbstractAssetRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AbstractAssetRenderer.java @@ -29,6 +29,7 @@ import java.util.Map; * * @author Jens Pelzetter */ +@Deprecated public abstract class AbstractAssetRenderer { /** diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderer.java index fce924153..300dbadfa 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderer.java @@ -32,6 +32,7 @@ import javax.inject.Qualifier; * * @author Jens Pelzetter */ +@Deprecated @Qualifier @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderers.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderers.java index 2e585ddef..2b124122a 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderers.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderers.java @@ -37,6 +37,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class AssetRenderers { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AudioAssetRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AudioAssetRenderer.java index 86d98f670..8e5577d2f 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AudioAssetRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/AudioAssetRenderer.java @@ -33,6 +33,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = AudioAsset.class) public class AudioAssetRenderer extends BinaryAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/BinaryAssetRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/BinaryAssetRenderer.java index b427ea25a..a05f8f9ce 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/BinaryAssetRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/BinaryAssetRenderer.java @@ -33,6 +33,7 @@ import java.util.Objects; * * @author Jens Pelzetter */ +@Deprecated public class BinaryAssetRenderer extends AbstractAssetRenderer { /** diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/BookmarkRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/BookmarkRenderer.java index cdf975e3c..ff2974bd3 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/BookmarkRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/BookmarkRenderer.java @@ -32,6 +32,7 @@ import org.librecms.assets.Bookmark; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = Bookmark.class) public class BookmarkRenderer extends AbstractAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ContactableEntityRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ContactableEntityRenderer.java index 46ce40a54..034e056a3 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ContactableEntityRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ContactableEntityRenderer.java @@ -35,6 +35,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class ContactableEntityRenderer extends AbstractAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalAudioAssetRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalAudioAssetRenderer.java index 71e8a2745..8302f95c1 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalAudioAssetRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalAudioAssetRenderer.java @@ -33,6 +33,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = ExternalAudioAsset.class) public class ExternalAudioAssetRenderer extends BookmarkRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalVideoAssetRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalVideoAssetRenderer.java index 70b1f84d5..64ca21ba0 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalVideoAssetRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalVideoAssetRenderer.java @@ -33,6 +33,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = ExternalVideoAsset.class) public class ExternalVideoAssetRenderer extends BookmarkRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/FileAssetRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/FileAssetRenderer.java index a42bdc8fc..58edbac26 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/FileAssetRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/FileAssetRenderer.java @@ -31,6 +31,7 @@ import javax.enterprise.context.RequestScoped; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = FileAsset.class) public class FileAssetRenderer extends BinaryAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ImageRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ImageRenderer.java index c33834957..4cd9b9df5 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ImageRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/ImageRenderer.java @@ -33,6 +33,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @AssetRenderer(renders = Image.class) @RequestScoped public class ImageRenderer extends BinaryAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/LegalMetadataRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/LegalMetadataRenderer.java index 0eee9d56c..1dc76edc7 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/LegalMetadataRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/LegalMetadataRenderer.java @@ -32,6 +32,7 @@ import javax.enterprise.context.RequestScoped; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = LegalMetadata.class) public class LegalMetadataRenderer extends AbstractAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/OrganizationRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/OrganizationRenderer.java index 7585c781b..09ff2c42e 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/OrganizationRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/OrganizationRenderer.java @@ -30,6 +30,7 @@ import javax.enterprise.context.RequestScoped; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = Organization.class) public class OrganizationRenderer extends ContactableEntityRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/PersonRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/PersonRenderer.java index 49edc2046..18abd77a7 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/PersonRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/PersonRenderer.java @@ -31,6 +31,7 @@ import javax.enterprise.context.RequestScoped; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = Person.class) public class PersonRenderer extends ContactableEntityRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/PostalAddressRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/PostalAddressRenderer.java index 0ee384389..e68ac03ce 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/PostalAddressRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/PostalAddressRenderer.java @@ -30,6 +30,7 @@ import javax.enterprise.context.RequestScoped; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = PostalAddress.class) public class PostalAddressRenderer extends AbstractAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/RelatedLinkRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/RelatedLinkRenderer.java index a57c4d47b..47d25eb12 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/RelatedLinkRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/RelatedLinkRenderer.java @@ -35,6 +35,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = RelatedLink.class) public class RelatedLinkRenderer extends AbstractAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/SideNoteRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/SideNoteRenderer.java index ae7cb6e6c..cd6f516fb 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/SideNoteRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/SideNoteRenderer.java @@ -31,6 +31,7 @@ import javax.enterprise.context.RequestScoped; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = SideNote.class) public class SideNoteRenderer extends AbstractAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/VideoAssetRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/VideoAssetRenderer.java index d2081169f..412b01d34 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/assets/VideoAssetRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/assets/VideoAssetRenderer.java @@ -33,6 +33,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @AssetRenderer(renders = VideoAsset.class) public class VideoAssetRenderer extends BinaryAssetRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/AbstractContentItemRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/AbstractContentItemRenderer.java index 19a781674..d2cd242fa 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/AbstractContentItemRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/AbstractContentItemRenderer.java @@ -39,6 +39,7 @@ import java.util.stream.Collectors; * * @author Jens Pelzetter */ +@Deprecated public abstract class AbstractContentItemRenderer implements Serializable { private static final long serialVersionUID = 1290408390406469580L; diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ArticleRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ArticleRenderer.java index 6d11a035e..41605bab4 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ArticleRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ArticleRenderer.java @@ -33,6 +33,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @ContentItemRenderer(renders = Article.class) @RequestScoped public class ArticleRenderer extends AbstractContentItemRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderer.java index 50591c054..e3078184e 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderer.java @@ -33,6 +33,7 @@ import javax.inject.Qualifier; * * @author Jens Pelzetter */ +@Deprecated @Qualifier @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderers.java b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderers.java index 05ed0c897..bab74583e 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderers.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderers.java @@ -41,6 +41,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class ContentItemRenderers implements Serializable { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/EventRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/EventRenderer.java index 92143a9cc..d44740f18 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/EventRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/EventRenderer.java @@ -32,6 +32,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @ContentItemRenderer(renders = Event.class) public class EventRenderer extends AbstractContentItemRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/MultiPartArticleRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/MultiPartArticleRenderer.java index 6ba3a3a75..97c9b082c 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/MultiPartArticleRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/MultiPartArticleRenderer.java @@ -35,6 +35,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @ContentItemRenderer(renders = MultiPartArticle.class) public class MultiPartArticleRenderer extends AbstractContentItemRenderer { diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/NewsRenderer.java b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/NewsRenderer.java index 4d55aa222..902d28963 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/NewsRenderer.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/NewsRenderer.java @@ -33,6 +33,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @ContentItemRenderer(renders = News.class) @RequestScoped public class NewsRenderer extends AbstractContentItemRenderer { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractComponentModelJsonConverter.java b/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractComponentModelJsonConverter.java index 03f103001..25b959133 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractComponentModelJsonConverter.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractComponentModelJsonConverter.java @@ -30,6 +30,7 @@ import javax.json.JsonObjectBuilder; * * @author Jens Pelzetter */ +@Deprecated public abstract class AbstractComponentModelJsonConverter implements ComponentModelJsonConverter { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageRenderer.java b/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageRenderer.java index ff1deff8a..6c2c07645 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageRenderer.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageRenderer.java @@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletRequest; * @author Jens Pelzetter * */ +@Deprecated public abstract class AbstractPageRenderer implements PageRenderer { @Inject diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java index 71999fce5..654835c56 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java @@ -49,6 +49,7 @@ import javax.persistence.Table; * * @author Jens Pelzetter */ +@Deprecated @Entity @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PAGE_MODEL_COMPONENT_MODELS", schema = CoreConstants.DB_SCHEMA) diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelJsonConverter.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelJsonConverter.java index 252abad0a..440c4851e 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelJsonConverter.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelJsonConverter.java @@ -25,6 +25,7 @@ import javax.json.JsonObject; * * @author Jens Pelzetter */ +@Deprecated public interface ComponentModelJsonConverter { /** diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java index 763ff92fe..fb36d275c 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java @@ -45,6 +45,7 @@ import javax.persistence.criteria.Root; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class ComponentModelRepository extends AbstractEntityRepository { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModels.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModels.java index ec7761340..05f172dd5 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModels.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModels.java @@ -44,6 +44,7 @@ import javax.enterprise.context.ApplicationScoped; * * @author Jens Pelzetter */ +@Deprecated @ApplicationScoped public class ComponentModels { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRenderer.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRenderer.java index bcaca5ade..839149605 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRenderer.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRenderer.java @@ -31,6 +31,7 @@ import java.util.Map; * @author Jens Pelzetter * @param Type of the model the component renderer processes. */ +@Deprecated public interface ComponentRenderer { /** diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRendererManager.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRendererManager.java index 88607b08c..771b87384 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRendererManager.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRendererManager.java @@ -37,6 +37,7 @@ import javax.enterprise.inject.Any; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class ComponentRendererManager { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java index 1b517ef38..68a51d5e5 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java @@ -56,6 +56,7 @@ import javax.xml.bind.annotation.XmlTransient; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "PAGE_MODEL_CONTAINER_MODELS", schema = CoreConstants.DB_SCHEMA) @NamedQueries({ diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelManager.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelManager.java index 3ffebebfd..373be7d6d 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelManager.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelManager.java @@ -37,6 +37,7 @@ import javax.transaction.Transactional; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class ContainerModelManager implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelRepository.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelRepository.java index 7d5cb7a26..18fb59ccf 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelRepository.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelRepository.java @@ -35,6 +35,7 @@ import javax.transaction.Transactional; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class ContainerModelRepository extends AbstractEntityRepository { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ConvertsComponentModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ConvertsComponentModel.java index be9966595..1cbeecd04 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ConvertsComponentModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ConvertsComponentModel.java @@ -29,6 +29,7 @@ import javax.inject.Qualifier; * * @author Jens Pelzetter */ +@Deprecated @Qualifier @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java index 242a30037..a2b5b7bb9 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModel.java @@ -66,6 +66,7 @@ import javax.xml.bind.annotation.XmlTransient; * @see PageModelManager * @see PageRenderer */ +@Deprecated @Entity @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "PAGE_MODELS", schema = CoreConstants.DB_SCHEMA) diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelComponentModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelComponentModel.java index 7c2ba1b83..e88269f55 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelComponentModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelComponentModel.java @@ -32,6 +32,7 @@ import java.util.ResourceBundle; * * @author Jens Pelzetter */ +@Deprecated @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface PageModelComponentModel { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java index 3388ecc14..31c0fb7f3 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java @@ -63,6 +63,7 @@ import java.util.stream.Collectors; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class PageModelManager { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java index bbcb46ac0..d98c947d9 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java @@ -39,6 +39,7 @@ import java.util.UUID; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class PageModelRepository extends AbstractEntityRepository { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelVersion.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelVersion.java index ae39b58bd..c03755a3e 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelVersion.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelVersion.java @@ -23,6 +23,7 @@ package org.libreccm.pagemodel; * * @author Jens Pelzetter */ +@Deprecated public enum PageModelVersion { DRAFT, diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageRenderer.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageRenderer.java index ef3c4a824..345b42e3d 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageRenderer.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageRenderer.java @@ -32,6 +32,7 @@ import java.util.Map; * * @author Jens Pelzetter */ +@Deprecated public interface PageRenderer { /** diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/RendersComponent.java b/ccm-core/src/main/java/org/libreccm/pagemodel/RendersComponent.java index 7f0aeca9c..0a6c242a2 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/RendersComponent.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/RendersComponent.java @@ -30,6 +30,7 @@ import java.lang.annotation.Target; * * @author Jens Pelzetter */ +@Deprecated @Qualifier @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/RendersPageModelType.java b/ccm-core/src/main/java/org/libreccm/pagemodel/RendersPageModelType.java index fb7ad3c76..af5efb785 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/RendersPageModelType.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/RendersPageModelType.java @@ -31,6 +31,7 @@ import javax.inject.Qualifier; * * @author Jens Pelzetter */ +@Deprecated @Qualifier @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/Components.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/Components.java index e8a1a5d84..883dd9896 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/Components.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/Components.java @@ -67,6 +67,7 @@ import javax.ws.rs.WebApplicationException; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @Path("/") public class Components { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/Containers.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/Containers.java index 437f44b04..7a1c029fb 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/Containers.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/Containers.java @@ -50,6 +50,7 @@ import javax.ws.rs.Produces; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @Path("/") public class Containers { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java index d242ee713..909cb78db 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java @@ -62,6 +62,7 @@ import java.util.stream.Collectors; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @Path("/") public class PageModels { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsApp.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsApp.java index 82e4e0e72..67c8b82af 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsApp.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsApp.java @@ -42,6 +42,7 @@ import javax.ws.rs.core.Application; * * @author Jens Pelzetter */ +@Deprecated @ApplicationPath("/page-models") public class PageModelsApp extends Application { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsController.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsController.java index eb35d69ed..f9284698c 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsController.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsController.java @@ -40,6 +40,7 @@ import javax.ws.rs.NotFoundException; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped class PageModelsController { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PublicationStatus.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PublicationStatus.java index ce1b19b15..049a80960 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PublicationStatus.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PublicationStatus.java @@ -1,5 +1,6 @@ package org.libreccm.pagemodel.rs; +@Deprecated public enum PublicationStatus { NOT_PUBLISHED, diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesJsonMapper.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesJsonMapper.java index fbc351de0..c13876efb 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesJsonMapper.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesJsonMapper.java @@ -39,6 +39,7 @@ import javax.json.JsonObject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped class StylesJsonMapper { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesMediaRule.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesMediaRule.java index 99c1eb7da..bf9660670 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesMediaRule.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesMediaRule.java @@ -54,6 +54,7 @@ import javax.ws.rs.WebApplicationException; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @Path(StylesRs.MEDIA_RULE_PATH) public class StylesMediaRule implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRs.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRs.java index 255789262..37ff20281 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRs.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRs.java @@ -57,6 +57,7 @@ import javax.ws.rs.WebApplicationException; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @Path(PageModelsApp.STYLES_PATH) public class StylesRs { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRule.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRule.java index c396f0437..880ba85c3 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRule.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRule.java @@ -53,6 +53,7 @@ import javax.ws.rs.WebApplicationException; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped @Path(StylesRs.RULE_PATH) public class StylesRule implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/CssProperty.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/CssProperty.java index 001f4c957..87f4400d3 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/CssProperty.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/CssProperty.java @@ -35,6 +35,7 @@ import javax.persistence.Table; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "STYLE_PROPERTIES", schema = CoreConstants.DB_SCHEMA) public class CssProperty implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Dimension.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Dimension.java index b8d4011fd..cb915dc24 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Dimension.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Dimension.java @@ -30,6 +30,7 @@ import javax.persistence.Enumerated; * * @author Jens Pelzetter */ +@Deprecated @Embeddable public class Dimension implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaQuery.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaQuery.java index a647a39a5..475781879 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaQuery.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaQuery.java @@ -39,6 +39,7 @@ import javax.persistence.Table; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "STYLE_MEDIA_QUERIES", schema = CoreConstants.DB_SCHEMA) public class MediaQuery implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaRule.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaRule.java index adb10c478..d7ddae3a7 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaRule.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaRule.java @@ -43,6 +43,7 @@ import javax.persistence.Table; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "STYLE_MEDIA_RULES", schema = CoreConstants.DB_SCHEMA) public class MediaRule implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaType.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaType.java index d2fb66597..4246be04e 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaType.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaType.java @@ -23,6 +23,7 @@ package org.libreccm.pagemodel.styles; * * @author Jens Pelzetter */ +@Deprecated public enum MediaType { ALL, diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Rule.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Rule.java index ef0d13752..bce018231 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Rule.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Rule.java @@ -42,6 +42,7 @@ import javax.persistence.Table; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "STYLE_RULES", schema = CoreConstants.DB_SCHEMA) public class Rule implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Styles.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Styles.java index d051420d0..3401b559b 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Styles.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Styles.java @@ -42,6 +42,7 @@ import javax.persistence.Table; * * @author Jens Pelzetter */ +@Deprecated @Entity @Table(name = "STYLES", schema = CoreConstants.DB_SCHEMA) public class Styles implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesManager.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesManager.java index 8f38345aa..f3dd577a9 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesManager.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesManager.java @@ -33,6 +33,7 @@ import javax.transaction.Transactional; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class StylesManager implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesRepository.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesRepository.java index 596de2f90..2969f11f6 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesRepository.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesRepository.java @@ -34,6 +34,7 @@ import javax.transaction.Transactional; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class StylesRepository implements Serializable { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Unit.java b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Unit.java index 4799ea87c..5ea6e0e36 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Unit.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/styles/Unit.java @@ -23,6 +23,7 @@ package org.libreccm.pagemodel.styles; * * @author Jens Pelzetter */ +@Deprecated public enum Unit { EM, diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java index 17e6593c6..e092961c6 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java @@ -30,6 +30,7 @@ import java.util.Locale; * * @author Jens Pelzetter */ +@Deprecated public class ApplicationTreeNode implements TreeNode { private final CcmApplication application; diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTypeTreeNode.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTypeTreeNode.java index 0750429c5..d7d2f68c9 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTypeTreeNode.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTypeTreeNode.java @@ -26,6 +26,7 @@ import org.libreccm.web.CcmApplication; * * @author Jens Pelzetter */ +@Deprecated class ApplicationTypeTreeNode implements TreeNode { private final Class appType; diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java index 928d343dc..92a2ea189 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java @@ -25,6 +25,7 @@ import com.arsdigita.toolbox.ui.LayoutPanel; * * @author Jens Pelzetter */ +@Deprecated public class PageModelPane extends LayoutPanel { private final Tree tree; diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java index 9fd064718..7947e4b97 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java @@ -29,6 +29,7 @@ import javax.inject.Inject; * * @author Jens Pelzetter */ +@Deprecated @RequestScoped public class PageModelTreeController { diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeModelBuilder.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeModelBuilder.java index 0e3355588..6733a665a 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeModelBuilder.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeModelBuilder.java @@ -27,6 +27,7 @@ import com.arsdigita.bebop.tree.TreeModelBuilder; * * @author Jens Pelzetter */ +@Deprecated class PageModelTreeModelBuilder implements TreeModelBuilder { @Override diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java index 3bf14309e..3748d83c6 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java @@ -30,6 +30,7 @@ import java.util.Locale; * * @author Jens Pelzetter */ +@Deprecated class PageModelTreeNode implements TreeNode { private final PageModel pageModel; diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java index b508db106..fc26de818 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java @@ -31,6 +31,7 @@ import java.util.Iterator; * * @author Jens Pelzetter */ +@Deprecated class PageTreeModel implements TreeModel { @Override