From 078c23ea8a31e3b76f848ac95127ed2927b76001 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 16 Jun 2015 14:59:47 +0000 Subject: [PATCH] CCM NG: Changed JNDI names for test datasources to reflect Maven artifact name git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3487 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/pom.xml | 4 +- .../arquillian.xml | 2 +- .../test-persistence.xml | 2 +- .../arquillian.xml | 2 +- .../test-persistence.xml | 2 +- .../arquillian.xml | 2 +- .../test-persistence.xml | 2 +- ccm-shortcuts/pom.xml | 7 +-- .../org/libreccm/shortcuts/Shortcuts.java | 50 +++++++++++++++++++ 9 files changed, 59 insertions(+), 14 deletions(-) create mode 100644 ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 0cf985825..1c35173de 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -109,11 +109,11 @@ ccm-core - + diff --git a/ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml b/ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml index a4df7e384..699e80b3d 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml +++ b/ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml @@ -13,7 +13,7 @@ --> - java:/comp/env/jdbc/ccm/h2-mem/ccm-core + java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem org.hibernate.jpa.HibernatePersistenceProvider - java:/comp/env/jdbc/ccm/h2-mem/ccm-core + java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem diff --git a/ccm-core/src/test/resources-wildfly8-remote-mysql/arquillian.xml b/ccm-core/src/test/resources-wildfly8-remote-mysql/arquillian.xml index 10f300616..77293d8e8 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-mysql/arquillian.xml +++ b/ccm-core/src/test/resources-wildfly8-remote-mysql/arquillian.xml @@ -9,7 +9,7 @@ - java:/comp/env/jdbc/ccm/mysql/ccm-core + java:/comp/env/jdbc/org/libreccm/ccm-core/mysql diff --git a/ccm-core/src/test/resources-wildfly8-remote-mysql/test-persistence.xml b/ccm-core/src/test/resources-wildfly8-remote-mysql/test-persistence.xml index fa6be5b14..cc3b2cc77 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-mysql/test-persistence.xml +++ b/ccm-core/src/test/resources-wildfly8-remote-mysql/test-persistence.xml @@ -20,7 +20,7 @@ --> org.hibernate.jpa.HibernatePersistenceProvider - java:/comp/env/jdbc/ccm/mysql/ccm-core + java:/comp/env/jdbc/org/libreccm/ccm-core/mysql diff --git a/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml b/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml index 9973baba1..0e221033e 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml +++ b/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml @@ -9,7 +9,7 @@ - java:/comp/env/jdbc/ccm/pgsql/ccm-core + java:/comp/env/jdbc/org/libreccm/ccm-core/pgsql diff --git a/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml b/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml index 1db59f74a..9a5bee458 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml +++ b/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml @@ -20,7 +20,7 @@ --> org.hibernate.jpa.HibernatePersistenceProvider - java:/comp/env/jdbc/ccm/pgsql/ccm-core + java:/comp/env/jdbc/org/libreccm/ccm-core/pgsql diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 7df471208..f8fb5a59b 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -113,11 +113,6 @@ ccm-shortcuts - - - ${project.build.directory}/generated-resources - - @@ -193,7 +188,7 @@ postgresql9 - org.libreccm.shortcuts + org.libreccm true diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java new file mode 100644 index 000000000..9a64bbcac --- /dev/null +++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java @@ -0,0 +1,50 @@ +/* + * 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 javax.persistence.Entity; +import javax.persistence.Table; +import org.libreccm.web.Application; + +/** + * + * @author Jens Pelzetter + */ +@Entity +@Table(name = "shortcut_app") +public class Shortcuts extends Application { + private static final long serialVersionUID = -6793265996161649637L; + + private String shortcutAppName; + + public Shortcuts() { + super(); + } + + public String getShortcutAppName() { + return shortcutAppName; + } + + public void setShortcutAppName(final String shortcutAppName) { + this.shortcutAppName = shortcutAppName; + } + + + +}