Finalize release

git-svn-id: https://svn.argeo.org/slc/trunk@1419 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml b/org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
index ad1893d4b56d378dae2e36b74d40c38c9d33eeb2..fda6c169271d0ceb0ca3d91970fc8f4d44feed11 100644 (file)
--- a/org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+++ b/org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
@@ -22,13 +22,10 @@
                <Arg>jdbc/mainDs</Arg>
                <Arg>
                        <New class="org.hsqldb.jdbc.jdbcDataSource">
-                               <Set name="database">jdbc:hsqldb:mem:mainDs</Set>
-                               <!--
                                <Set name="database">
                                        <Property name="jdbcUrl"
                                                default="jdbc:hsqldb:mem:mainDs" />
                                </Set>
-                                 -->
                                <Set name="user">sa</Set>
                                <Set name="password"></Set>
                        </New>

diff --git a/org.argeo.slc.webapp/src/main/config/tomcat/org.argeo.slc.webapp.xml b/org.argeo.slc.webapp/src/main/config/tomcat/org.argeo.slc.webapp.xml
index 75d7b2546cd0c495790d793cfdd7d41845ab88f5..7ec1a09a0dc47b7c30b00716d6826bcde5ff6727 100644 (file)
--- a/org.argeo.slc.webapp/src/main/config/tomcat/org.argeo.slc.webapp.xml
+++ b/org.argeo.slc.webapp/src/main/config/tomcat/org.argeo.slc.webapp.xml
@@ -12,7 +12,7 @@
                url="jdbc:mysql://localhost:3306/argeo_slc?autoReconnect=true" />
                
                <Parameter name="sessionFactoryParentBean"
-               value="slcServerDefault.sessionFactory.MySQL" override="false" />
+               value="slcServerDefault.sessionFactory.MySQL5" override="false" />
        -->
 
        <Resource name="jdbc/mainDs" auth="Container"