-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
Showing
5 changed files
with
121 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --- server.xml | ||
| +++ server.xml | ||
| @@ -59,31 +59,31 @@ | ||
| <Resource name="exo-idm_portal" auth="Container" type="javax.sql.DataSource" | ||
| factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" | ||
| initialSize="5" maxActive="20" minIdle="5" maxIdle="15" maxWait="10000" | ||
| - validationQuery="SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS" validationQueryTimeout="5" | ||
| + validationQuery="SELECT 1" validationQueryTimeout="5" | ||
| testWhileIdle="true" testOnBorrow="true" testOnReturn="false" | ||
| timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000" | ||
| removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false" | ||
| - username="sa" password="" driverClassName="org.hsqldb.jdbcDriver" url="jdbc:hsqldb:file:${exo.data.dir}/hsql/exo-plf;shutdown=true;hsqldb.write_delay=false;hsqldb.tx=mvcc;" /> | ||
| + username="@DB_IDM_USR@" password="@DB_IDM_PWD@" driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://@DB_IDM_HOST@:@DB_IDM_PORT@/@DB_IDM_NAME@?autoReconnect=true&characterEncoding=utf8&useSSL=false" /> | ||
|
|
||
| <!-- eXo JCR Datasource for portal --> | ||
| <Resource name="exo-jcr_portal" auth="Container" type="javax.sql.DataSource" | ||
| factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" | ||
| initialSize="5" maxActive="20" minIdle="5" maxIdle="15" maxWait="10000" | ||
| - validationQuery="SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS" validationQueryTimeout="5" | ||
| + validationQuery="SELECT 1" validationQueryTimeout="5" | ||
| testWhileIdle="true" testOnBorrow="true" testOnReturn="false" | ||
| timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000" | ||
| removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false" | ||
| - username="sa" password="" driverClassName="org.hsqldb.jdbcDriver" url="jdbc:hsqldb:file:${exo.data.dir}/hsql/exo-plf;shutdown=true;hsqldb.write_delay=false;hsqldb.tx=mvcc;" /> | ||
| + username="@DB_JCR_USR@" password="@DB_JCR_PWD@" driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://@DB_JCR_HOST@:@DB_JCR_PORT@/@DB_JCR_NAME@?autoReconnect=true&useSSL=false" /> | ||
|
|
||
| <!-- eXo JPA Datasource for portal --> | ||
| <Resource name="exo-jpa_portal" auth="Container" type="javax.sql.DataSource" | ||
| factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" | ||
| initialSize="5" maxActive="20" minIdle="5" maxIdle="15" maxWait="10000" | ||
| - validationQuery="SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS" validationQueryTimeout="5" | ||
| + validationQuery="SELECT 1" validationQueryTimeout="5" | ||
| testWhileIdle="true" testOnBorrow="true" testOnReturn="false" | ||
| timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000" | ||
| removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false" | ||
| - username="sa" password="" driverClassName="org.hsqldb.jdbcDriver" url="jdbc:hsqldb:file:${exo.data.dir}/hsql/exo-plf;shutdown=true;hsqldb.write_delay=false;hsqldb.tx=mvcc;" /> | ||
| + username="@DB_JPA_USR@" password="@DB_JPA_PWD@" driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://@DB_JPA_HOST@:@DB_JPA_PORT@/@DB_JPA_NAME@?autoReconnect=true&characterEncoding=utf8&useSSL=false" /> | ||
|
|
||
| </GlobalNamingResources> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- server.xml | ||
| +++ server.xml | ||
| @@ -23,7 +23,7 @@ | ||
| define subcomponents such as "Valves" at this level. | ||
| Documentation at /docs/config/server.html | ||
| --> | ||
| -<Server port="8005" shutdown="SHUTDOWN"> | ||
| +<Server port="@SHUTDOWN_PORT@" shutdown="SHUTDOWN"> | ||
| <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> | ||
| <!-- Security listener. Documentation at /docs/config/listeners.html | ||
| <Listener className="org.apache.catalina.security.SecurityListener" /> | ||
| @@ -107,7 +107,7 @@ | ||
| APR (HTTP/AJP) Connector: /docs/apr.html | ||
| Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 | ||
| --> | ||
| - <Connector address="0.0.0.0" port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol" | ||
| + <Connector address="0.0.0.0" port="@HTTP_PORT@" protocol="org.apache.coyote.http11.Http11NioProtocol" | ||
| enableLookups="false" redirectPort="8443" bindOnInit="false" | ||
| connectionTimeout="20000" disableUploadTimeout="true" | ||
| URIEncoding="UTF-8" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| --- server.xml | ||
| +++ server.xml | ||
| @@ -59,31 +59,31 @@ | ||
| <Resource name="exo-idm_portal" auth="Container" type="javax.sql.DataSource" | ||
| factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" | ||
| initialSize="5" maxActive="20" minIdle="5" maxIdle="15" maxWait="10000" | ||
| - validationQuery="SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS" validationQueryTimeout="5" | ||
| + validationQuery="SELECT 1" validationQueryTimeout="5" | ||
| testWhileIdle="true" testOnBorrow="true" testOnReturn="false" | ||
| timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000" | ||
| removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false" | ||
| - username="sa" password="" driverClassName="org.hsqldb.jdbcDriver" url="jdbc:hsqldb:file:${exo.data.dir}/hsql/exo-plf;shutdown=true;hsqldb.write_delay=false;hsqldb.tx=mvcc;" /> | ||
| + username="@DB_IDM_USR@" password="@DB_IDM_PWD@" driverClassName="org.postgresql.Driver" url="jdbc:postgresql://@DB_IDM_HOST@:@DB_IDM_PORT@/@DB_IDM_NAME@" /> | ||
|
|
||
| <!-- eXo JCR Datasource for portal --> | ||
| <Resource name="exo-jcr_portal" auth="Container" type="javax.sql.DataSource" | ||
| factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" | ||
| initialSize="5" maxActive="20" minIdle="5" maxIdle="15" maxWait="10000" | ||
| - validationQuery="SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS" validationQueryTimeout="5" | ||
| + validationQuery="SELECT 1" validationQueryTimeout="5" | ||
| testWhileIdle="true" testOnBorrow="true" testOnReturn="false" | ||
| timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000" | ||
| removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false" | ||
| - username="sa" password="" driverClassName="org.hsqldb.jdbcDriver" url="jdbc:hsqldb:file:${exo.data.dir}/hsql/exo-plf;shutdown=true;hsqldb.write_delay=false;hsqldb.tx=mvcc;" /> | ||
| + username="@DB_JCR_USR@" password="@DB_JCR_PWD@" driverClassName="org.postgresql.Driver" url="jdbc:postgresql://@DB_JCR_HOST@:@DB_JCR_PORT@/@DB_JCR_NAME@" /> | ||
|
|
||
| <!-- eXo JPA Datasource for portal --> | ||
| <Resource name="exo-jpa_portal" auth="Container" type="javax.sql.DataSource" | ||
| factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" | ||
| initialSize="5" maxActive="20" minIdle="5" maxIdle="15" maxWait="10000" | ||
| - validationQuery="SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS" validationQueryTimeout="5" | ||
| + validationQuery="SELECT 1" validationQueryTimeout="5" | ||
| testWhileIdle="true" testOnBorrow="true" testOnReturn="false" | ||
| timeBetweenEvictionRunsMillis="30000" minEvictableIdleTimeMillis="60000" | ||
| removeAbandonedOnBorrow="true" removeAbandonedOnMaintenance="true" removeAbandonedTimeout="300" logAbandoned="false" | ||
| - username="sa" password="" driverClassName="org.hsqldb.jdbcDriver" url="jdbc:hsqldb:file:${exo.data.dir}/hsql/exo-plf;shutdown=true;hsqldb.write_delay=false;hsqldb.tx=mvcc;" /> | ||
| + username="@DB_JPA_USR@" password="@DB_JPA_PWD@" driverClassName="org.postgresql.Driver" url="jdbc:postgresql://@DB_JPA_HOST@:@DB_JPA_PORT@/@DB_JPA_NAME@" /> | ||
|
|
||
| </GlobalNamingResources> | ||
|
|
||
|
|