switched back to hsqldb

mariodavid · Sep 22, 2017 · d01bf66 · d01bf66
1 parent e77c0c4
commit d01bf66
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         classpath "com.haulmont.gradle:cuba-plugin:$cubaVersion"
 
 
-        classpath 'net.saliman:gradle-cobertura-plugin:2.3.2'
+        classpath 'net.saliman:gradle-cobertura-plugin:2.5.0'
     }
 }
 
@@ -30,6 +30,9 @@ def servletApi = 'org.apache.tomcat:tomcat-servlet-api:8.0.26'
 apply(plugin: 'idea')
 apply(plugin: 'cuba')
 
+def bintrayRepositoryUrl = "https://api.bintray.com/maven/mariodavid/cuba-components/cuba-component-runtime-diagnose/;publish=1"
+
+
 cuba {
     artifact {
         group = 'de.diedavids.cuba.runtimediagnose'
@@ -41,13 +44,13 @@ cuba {
     }
     uploadRepository {
         if (cuba.artifact.isSnapshot) {
-            url = System.env.UPLOAD_REPOSITORY_SNAPSHOT
+            url = System.properties['uploadRepositorySnapshot'] ?: System.env.UPLOAD_REPOSITORY_SNAPSHOT
         } else {
-            url = System.env.UPLOAD_REPOSITORY_RELEASE
+            url = System.properties['uploadRepositoryRelease'] ?: System.env.UPLOAD_REPOSITORY_RELEASE ?: bintrayRepositoryUrl
         }
 
-        user = System.env.UPLOAD_REPOSITORY_USERNAME
-        password = System.env.UPLOAD_REPOSITORY_PASSWORD
+        user = System.properties['uploadRepositoryUsername'] ?: System.env.UPLOAD_REPOSITORY_USERNAME
+        password = System.properties['uploadRepositoryPassword'] ?:System.env.UPLOAD_REPOSITORY_PASSWORD
     }
     ide {
         vcs = 'Git'
@@ -59,7 +62,7 @@ dependencies {
 }
 
 
-def oracle = files("$cuba.tomcat.dir/lib/ojdbc6.jar")
+def hsql = 'org.hsqldb:hsqldb:2.2.9'
 
 allprojects {
     apply plugin: 'net.saliman.cobertura'
@@ -184,8 +187,8 @@ configure(coreModule) {
     dependencies {
         compile(globalModule)
         provided(servletApi)
-        jdbc(oracle)
-        testRuntime(oracle)
+        jdbc(hsql)
+        testRuntime(hsql)
 
         compile 'com.github.jsqlparser:jsqlparser:0.9.7'
 
@@ -206,21 +209,19 @@ configure(coreModule) {
     }
 
     task createDb(dependsOn: assembleDbScripts, description: 'Creates local database', type: CubaDbCreation) {
-        oracleSystemPassword = 'oracle'
-        oracleSystemUser = 'system'
-        dbms = 'oracle'
+        dbms = 'hsql'
         host = 'localhost'
-        dbName = 'XE'
-        dbUser = 'cuba_component_runtime_diagnose'
-        dbPassword = 'cuba'
+        dbName = 'ddcrd2'
+        dbUser = 'sa'
+        dbPassword = ''
     }
 
     task updateDb(dependsOn: assembleDbScripts, description: 'Updates local database', type: CubaDbUpdate) {
-        dbms = 'oracle'
+        dbms = 'hsql'
         host = 'localhost'
-        dbName = 'XE'
-        dbUser = 'cuba_component_runtime_diagnose'
-        dbPassword = 'cuba'
+        dbName = 'ddcrd2'
+        dbUser = 'sa'
+        dbPassword = ''
     }
 }
 

diff --git a/modules/core/src/de/diedavids/cuba/runtimediagnose/app.properties b/modules/core/src/de/diedavids/cuba/runtimediagnose/app.properties
@@ -2,7 +2,7 @@
 #                              Configuration                                  #
 ###############################################################################
 
-cuba.dbmsType = oracle
+cuba.dbmsType = hsql
 
 cuba.springContextConfig = +de/diedavids/cuba/runtimediagnose/spring.xml
 

diff --git a/modules/core/web/META-INF/context.xml b/modules/core/web/META-INF/context.xml
@@ -1,14 +1,14 @@
 <Context>
     <!-- Database connection -->
-    <Resource driverClassName="oracle.jdbc.OracleDriver"
+    <Resource driverClassName="org.hsqldb.jdbc.JDBCDriver"
               maxIdle="2"
               maxTotal="20"
               maxWaitMillis="5000"
               name="jdbc/CubaDS"
-              password="cuba"
+              password=""
               type="javax.sql.DataSource"
-              url="jdbc:oracle:thin:@//localhost/XE"
-              username="cuba_component_runtime_diagnose"/>
+              url="jdbc:hsqldb:hsql://localhost/ddcrd2"
+              username="sa"/>
     <!-- Switch off session serialization -->
     <Manager pathname=""/>
     <!--<Resource driverClassName="org.postgresql.Driver"
@@ -29,13 +29,13 @@
           type="javax.sql.DataSource"
           url="jdbc:mysql://192.168.99.100/mysql?useSSL=false&amp;allowMultiQueries=true"
           username="root"/>-->
-    <!--<Resource driverClassName="org.hsqldb.jdbc.JDBCDriver"
+    <!--<Resource driverClassName="oracle.jdbc.OracleDriver"
           maxIdle="2"
           maxTotal="20"
           maxWaitMillis="5000"
           name="jdbc/CubaDS"
-          password=""
+          password="cuba"
           type="javax.sql.DataSource"
-          url="jdbc:hsqldb:hsql://localhost/ddcrd2"
-          username="sa"/>-->
+          url="jdbc:oracle:thin:@//localhost/XE"
+          username="cuba_component_runtime_diagnose"/>-->
 </Context>