From ae4b429379895a41fc16be313dac08e6a6b1ce82 Mon Sep 17 00:00:00 2001
From: Alessandro Polverini <polverini@gmail.com>
Date: Mon, 10 Feb 2014 08:43:40 +0100
Subject: [PATCH] Using HSQL integrated db

---
 SPR-11406/nbactions.xml                       |   6 +-
 SPR-11406/pom.xml                             | 242 +++++++++---------
 .../main/java/it/nibbles/test/objs/User.java  |   6 +-
 SPR-11406/src/main/resources/schema.sql       |   7 +
 .../webapp/WEB-INF/applicationContext.xml     |  38 +--
 5 files changed, 153 insertions(+), 146 deletions(-)
 create mode 100644 SPR-11406/src/main/resources/schema.sql

diff --git a/SPR-11406/nbactions.xml b/SPR-11406/nbactions.xml
index 0c2b5400..5295c3b0 100644
--- a/SPR-11406/nbactions.xml
+++ b/SPR-11406/nbactions.xml
@@ -12,7 +12,7 @@
             </goals>
             <properties>
                 <netbeans.deploy>true</netbeans.deploy>
-                <netbeans.deploy.clientUrlPart>/adm/info</netbeans.deploy.clientUrlPart>
+                <netbeans.deploy.clientUrlPart>/newUser/test</netbeans.deploy.clientUrlPart>
             </properties>
         </action>
         <action>
@@ -28,7 +28,7 @@
             <properties>
                 <netbeans.deploy.debugmode>true</netbeans.deploy.debugmode>
                 <netbeans.deploy>true</netbeans.deploy>
-                <netbeans.deploy.clientUrlPart>/adm/info</netbeans.deploy.clientUrlPart>
+                <netbeans.deploy.clientUrlPart>/newUser/test</netbeans.deploy.clientUrlPart>
             </properties>
         </action>
         <action>
@@ -44,7 +44,7 @@
             <properties>
                 <netbeans.deploy>true</netbeans.deploy>
                 <netbeans.deploy.profilemode>true</netbeans.deploy.profilemode>
-                <netbeans.deploy.clientUrlPart>/adm/info</netbeans.deploy.clientUrlPart>
+                <netbeans.deploy.clientUrlPart>/newUser/test</netbeans.deploy.clientUrlPart>
             </properties>
         </action>
     </actions>
diff --git a/SPR-11406/pom.xml b/SPR-11406/pom.xml
index 42fa3863..b65055c3 100644
--- a/SPR-11406/pom.xml
+++ b/SPR-11406/pom.xml
@@ -1,128 +1,134 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <name>SPR-11406</name>
-  <groupId>it.nibbles</groupId>
-  <artifactId>SPR-11406</artifactId>
-  <packaging>war</packaging>
-  <version>0.1-wip</version>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.version>4.0.1.RELEASE</spring.version>
-    <slf4j.version>1.7.5</slf4j.version>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${spring.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!--   Spring    -->
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
+    <modelVersion>4.0.0</modelVersion>
+    <name>SPR-11406</name>
+    <groupId>it.nibbles</groupId>
+    <artifactId>SPR-11406</artifactId>
+    <packaging>war</packaging>
+    <version>0.1-wip</version>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring.version>4.0.1.RELEASE</spring.version>
+        <slf4j.version>1.7.5</slf4j.version>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--   Spring    -->
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
     
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-jpa</artifactId>
-      <version>1.4.3.RELEASE</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <version>4.3.0.Final</version>
-    </dependency>
-
-  </dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>1.4.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>4.3.0.Final</version>
+        </dependency>
+
+    </dependencies>
  
 
-  <build>
+    <build>
 
-    <plugins>
+        <plugins>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-          <showDeprecation>true</showDeprecation>
-        </configuration>
-      </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
 
-    </plugins>
-    <finalName>SPR-11406</finalName>
-  </build>
+        </plugins>
+        <finalName>SPR-11406</finalName>
+    </build>
 
 </project>
diff --git a/SPR-11406/src/main/java/it/nibbles/test/objs/User.java b/SPR-11406/src/main/java/it/nibbles/test/objs/User.java
index 9c9bcf8a..c3a2a2af 100644
--- a/SPR-11406/src/main/java/it/nibbles/test/objs/User.java
+++ b/SPR-11406/src/main/java/it/nibbles/test/objs/User.java
@@ -1,5 +1,6 @@
 package it.nibbles.test.objs;
 
+import java.util.Random;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -14,13 +15,16 @@ public class User {
     public static final int STR_LEN = 64;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Integer id;
 
     @Column(name = "username", nullable = false)
     private String name;
 
+    public User() {
+        setId(new Random().nextInt());
+    }
+
     public Integer getId() {
         return id;
     }
diff --git a/SPR-11406/src/main/resources/schema.sql b/SPR-11406/src/main/resources/schema.sql
new file mode 100644
index 00000000..eab2ca5a
--- /dev/null
+++ b/SPR-11406/src/main/resources/schema.sql
@@ -0,0 +1,7 @@
+-- For HSQL
+CREATE TABLE UserTest(id int, username varchar(100), PRIMARY KEY (id));
+--ALTER TABLE User ALTER COLUMN id 
+-- SET GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1);
+
+-- For Mysql
+-- CREATE TABLE UserTest(id int  AUTO_INCREMENT, username varchar(100), PRIMARY KEY (id));
diff --git a/SPR-11406/src/main/webapp/WEB-INF/applicationContext.xml b/SPR-11406/src/main/webapp/WEB-INF/applicationContext.xml
index 8466f078..aff64a2e 100644
--- a/SPR-11406/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/SPR-11406/src/main/webapp/WEB-INF/applicationContext.xml
@@ -8,42 +8,32 @@
     xmlns:context="http://www.springframework.org/schema/context"
     xmlns:tx="http://www.springframework.org/schema/tx"
     xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+    xmlns:jdbc="http://www.springframework.org/schema/jdbc"
     xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-    http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+        http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
+        http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
 ">
 
     <context:annotation-config />
     <context:component-scan base-package="it.nibbles.test"/>
 
-    <!--
-    // Create this table on the "test" with this statement:
+    <jdbc:embedded-database id="dataSource" type="HSQL">
+        <jdbc:script location="classpath:schema.sql" encoding="UTF-8" />
+    </jdbc:embedded-database>
     
-    CREATE TABLE UserTest (
-      id int(11) NOT NULL AUTO_INCREMENT,
-      username varchar(64) NOT NULL,
-      PRIMARY KEY (id),
-      UNIQUE KEY username (username)
-    )    
-    -->
-    <bean name="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-        <property name="url" value="jdbc:mysql://localhost:3306/test" />
-        <property name="username" value="test" />
-        <property name="password" value="test" />
-    </bean>
-
     <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="dataSource"/>
         <property name="jpaVendorAdapter">
             <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
                 <property name="showSql" value="false" />
-                <property name="generateDdl" value="false" />
+                <property name="generateDdl" value="true" />
                 <property name="databasePlatform" value="org.hibernate.dialect.MySQL5InnoDBDialect" />
+                <property name="database" value="HSQL" />
             </bean>
         </property>
         <property name="packagesToScan">
@@ -59,6 +49,6 @@
 
     <tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="false" />
     <jpa:repositories base-package="it.nibbles.test.dao"
-                    entity-manager-factory-ref="entityManagerFactory" transaction-manager-ref="transactionManager"/>
+                      entity-manager-factory-ref="entityManagerFactory" transaction-manager-ref="transactionManager"/>
 
 </beans>