Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add changes for H2 upgrade #651

Open
wants to merge 1 commit into
base: 4.5.x
Choose a base branch
from
Open

Add changes for H2 upgrade #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/attachment-mgt/org.wso2.carbon.attachment.mgt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<path refid="maven.test.classpath" />
</path>
<echo message="########### Create Test Database ##############" />
<sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="wso2carbon" url="jdbc:h2:${basedir}/target/repository/database/attachmentdb;create=true" userid="wso2carbon">
<sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="wso2carbon" url="jdbc:h2:${basedir}/target/repository/database/attachmentdb" userid="wso2carbon">
<classpath>
<path refid="h2.classpath" />
</classpath>
Expand Down
2 changes: 1 addition & 1 deletion components/bpel/org.wso2.carbon.bpel.b4p/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
</path>

<echo message="########### Create B4P Coordination Database ##############" />
<sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="" url="jdbc:h2:${basedir}/target/database/b4ph2db;create=true" userid="sa">
<sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="" url="jdbc:h2:${basedir}/target/database/b4ph2db" userid="sa">
<classpath>
<path refid="h2.classpath" />
</classpath>
Expand Down
2 changes: 1 addition & 1 deletion components/humantask/org.wso2.carbon.humantask/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
</path>

<echo message="########### Create HT Database ##############" />
<sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="" url="jdbc:h2:${basedir}/target/database/hth2db;create=true" userid="sa">
<sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="" url="jdbc:h2:${basedir}/target/database/hth2db" userid="sa">
<classpath>
<path refid="h2.classpath" />
</classpath>
Expand Down
2 changes: 1 addition & 1 deletion features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

<echo message="########### Create Attachment Mgt Database ##############" />

<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<classpath>
<path refid="h2.classpath" />
</classpath>
Expand Down
2 changes: 1 addition & 1 deletion ...ment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/bps-datasources.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:file:./repository/database/jpadb;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE</url>
<url>jdbc:h2:file:./repository/database/jpadb;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
Expand Down
2 changes: 1 addition & 1 deletion ...t-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/datasources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ synapse.datasources.providerPort=2199
synapse.datasources.bpsds.registry=JNDI
synapse.datasources.bpsds.type=BasicDataSource
synapse.datasources.bpsds.driverClassName=org.h2.Driver
synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb;MVCC=TRUE
synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb
synapse.datasources.bpsds.username=wso2carbon
synapse.datasources.bpsds.password=wso2carbon
synapse.datasources.bpsds.validationQuery=SELECT 1
Expand Down
2 changes: 1 addition & 1 deletion features/bpel/org.wso2.carbon.bpel.server.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

<echo message="########### Create BPEL Database ##############" />

<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<classpath>
<path refid="h2.classpath" />
</classpath>
Expand Down
2 changes: 1 addition & 1 deletion features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/bps-datasources.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:file:./repository/database/jpadb;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE</url>
<url>jdbc:h2:file:./repository/database/jpadb;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
Expand Down
2 changes: 1 addition & 1 deletion features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/datasources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ synapse.datasources.providerPort=2199
synapse.datasources.bpsds.registry=JNDI
synapse.datasources.bpsds.type=BasicDataSource
synapse.datasources.bpsds.driverClassName=org.h2.Driver
synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb;MVCC=TRUE
synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb
synapse.datasources.bpsds.username=wso2carbon
synapse.datasources.bpsds.password=wso2carbon
synapse.datasources.bpsds.validationQuery=SELECT 1
Expand Down
2 changes: 1 addition & 1 deletion features/bpmn/org.wso2.carbon.bpmn.server.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

<echo message="########### Create Activiti Database ##############" />

<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/activiti;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/activiti" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<classpath>
<path refid="h2.classpath" />
</classpath>
Expand Down
2 changes: 1 addition & 1 deletion features/humantask/org.wso2.carbon.humantask.server.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

<echo message="########### Create HumanTask Database ##############" />

<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
<classpath>
<path refid="h2.classpath" />
</classpath>
Expand Down
2 changes: 1 addition & 1 deletion .../humantask/org.wso2.carbon.humantask.server.feature/resources/conf/datasources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ synapse.datasources.providerPort=2199
synapse.datasources.bpsds.registry=JNDI
synapse.datasources.bpsds.type=BasicDataSource
synapse.datasources.bpsds.driverClassName=org.h2.Driver
synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb;MVCC=TRUE
synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb
synapse.datasources.bpsds.username=wso2carbon
synapse.datasources.bpsds.password=wso2carbon
synapse.datasources.bpsds.validationQuery=SELECT 1
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,7 +1522,7 @@
<geronimo-spec-javamail>1.3.0.rc51-wso2v1</geronimo-spec-javamail>
<geronimo-spec-jms>1.1.0.rc4-wso2v1</geronimo-spec-jms>
<orbit.version.infinispan>5.1.2.wso2v1</orbit.version.infinispan>
<orbit.version.h2.engine>1.4.199.wso2v1</orbit.version.h2.engine>
<orbit.version.h2.engine>2.1.210.wso2v1</orbit.version.h2.engine>
<orbit.version.spring>3.2.9.wso2v2</orbit.version.spring>
<orbit.version.woden>1.0.0.M9-wso2v1</orbit.version.woden>
<axion.wso2>1.0.0.M3-dev-wso2v1</axion.wso2>
Expand Down