Marked PageModel classes as depcrecated

ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentJsonConverter.java

@@ -29,6 +29,7 @@ import javax.json.JsonObjectBuilder;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public abstract class AbstractContentItemComponentJsonConverter
     extends AbstractComponentModelJsonConverter {
 

ccm-cms/src/main/java/org/librecms/pagemodel/AbstractContentItemComponentRenderer.java

@@ -55,6 +55,7 @@ import java.util.Collections;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @param <T>
  */
+@Deprecated
 public abstract class AbstractContentItemComponentRenderer<T extends ContentItemComponent>
     implements ComponentRenderer<T> {
 

ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java

@@ -28,6 +28,7 @@ import static org.librecms.CmsConstants.*;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "CATEGORIZED_ITEM_COMPONENTS", schema = DB_SCHEMA)
 public class CategorizedItemComponent extends ContentItemComponent {

ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentJsonBuilder.java

@@ -32,6 +32,7 @@ import javax.json.JsonObjectBuilder;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@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);

ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponentRenderer.java

@@ -48,6 +48,7 @@ import org.libreccm.pagemodel.RendersComponent;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @RendersComponent(componentModel = CategorizedItemComponent.class)
 public class CategorizedItemComponentRenderer

ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponent.java

@@ -33,6 +33,7 @@ import static org.librecms.CmsConstants.*;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "CATEGORY_TREE_COMPONENTS", schema = DB_SCHEMA)
 public class CategoryTreeComponent extends ComponentModel {

ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentJsonConverter.java

@@ -33,6 +33,7 @@ import javax.json.JsonObjectBuilder;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @ConvertsComponentModel(componentModel = CategoryTreeComponent.class)
 public class CategoryTreeComponentJsonConverter

ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentRenderer.java

@@ -47,6 +47,7 @@ import org.libreccm.pagemodel.RendersComponent;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @RendersComponent(componentModel = CategoryTreeComponent.class)
 public class CategoryTreeComponentRenderer

ccm-cms/src/main/java/org/librecms/pagemodel/ContentItemComponent.java

@@ -35,6 +35,7 @@ import static org.librecms.CmsConstants.*;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "CONTENT_ITEM_COMPONENTS", schema = DB_SCHEMA)
 public class ContentItemComponent extends ComponentModel {

ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java

@@ -34,6 +34,7 @@ import static org.librecms.CmsConstants.*;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "FIXED_CONTENT_ITEM_COMPONENTS", schema = DB_SCHEMA)
 public class FixedContentItemComponent extends ContentItemComponent {

ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentJsonConverter.java

@@ -35,6 +35,7 @@ import javax.json.JsonObjectBuilder;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @ConvertsComponentModel(componentModel = FixedContentItemComponent.class)
 public class FixedContentItemComponentJsonConverter

ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponentRenderer.java

@@ -35,6 +35,7 @@ import org.libreccm.pagemodel.RendersComponent;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @RendersComponent(componentModel = FixedContentItemComponent.class)
 public class FixedContentItemComponentRenderer

ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponent.java

@@ -32,6 +32,7 @@ import static org.librecms.CmsConstants.*;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "GREETING_ITEM_COMPONENTS", schema = DB_SCHEMA)
 public class GreetingItemComponent extends ContentItemComponent {

ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentJsonConverter.java

@@ -32,6 +32,7 @@ import javax.json.JsonObjectBuilder;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @ConvertsComponentModel(componentModel = GreetingItemComponent.class)
 public class GreetingItemComponentJsonConverter

ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentRenderer.java

@@ -43,6 +43,7 @@ import org.librecms.contentsection.ContentItemVersion;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @RendersComponent(componentModel = GreetingItemComponent.class)
 public class GreetingItemComponentRenderer

ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java

@@ -41,6 +41,7 @@ import static org.librecms.CmsConstants.*;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "ITEM_LIST_COMPONENTS", schema = DB_SCHEMA)
 public class ItemListComponent extends ComponentModel {

ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentJsonConverter.java

@@ -35,6 +35,7 @@ import javax.json.JsonObjectBuilder;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @ConvertsComponentModel(componentModel = ItemListComponent.class)
 public class ItemListComponentJsonConverter

ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponentRenderer.java

@@ -74,6 +74,7 @@ import javax.persistence.criteria.Predicate;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @RendersComponent(componentModel = ItemListComponent.class)
 public class ItemListComponentRenderer

ccm-cms/src/main/java/org/librecms/pagemodel/assets/AbstractAssetRenderer.java

@@ -29,6 +29,7 @@ import java.util.Map;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public abstract class AbstractAssetRenderer {
 
     /**

ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderer.java

@@ -32,6 +32,7 @@ import javax.inject.Qualifier;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, 

ccm-cms/src/main/java/org/librecms/pagemodel/assets/AssetRenderers.java

@@ -37,6 +37,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class AssetRenderers {
 

ccm-cms/src/main/java/org/librecms/pagemodel/assets/AudioAssetRenderer.java

@@ -33,6 +33,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = AudioAsset.class)
 public class AudioAssetRenderer extends BinaryAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/BinaryAssetRenderer.java

@@ -33,6 +33,7 @@ import java.util.Objects;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public class BinaryAssetRenderer extends AbstractAssetRenderer {
 
     /**

ccm-cms/src/main/java/org/librecms/pagemodel/assets/BookmarkRenderer.java

@@ -32,6 +32,7 @@ import org.librecms.assets.Bookmark;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = Bookmark.class)
 public class BookmarkRenderer extends AbstractAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/ContactableEntityRenderer.java

@@ -35,6 +35,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class ContactableEntityRenderer extends AbstractAssetRenderer {
 

ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalAudioAssetRenderer.java

@@ -33,6 +33,7 @@ import javax.inject.Inject;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = ExternalAudioAsset.class)
 public class ExternalAudioAssetRenderer extends BookmarkRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/ExternalVideoAssetRenderer.java

@@ -33,6 +33,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = ExternalVideoAsset.class)
 public class ExternalVideoAssetRenderer extends BookmarkRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/FileAssetRenderer.java

@@ -31,6 +31,7 @@ import javax.enterprise.context.RequestScoped;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = FileAsset.class)
 public class FileAssetRenderer extends BinaryAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/ImageRenderer.java

@@ -33,6 +33,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @AssetRenderer(renders = Image.class)
 @RequestScoped
 public class ImageRenderer extends BinaryAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/LegalMetadataRenderer.java

@@ -32,6 +32,7 @@ import javax.enterprise.context.RequestScoped;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = LegalMetadata.class)
 public class LegalMetadataRenderer extends AbstractAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/OrganizationRenderer.java

@@ -30,6 +30,7 @@ import javax.enterprise.context.RequestScoped;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = Organization.class)
 public class OrganizationRenderer extends ContactableEntityRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/PersonRenderer.java

@@ -31,6 +31,7 @@ import javax.enterprise.context.RequestScoped;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = Person.class)
 public class PersonRenderer extends ContactableEntityRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/PostalAddressRenderer.java

@@ -30,6 +30,7 @@ import javax.enterprise.context.RequestScoped;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = PostalAddress.class)
 public class PostalAddressRenderer extends AbstractAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/RelatedLinkRenderer.java

@@ -35,6 +35,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = RelatedLink.class)
 public class RelatedLinkRenderer extends AbstractAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/SideNoteRenderer.java

@@ -31,6 +31,7 @@ import javax.enterprise.context.RequestScoped;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = SideNote.class)
 public class SideNoteRenderer extends AbstractAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/assets/VideoAssetRenderer.java

@@ -33,6 +33,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @AssetRenderer(renders = VideoAsset.class)
 public class VideoAssetRenderer extends BinaryAssetRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/AbstractContentItemRenderer.java

@@ -39,6 +39,7 @@ import java.util.stream.Collectors;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public abstract class AbstractContentItemRenderer implements Serializable {
 
     private static final long serialVersionUID = 1290408390406469580L;

ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ArticleRenderer.java

@@ -33,6 +33,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @ContentItemRenderer(renders = Article.class)
 @RequestScoped
 public class ArticleRenderer extends AbstractContentItemRenderer {

ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderer.java

@@ -33,6 +33,7 @@ import javax.inject.Qualifier;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, 

ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/ContentItemRenderers.java

@@ -41,6 +41,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class ContentItemRenderers implements Serializable {
 

ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/EventRenderer.java

@@ -32,6 +32,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @ContentItemRenderer(renders = Event.class)
 public class EventRenderer extends AbstractContentItemRenderer {
 

ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/MultiPartArticleRenderer.java

@@ -35,6 +35,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @ContentItemRenderer(renders = MultiPartArticle.class)
 public class MultiPartArticleRenderer extends AbstractContentItemRenderer {
 

ccm-cms/src/main/java/org/librecms/pagemodel/contentitems/NewsRenderer.java

@@ -33,6 +33,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @ContentItemRenderer(renders = News.class)
 @RequestScoped
 public class NewsRenderer extends AbstractContentItemRenderer {

ccm-core/src/main/java/org/libreccm/pagemodel/AbstractComponentModelJsonConverter.java

@@ -30,6 +30,7 @@ import javax.json.JsonObjectBuilder;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public abstract class AbstractComponentModelJsonConverter
     implements ComponentModelJsonConverter {
 

ccm-core/src/main/java/org/libreccm/pagemodel/AbstractPageRenderer.java

@@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletRequest;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  *
  */
+@Deprecated
 public abstract class AbstractPageRenderer implements PageRenderer {
 
     @Inject

ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModel.java

@@ -49,6 +49,7 @@ import javax.persistence.Table;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "PAGE_MODEL_COMPONENT_MODELS", schema = CoreConstants.DB_SCHEMA)

ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelJsonConverter.java

@@ -25,6 +25,7 @@ import javax.json.JsonObject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public interface ComponentModelJsonConverter {
 
     /**

ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModelRepository.java

@@ -45,6 +45,7 @@ import javax.persistence.criteria.Root;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class ComponentModelRepository
     extends AbstractEntityRepository<Long, ComponentModel> {

ccm-core/src/main/java/org/libreccm/pagemodel/ComponentModels.java

@@ -44,6 +44,7 @@ import javax.enterprise.context.ApplicationScoped;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @ApplicationScoped
 public class ComponentModels {
 

ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRenderer.java

@@ -31,6 +31,7 @@ import java.util.Map;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @param <M> Type of the model the component renderer processes.
  */
+@Deprecated
 public interface ComponentRenderer<M extends ComponentModel> {
 
     /**

ccm-core/src/main/java/org/libreccm/pagemodel/ComponentRendererManager.java

@@ -37,6 +37,7 @@ import javax.enterprise.inject.Any;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class ComponentRendererManager {
 

ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModel.java

@@ -56,6 +56,7 @@ import javax.xml.bind.annotation.XmlTransient;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "PAGE_MODEL_CONTAINER_MODELS", schema = CoreConstants.DB_SCHEMA)
 @NamedQueries({

ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelManager.java

@@ -37,6 +37,7 @@ import javax.transaction.Transactional;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class ContainerModelManager implements Serializable {
 

ccm-core/src/main/java/org/libreccm/pagemodel/ContainerModelRepository.java

@@ -35,6 +35,7 @@ import javax.transaction.Transactional;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class ContainerModelRepository
     extends AbstractEntityRepository<Long, ContainerModel> {

ccm-core/src/main/java/org/libreccm/pagemodel/ConvertsComponentModel.java

@@ -29,6 +29,7 @@ import javax.inject.Qualifier;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD,

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)

ccm-core/src/main/java/org/libreccm/pagemodel/PageModelComponentModel.java

@@ -32,6 +32,7 @@ import java.util.ResourceBundle;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface PageModelComponentModel {

ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java

@@ -63,6 +63,7 @@ import java.util.stream.Collectors;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class PageModelManager {
 

ccm-core/src/main/java/org/libreccm/pagemodel/PageModelRepository.java

@@ -39,6 +39,7 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class PageModelRepository extends AbstractEntityRepository<Long, PageModel> {
 

ccm-core/src/main/java/org/libreccm/pagemodel/PageModelVersion.java

@@ -23,6 +23,7 @@ package org.libreccm.pagemodel;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public enum PageModelVersion {
     
     DRAFT,

ccm-core/src/main/java/org/libreccm/pagemodel/PageRenderer.java

@@ -32,6 +32,7 @@ import java.util.Map;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public interface PageRenderer {
 
     /**

ccm-core/src/main/java/org/libreccm/pagemodel/RendersComponent.java

@@ -30,6 +30,7 @@ import java.lang.annotation.Target;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

ccm-core/src/main/java/org/libreccm/pagemodel/RendersPageModelType.java

@@ -31,6 +31,7 @@ import javax.inject.Qualifier;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

ccm-core/src/main/java/org/libreccm/pagemodel/rs/Components.java

@@ -67,6 +67,7 @@ import javax.ws.rs.WebApplicationException;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @Path("/")
 public class Components {

ccm-core/src/main/java/org/libreccm/pagemodel/rs/Containers.java

@@ -50,6 +50,7 @@ import javax.ws.rs.Produces;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @Path("/")
 public class Containers {

ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java

@@ -62,6 +62,7 @@ import java.util.stream.Collectors;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @Path("/")
 public class PageModels {

ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsApp.java

@@ -42,6 +42,7 @@ import javax.ws.rs.core.Application;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @ApplicationPath("/page-models")
 public class PageModelsApp extends Application {
 

ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModelsController.java

@@ -40,6 +40,7 @@ import javax.ws.rs.NotFoundException;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 class PageModelsController {
 

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,

ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesJsonMapper.java

@@ -39,6 +39,7 @@ import javax.json.JsonObject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 class StylesJsonMapper {
 

ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesMediaRule.java

@@ -54,6 +54,7 @@ import javax.ws.rs.WebApplicationException;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @Path(StylesRs.MEDIA_RULE_PATH)
 public class StylesMediaRule implements Serializable {

ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRs.java

@@ -57,6 +57,7 @@ import javax.ws.rs.WebApplicationException;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @Path(PageModelsApp.STYLES_PATH)
 public class StylesRs {

ccm-core/src/main/java/org/libreccm/pagemodel/rs/StylesRule.java

@@ -53,6 +53,7 @@ import javax.ws.rs.WebApplicationException;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 @Path(StylesRs.RULE_PATH)
 public class StylesRule implements Serializable {

ccm-core/src/main/java/org/libreccm/pagemodel/styles/CssProperty.java

@@ -35,6 +35,7 @@ import javax.persistence.Table;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "STYLE_PROPERTIES", schema = CoreConstants.DB_SCHEMA)
 public class CssProperty implements Serializable {

ccm-core/src/main/java/org/libreccm/pagemodel/styles/Dimension.java

@@ -30,6 +30,7 @@ import javax.persistence.Enumerated;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Embeddable
 public class Dimension implements Serializable {
 

ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaQuery.java

@@ -39,6 +39,7 @@ import javax.persistence.Table;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "STYLE_MEDIA_QUERIES", schema = CoreConstants.DB_SCHEMA)
 public class MediaQuery implements Serializable {

ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaRule.java

@@ -43,6 +43,7 @@ import javax.persistence.Table;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "STYLE_MEDIA_RULES", schema = CoreConstants.DB_SCHEMA)
 public class MediaRule implements Serializable {

ccm-core/src/main/java/org/libreccm/pagemodel/styles/MediaType.java

@@ -23,6 +23,7 @@ package org.libreccm.pagemodel.styles;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public enum MediaType {
     
     ALL,

ccm-core/src/main/java/org/libreccm/pagemodel/styles/Rule.java

@@ -42,6 +42,7 @@ import javax.persistence.Table;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "STYLE_RULES", schema = CoreConstants.DB_SCHEMA)
 public class Rule implements Serializable {

ccm-core/src/main/java/org/libreccm/pagemodel/styles/Styles.java

@@ -42,6 +42,7 @@ import javax.persistence.Table;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @Entity
 @Table(name = "STYLES", schema = CoreConstants.DB_SCHEMA)
 public class Styles implements Serializable {

ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesManager.java

@@ -33,6 +33,7 @@ import javax.transaction.Transactional;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class StylesManager implements Serializable {
 

ccm-core/src/main/java/org/libreccm/pagemodel/styles/StylesRepository.java

@@ -34,6 +34,7 @@ import javax.transaction.Transactional;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class StylesRepository implements Serializable {
 

ccm-core/src/main/java/org/libreccm/pagemodel/styles/Unit.java

@@ -23,6 +23,7 @@ package org.libreccm.pagemodel.styles;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public enum Unit {
 
     EM,

ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTreeNode.java

@@ -30,6 +30,7 @@ import java.util.Locale;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public class ApplicationTreeNode implements TreeNode {
     
     private final CcmApplication application;

ccm-core/src/main/java/org/libreccm/pagemodel/ui/ApplicationTypeTreeNode.java

@@ -26,6 +26,7 @@ import org.libreccm.web.CcmApplication;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 class ApplicationTypeTreeNode implements TreeNode {
 
     private final Class<? extends CcmApplication> appType;

ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelPane.java

@@ -25,6 +25,7 @@ import com.arsdigita.toolbox.ui.LayoutPanel;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 public class PageModelPane extends LayoutPanel {
     
     private final Tree tree;

ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeController.java

@@ -29,6 +29,7 @@ import javax.inject.Inject;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @RequestScoped
 public class PageModelTreeController {
 

ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeModelBuilder.java

@@ -27,6 +27,7 @@ import com.arsdigita.bebop.tree.TreeModelBuilder;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 class PageModelTreeModelBuilder implements TreeModelBuilder {
 
     @Override

ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageModelTreeNode.java

@@ -30,6 +30,7 @@ import java.util.Locale;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 class PageModelTreeNode implements TreeNode {
 
     private final PageModel pageModel;

ccm-core/src/main/java/org/libreccm/pagemodel/ui/PageTreeModel.java

@@ -31,6 +31,7 @@ import java.util.Iterator;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 class PageTreeModel implements TreeModel {
 
     @Override