diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcut.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcut.java
index 99002a16d..546a90226 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcut.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcut.java
@@ -29,27 +29,28 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.libreccm.core.CcmObject;
/**
*
* @author Jens Pelzetter
*/
@Entity
-@Table(schema ="ccm_shortcuts", name = "shortcuts")
+@Table(schema ="CCM_SHORTCUTS", name = "SHORTCUTS")
public class Shortcut implements Serializable {
private static final long serialVersionUID = -5674633339633714327L;
@Id
- @Column(name = "shortcut_id")
+ @Column(name = "SHORTCUTS_ID")
@GeneratedValue(strategy = GenerationType.AUTO)
private long shortcutId;
- @Column(name = "url_key", length = 1024)
+ @Column(name = "URL_KEY", length = 1024)
@NotEmpty
private String urlKey;
- @Column(name = "redirect", length = 1024)
+ @Column(name = "REDIRECT", length = 1024)
@NotEmpty
private String redirect;
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java
new file mode 100644
index 000000000..2699877eb
--- /dev/null
+++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/ShortcutRepository.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+package org.libreccm.shortcuts;
+
+import org.libreccm.core.AbstractEntityRepository;
+
+/**
+ *
+ * @author Alexander Konermann
+ */
+public class ShortcutRepository extends AbstractEntityRepository {
+
+ @Override
+ public Class getEntityClass() {
+ return Shortcut.class;
+ }
+
+ @Override
+ public boolean isNew(final Shortcut entity) {
+ return entity.getShortcutId() == 0;
+ }
+
+}
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
index f1a7631d7..d9a5617b1 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
@@ -27,7 +27,7 @@ import org.libreccm.web.Application;
* @author Jens Pelzetter
*/
@Entity
-@Table(schema ="ccm_shortcuts", name = "shortcuts_app")
+@Table(schema ="CCM_SHORTCUTS", name = "SHORTCUTS_APP")
public class Shortcuts extends Application {
private static final long serialVersionUID = -6793265996161649637L;
diff --git a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/h2/V1_0_0_0__create_tables.sql b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/h2/V1_0_0_0__create_tables.sql
index 155f58fc5..ce8e5dbc2 100644
--- a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/h2/V1_0_0_0__create_tables.sql
+++ b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/h2/V1_0_0_0__create_tables.sql
@@ -1,12 +1,12 @@
- create table shortcuts (
+ create table SHORTCUTS (
shortcut_id bigint generated by default as identity,
redirect varchar(1024),
url_key varchar(1024),
primary key (shortcut_id)
);
- create table shortcuts_app (
+ create table SHORTCUTS_APP (
object_id bigint not null,
primary key (object_id)
);
diff --git a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/oracle/V1_0_0_0__create_tables.sql b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/oracle/V1_0_0_0__create_tables.sql
index 27b6ff125..2dc4da75e 100644
--- a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/oracle/V1_0_0_0__create_tables.sql
+++ b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/oracle/V1_0_0_0__create_tables.sql
@@ -1,12 +1,12 @@
- create table shortcuts (
+ create table SHORTCUTS (
shortcut_id number(19,0) not null,
redirect varchar2(1024 char),
url_key varchar2(1024 char),
primary key (shortcut_id)
);
- create table shortcuts_app (
+ create table SHORTCUTS_APP (
object_id number(19,0) not null,
primary key (object_id)
);
diff --git a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/pqsql/V1_0_0_0__create_tables.sql b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/pqsql/V1_0_0_0__create_tables.sql
index 567c1b4f0..ae5f7b413 100644
--- a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/pqsql/V1_0_0_0__create_tables.sql
+++ b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/pqsql/V1_0_0_0__create_tables.sql
@@ -1,12 +1,12 @@
- create table shortcuts (
+ create table SHORTCUTS (
shortcut_id int8 not null,
redirect varchar(1024),
url_key varchar(1024),
primary key (shortcut_id)
);
- create table shortcuts_app (
+ create table SHORTCUTS_APP (
object_id int8 not null,
primary key (object_id)
);
\ No newline at end of file