diff options
46 files changed, 47 insertions, 45 deletions
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/PageKey.java b/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/PageKey.java index c55686e..2553a11 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/PageKey.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/PageKey.java @@ -13,7 +13,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "page_keys", schema = "public", catalog = "benki") +@Table(name = "page_keys", schema = "benki") @IdClass(PageKeyPK.class) public class PageKey extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java b/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java index b7dd6fc..73648dc 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java @@ -21,7 +21,7 @@ import javax.persistence.OneToOne; import javax.persistence.Table; @Entity -@Table(name = "roles", schema = "public", catalog = "benki") +@Table(name = "roles", schema = "benki") public class Role extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/Bookmark.java b/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/Bookmark.java index 363783d..d021290 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/Bookmark.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/Bookmark.java @@ -9,7 +9,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "bookmarks", schema = "public", catalog = "benki") +@Table(name = "bookmarks", schema = "benki") public class Bookmark extends Post { @Column(name = "uri", nullable = false, length = -1) diff --git a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTag.java b/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTag.java index 10e6785..32136b7 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTag.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/bookmarx/BookmarkTag.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "bookmark_tags", schema = "public", catalog = "benki") +@Table(name = "bookmark_tags", schema = "benki") @IdClass(BookmarkTagPK.class) public class BookmarkTag extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/generic/Post.java b/src/main/java/eu/mulk/mulkcms2/benki/generic/Post.java index 6839f99..a9a5ebd 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/generic/Post.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/generic/Post.java @@ -17,7 +17,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "posts", schema = "public", catalog = "benki") +@Table(name = "posts", schema = "benki") @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) public abstract class Post extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/generic/PostTarget.java b/src/main/java/eu/mulk/mulkcms2/benki/generic/PostTarget.java index cc406d7..7073874 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/generic/PostTarget.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/generic/PostTarget.java @@ -12,7 +12,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "post_targets", schema = "public", catalog = "benki") +@Table(name = "post_targets", schema = "benki") @IdClass(PostTargetPK.class) public class PostTarget extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatMessage.java b/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatMessage.java index d124c04..d3fbf2e 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatMessage.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatMessage.java @@ -9,7 +9,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "lazychat_messages", schema = "public", catalog = "benki") +@Table(name = "lazychat_messages", schema = "benki") public class LazychatMessage extends Post { @Column(name = "content", nullable = true, length = -1) diff --git a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReference.java b/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReference.java index 2abbaf5..2cf34d1 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReference.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/lafargue/LazychatReference.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "lazychat_references", schema = "public", catalog = "benki") +@Table(name = "lazychat_references", schema = "benki") @IdClass(LazychatReferencePK.class) public class LazychatReference extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java b/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java index fe2c905..bb41dda 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/OpenId.java @@ -7,8 +7,10 @@ import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; +import javax.persistence.Table; @Entity(name = "BenkiOpenId") +@Table(name = "openids", schema = "benki") public class OpenId extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/RsaKey.java b/src/main/java/eu/mulk/mulkcms2/benki/users/RsaKey.java index 85bda62..9dd7931 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/RsaKey.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/RsaKey.java @@ -12,7 +12,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "rsa_keys", schema = "public", catalog = "benki") +@Table(name = "rsa_keys", schema = "benki") @IdClass(RsaKeyPK.class) public class RsaKey extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/User.java b/src/main/java/eu/mulk/mulkcms2/benki/users/User.java index 45e775c..e16a111 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/User.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/User.java @@ -21,7 +21,7 @@ import javax.persistence.OneToOne; import javax.persistence.Table; @Entity(name = "BenkiUser") -@Table(name = "users", schema = "public", catalog = "benki") +@Table(name = "users", schema = "benki") public class User extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserDefaultTarget.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserDefaultTarget.java index 16807aa..94efef1 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserDefaultTarget.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserDefaultTarget.java @@ -12,7 +12,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "user_default_target", schema = "public", catalog = "benki") +@Table(name = "user_default_target", schema = "benki") @IdClass(UserDefaultTargetPK.class) public class UserDefaultTarget extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserEmailAddress.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserEmailAddress.java index 21148b8..383c382 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserEmailAddress.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserEmailAddress.java @@ -10,7 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "user_email_addresses", schema = "public", catalog = "benki") +@Table(name = "user_email_addresses", schema = "benki") public class UserEmailAddress extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserJid.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserJid.java index b2100a9..867583c 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserJid.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserJid.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "user_jids", schema = "public", catalog = "benki") +@Table(name = "user_jids", schema = "benki") @IdClass(UserJidPK.class) public class UserJid extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserNickname.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserNickname.java index c31c8a1..05a8004 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserNickname.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserNickname.java @@ -10,7 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "user_nicknames", schema = "public", catalog = "benki") +@Table(name = "user_nicknames", schema = "benki") public class UserNickname extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRole.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRole.java index 7d48b64..7d2c2ea 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRole.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRole.java @@ -12,7 +12,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "user_roles", schema = "public", catalog = "benki") +@Table(name = "user_roles", schema = "benki") @IdClass(UserRolePK.class) public class UserRole extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRsaKey.java b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRsaKey.java index 806c1b8..7e99791 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/UserRsaKey.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/UserRsaKey.java @@ -13,7 +13,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "user_rsa_keys", schema = "public", catalog = "benki") +@Table(name = "user_rsa_keys", schema = "benki") @IdClass(UserRsaKeyPK.class) public class UserRsaKey extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/benki/users/WebId.java b/src/main/java/eu/mulk/mulkcms2/benki/users/WebId.java index 246a448..9a8728c 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/users/WebId.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/users/WebId.java @@ -10,7 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "webids", schema = "public", catalog = "benki") +@Table(name = "webids", schema = "benki") public class WebId extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiPage.java b/src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiPage.java index 754b633..dff7e69 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiPage.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiPage.java @@ -10,7 +10,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "wiki_pages", schema = "public", catalog = "benki") +@Table(name = "wiki_pages", schema = "benki") public class WikiPage extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiPageRevision.java b/src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiPageRevision.java index de92150..35a4986 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiPageRevision.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/wiki/WikiPageRevision.java @@ -12,7 +12,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "wiki_page_revisions", schema = "public", catalog = "benki") +@Table(name = "wiki_page_revisions", schema = "benki") public class WikiPageRevision extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/comments/Comment.java b/src/main/java/eu/mulk/mulkcms2/cms/comments/Comment.java index 4dc8d9d..0843c12 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/comments/Comment.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/comments/Comment.java @@ -13,7 +13,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "comments", schema = "public", catalog = "mulkcms") +@Table(name = "comments", schema = "public") public class Comment extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java b/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java index effa45d..2c6f6e4 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java @@ -15,7 +15,7 @@ import javax.persistence.Table; import org.hibernate.annotations.TypeDef; @Entity -@Table(name = "comment_revisions", schema = "public", catalog = "mulkcms") +@Table(name = "comment_revisions", schema = "public") @TypeDef(name = "inet", typeClass = PostgreSQLInetType.class, defaultForType = Inet.class) public class CommentRevision extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/comments/UsedTransactionKey.java b/src/main/java/eu/mulk/mulkcms2/cms/comments/UsedTransactionKey.java index 57dd112..6565946 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/comments/UsedTransactionKey.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/comments/UsedTransactionKey.java @@ -7,7 +7,7 @@ import javax.persistence.Id; import javax.persistence.Table; @Entity -@Table(name = "used_transaction_keys", schema = "public", catalog = "mulkcms") +@Table(name = "used_transaction_keys", schema = "public") public class UsedTransactionKey extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/journal/Journal.java b/src/main/java/eu/mulk/mulkcms2/cms/journal/Journal.java index b3d8bf5..f3732a7 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/journal/Journal.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/journal/Journal.java @@ -10,7 +10,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "journals", schema = "public", catalog = "mulkcms") +@Table(name = "journals", schema = "public") public class Journal extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntry.java b/src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntry.java index ed4aeed..92ccf45 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntry.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/journal/JournalEntry.java @@ -12,7 +12,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "journal_entries", schema = "public", catalog = "mulkcms") +@Table(name = "journal_entries", schema = "public") @IdClass(JournalEntryPK.class) public class JournalEntry extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalCategory.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalCategory.java index 76d7b94..92cc3df 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalCategory.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalCategory.java @@ -7,7 +7,7 @@ import javax.persistence.Id; import javax.persistence.Table; @Entity -@Table(name = "journal_category", schema = "public", catalog = "mulkcms") +@Table(name = "journal_category", schema = "public") public class LegacyJournalCategory extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalComment.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalComment.java index 0e28e71..f3ecc5c 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalComment.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalComment.java @@ -10,7 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "journal_comment", schema = "public", catalog = "mulkcms") +@Table(name = "journal_comment", schema = "public") public class LegacyJournalComment extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalEntry.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalEntry.java index df2e8cf..0038f97 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalEntry.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalEntry.java @@ -10,7 +10,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "journal_entry", schema = "public", catalog = "mulkcms") +@Table(name = "journal_entry", schema = "public") public class LegacyJournalEntry extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalPingback.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalPingback.java index 5052ee1..6f0022b 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalPingback.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalPingback.java @@ -10,7 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "journal_pingback", schema = "public", catalog = "mulkcms") +@Table(name = "journal_pingback", schema = "public") public class LegacyJournalPingback extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalTrackback.java b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalTrackback.java index daf4c2d..3d9c500 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalTrackback.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/legacyjournal/LegacyJournalTrackback.java @@ -10,7 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "journal_trackback", schema = "public", catalog = "mulkcms") +@Table(name = "journal_trackback", schema = "public") public class LegacyJournalTrackback extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/Article.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/Article.java index 5110558..100c730 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/Article.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/Article.java @@ -17,7 +17,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "articles", schema = "public", catalog = "mulkcms") +@Table(name = "articles", schema = "public") public class Article extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleAlias.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleAlias.java index de8d443..6896aa7 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleAlias.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleAlias.java @@ -10,7 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "article_aliases", schema = "public", catalog = "mulkcms") +@Table(name = "article_aliases", schema = "public") public class ArticleAlias extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java index 0417b7d..f72d36e 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import org.hibernate.annotations.Immutable; @Entity -@Table(name = "article_branch_tips", schema = "public", catalog = "mulkcms") +@Table(name = "article_branch_tips", schema = "public") @IdClass(ArticleBranchTipPK.class) @Immutable public class ArticleBranchTip extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java index a476188..2c9af5f 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java @@ -8,7 +8,7 @@ import javax.persistence.Table; import org.hibernate.annotations.Immutable; @Entity -@Table(name = "article_comment_counts", schema = "public", catalog = "mulkcms") +@Table(name = "article_comment_counts", schema = "public") @Immutable public class ArticleCommentCount extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java index 22abf59..532c148 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java @@ -9,7 +9,7 @@ import javax.persistence.Table; import org.hibernate.annotations.Immutable; @Entity -@Table(name = "article_publishing_dates", schema = "public", catalog = "mulkcms") +@Table(name = "article_publishing_dates", schema = "public") @Immutable public class ArticlePublishingDate extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java index ebb2b9e..670df90 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java @@ -17,7 +17,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "article_revisions", schema = "public", catalog = "mulkcms") +@Table(name = "article_revisions", schema = "public") public class ArticleRevision extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java index eed2fb6..d5ca828 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "article_revision_characteristics", schema = "public", catalog = "mulkcms") +@Table(name = "article_revision_characteristics", schema = "public") @IdClass(ArticleRevisionCharacteristicPK.class) public class ArticleRevisionCharacteristic extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java index 7233b92..d3d3100 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java @@ -10,7 +10,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name = "article_types", schema = "public", catalog = "mulkcms") +@Table(name = "article_types", schema = "public") public class ArticleType extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPage.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPage.java index 4217053..db92afa 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPage.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/CachedPage.java @@ -9,7 +9,7 @@ import javax.persistence.IdClass; import javax.persistence.Table; @Entity -@Table(name = "cached_pages", schema = "public", catalog = "mulkcms") +@Table(name = "cached_pages", schema = "public") @IdClass(CachedPagePK.class) public class CachedPage extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/Category.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/Category.java index 5171453..1f5902f 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/pages/Category.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/Category.java @@ -12,7 +12,7 @@ import javax.persistence.ManyToMany; import javax.persistence.Table; @Entity -@Table(name = "categories", schema = "public", catalog = "mulkcms") +@Table(name = "categories", schema = "public") public class Category extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificate.java b/src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificate.java index 4e6f047..8fec250 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificate.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/users/LoginCertificate.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "login_certificates", schema = "public", catalog = "mulkcms") +@Table(name = "login_certificates", schema = "public") @IdClass(LoginCertificatePK.class) public class LoginCertificate extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java b/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java index a7a391b..c73f079 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/users/OpenId.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity(name = "CmsOpenId") -@Table(name = "openids", schema = "public", catalog = "mulkcms") +@Table(name = "openids", schema = "public") @IdClass(OpenIdPK.class) public class OpenId extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/users/Password.java b/src/main/java/eu/mulk/mulkcms2/cms/users/Password.java index 632284e..3745bfb 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/users/Password.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/users/Password.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "passwords", schema = "public", catalog = "mulkcms") +@Table(name = "passwords", schema = "public") @IdClass(PasswordPK.class) public class Password extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/users/User.java b/src/main/java/eu/mulk/mulkcms2/cms/users/User.java index 9ac5da0..41e252c 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/users/User.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/users/User.java @@ -12,7 +12,7 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity(name = "CmsUser") -@Table(name = "users", schema = "public", catalog = "mulkcms") +@Table(name = "users", schema = "public") public class User extends PanacheEntityBase { @Id diff --git a/src/main/java/eu/mulk/mulkcms2/cms/users/UserPermission.java b/src/main/java/eu/mulk/mulkcms2/cms/users/UserPermission.java index a580813..4962b68 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/users/UserPermission.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/users/UserPermission.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "user_permissions", schema = "public", catalog = "mulkcms") +@Table(name = "user_permissions", schema = "public") @IdClass(UserPermissionPK.class) public class UserPermission extends PanacheEntityBase { diff --git a/src/main/java/eu/mulk/mulkcms2/cms/users/UserSetting.java b/src/main/java/eu/mulk/mulkcms2/cms/users/UserSetting.java index f4ec234..56c6fca 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/users/UserSetting.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/users/UserSetting.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; @Entity -@Table(name = "user_settings", schema = "public", catalog = "mulkcms") +@Table(name = "user_settings", schema = "public") @IdClass(UserSettingPK.class) public class UserSetting extends PanacheEntityBase { |