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

@@ -109,11 +109,11 @@
     
     <build>
         <finalName>ccm-core</finalName>
-        <resources>
+        <!--<resources>
             <resource>
                 <directory>${project.build.directory}/generated-resources</directory>
             </resource>
-        </resources>
+        </resources>-->
         
         <plugins>
             <plugin>

ccm-core/src/test/resources-wildfly8-remote-h2-mem/arquillian.xml

@@ -13,7 +13,7 @@
     </property>-->
     
     <extension qualifier="persistence">
-        <property name="defaultDataSource">java:/comp/env/jdbc/ccm/h2-mem/ccm-core</property>
+        <property name="defaultDataSource">java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem</property>
         
         <!-- 
             Disable automatic cleanup, does not work because of referential 

ccm-core/src/test/resources-wildfly8-remote-h2-mem/test-persistence.xml

@@ -20,7 +20,7 @@
         -->
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
             
-        <jta-data-source>java:/comp/env/jdbc/ccm/h2-mem/ccm-core</jta-data-source>
+        <jta-data-source>java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem</jta-data-source>
         <properties>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.show_sql" value="true"/>

ccm-core/src/test/resources-wildfly8-remote-mysql/arquillian.xml

@@ -9,7 +9,7 @@
     </engine>
     
     <extension qualifier="persistence">
-        <property name="defaultDataSource">java:/comp/env/jdbc/ccm/mysql/ccm-core</property>
+        <property name="defaultDataSource">java:/comp/env/jdbc/org/libreccm/ccm-core/mysql</property>
         <!--<property name="javaVmArguments">
             -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
         </property>-->

ccm-core/src/test/resources-wildfly8-remote-mysql/test-persistence.xml

@@ -20,7 +20,7 @@
         -->
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
             
-        <jta-data-source>java:/comp/env/jdbc/ccm/mysql/ccm-core</jta-data-source>
+        <jta-data-source>java:/comp/env/jdbc/org/libreccm/ccm-core/mysql</jta-data-source>
         <properties>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.show_sql" value="true"/>

ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml

@@ -9,7 +9,7 @@
     </engine>
     
     <extension qualifier="persistence">
-        <property name="defaultDataSource">java:/comp/env/jdbc/ccm/pgsql/ccm-core</property>
+        <property name="defaultDataSource">java:/comp/env/jdbc/org/libreccm/ccm-core/pgsql</property>
         <!--<property name="javaVmArguments">
             -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
         </property>-->

ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml

@@ -20,7 +20,7 @@
         -->
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
             
-        <jta-data-source>java:/comp/env/jdbc/ccm/pgsql/ccm-core</jta-data-source>
+        <jta-data-source>java:/comp/env/jdbc/org/libreccm/ccm-core/pgsql</jta-data-source>
         <properties>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.show_sql" value="true"/>

ccm-shortcuts/pom.xml

@@ -113,11 +113,6 @@
     
     <build>
         <finalName>ccm-shortcuts</finalName>
-        <resources>
-            <resource>
-                <directory>${project.build.directory}/generated-resources</directory>
-            </resource>
-        </resources>
         
         <plugins>
             <plugin>
@@ -193,7 +188,7 @@
                         <param>postgresql9</param>
                     </dialects>
                     <packages>
-                        <param>org.libreccm.shortcuts</param>
+                        <param>org.libreccm</param>
                     </packages>
                     <useEnvers>true</useEnvers>
                 </configuration>

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@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;
+    }
+    
+    
+    
+}