Commit 11cedacd2af497b0653747b61b1a019e6ef18cd3

Authored by Volodymyr Babak
1 parent ebbec801

Moved hsql DB folder to env variables

... ... @@ -260,7 +260,6 @@
260 260 <dependency>
261 261 <groupId>org.hsqldb</groupId>
262 262 <artifactId>hsqldb</artifactId>
263   - <scope>test</scope>
264 263 </dependency>
265 264 </dependencies>
266 265
... ...
... ... @@ -17,3 +17,4 @@
17 17 export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@"
18 18 export LOG_FILENAME=${pkg.name}.out
19 19 export LOADER_PATH=${pkg.installFolder}/conf,${pkg.installFolder}/extensions
  20 +export SQL_DATA_FOLDER=${pkg.installFolder}/data/sql
... ...
... ... @@ -223,21 +223,36 @@ spring.mvc.cors:
223 223 allowed-headers: "*"
224 224 max-age: "1800"
225 225 allow-credentials: "true"
226   -
227   -# SQL DAO Configuration
228 226
  227 +# HSQLDB DAO Configuration
229 228 spring:
230 229 data:
231 230 jpa:
232 231 repositories:
233 232 enabled: "true"
234 233 jpa:
235   - show-sql: "false"
236   - database-platform: "org.hibernate.dialect.PostgreSQLDialect"
237 234 hibernate:
238 235 ddl-auto: "validate"
  236 + database-platform: "org.hibernate.dialect.HSQLDialect"
239 237 datasource:
240   - driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
241   - url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}"
242   - username: "${SPRING_DATASOURCE_USERNAME:postgres}"
243   - password: "${SPRING_DATASOURCE_PASSWORD:postgres}"
\ No newline at end of file
  238 + driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.hsqldb.jdbc.JDBCDriver}"
  239 + url: "${SPRING_DATASOURCE_URL:jdbc:hsqldb:file:${SQL_DATA_FOLDER:/tmp}/thingsboardDb;sql.enforce_size=false}"
  240 + username: "${SPRING_DATASOURCE_USERNAME:sa}"
  241 + password: "${SPRING_DATASOURCE_PASSWORD:}"
  242 +
  243 +
  244 +# Postgres DAO Configuration
  245 +#spring:
  246 +# data:
  247 +# jpa:
  248 +# repositories:
  249 +# enabled: "true"
  250 +# jpa:
  251 +# hibernate:
  252 +# ddl-auto: "validate"
  253 +# database-platform: "org.hibernate.dialect.PostgreSQLDialect"
  254 +# datasource:
  255 +# driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
  256 +# url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}"
  257 +# username: "${SPRING_DATASOURCE_USERNAME:postgres}"
  258 +# password: "${SPRING_DATASOURCE_PASSWORD:postgres}"
... ...
... ... @@ -78,6 +78,7 @@ if "%1" == "--loadDemo" (
78 78
79 79 SET BASE=%~dp0
80 80 SET LOADER_PATH=%BASE%\conf,%BASE%\extensions
  81 +SET SQL_DATA_FOLDER=%BASE%\data\sql
81 82 SET jarfile=%BASE%\lib\${pkg.name}.jar
82 83 SET installDir=%BASE%\data
83 84
... ...
... ... @@ -6,6 +6,7 @@
6 6 <logpath>${pkg.winWrapperLogFolder}</logpath>
7 7 <logmode>rotate</logmode>
8 8 <env name="LOADER_PATH" value="%BASE%\conf,%BASE%\extensions" />
  9 + <env name="SQL_DATA_FOLDER" value="%BASE%\data\sql" />
9 10 <executable>java</executable>
10 11 <startargument>-Dplatform=windows</startargument>
11 12 <startargument>-jar</startargument>
... ...
... ... @@ -22,6 +22,7 @@ if not defined fromVersion (
22 22 )
23 23
24 24 SET LOADER_PATH=%BASE%\conf,%BASE%\extensions
  25 +SET SQL_DATA_FOLDER=%BASE%\data\sql
25 26 SET jarfile=%BASE%\lib\${pkg.name}.jar
26 27 SET installDir=%BASE%\data
27 28
... ...
... ... @@ -763,7 +763,6 @@
763 763 <groupId>org.hsqldb</groupId>
764 764 <artifactId>hsqldb</artifactId>
765 765 <version>${hsqldb.version}</version>
766   - <scope>test</scope>
767 766 </dependency>
768 767 <dependency>
769 768 <groupId>ru.yandex.qatools.embed</groupId>
... ...