Skip to content

Commit

Permalink
Merge branch 'chathurace-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
waruna committed May 8, 2015
2 parents b6332aa + ceac147 commit a25c833
Show file tree
Hide file tree
Showing 25 changed files with 92 additions and 30 deletions.
19 changes: 17 additions & 2 deletions components/bpmn/org.wso2.carbon.bpmn.rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

<dependencies>
<dependency>
<groupId>org.activiti.wso2</groupId>
<artifactId>activiti-rest</artifactId>
<groupId>org.wso2.orbit.org.activiti</groupId>
<artifactId>activiti-all</artifactId>
</dependency>

<dependency>
Expand All @@ -51,6 +51,21 @@
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
</dependency>

<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
</dependency>

<dependency>
<groupId>org.wso2.orbit.org.restlet.jee</groupId>
<artifactId>restlet</artifactId>
</dependency>

<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
8 changes: 6 additions & 2 deletions components/bpmn/org.wso2.carbon.bpmn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

<dependencies>
<dependency>
<groupId>org.activiti.wso2</groupId>
<artifactId>activiti-engine</artifactId>
<groupId>org.wso2.orbit.org.activiti</groupId>
<artifactId>activiti-all</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -65,6 +65,10 @@
<artifactId>org.wso2.carbon.tenant.mgt</artifactId>
</dependency>

<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</dependency>

</dependencies>

Expand Down
24 changes: 22 additions & 2 deletions features/bpmn/org.wso2.carbon.bpmn.server.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,28 @@
</bundleDef>
</bundles>
<importBundles>
<importBundleDef>org.activiti.wso2:activiti-engine</importBundleDef>
<importBundleDef>org.activiti.wso2:activiti-rest</importBundleDef>
<importBundleDef>org.wso2.orbit.org.activiti:activiti-all:5.16.3.wso2v2</importBundleDef>

<importBundleDef>org.apache.commons:commons-lang3:3.3.2</importBundleDef>
<importBundleDef>com.fasterxml.jackson.core:jackson-core:2.2.3</importBundleDef>
<importBundleDef>org.wso2.orbit.com.fasterxml.jackson.core:jackson-databind:2.2.3.wso2v1</importBundleDef>
<importBundleDef>com.fasterxml.jackson.core:jackson-annotations:2.2.3</importBundleDef>
<importBundleDef>joda-time:joda-time:2.1</importBundleDef>
<importBundleDef>org.apache.commons:commons-email:1.2</importBundleDef>
<!-- importBundleDef>org.wso2.orbit.javax.mail:mail:1.4.1.wso2v1</importBundleDef -->
<importBundleDef>org.mybatis:mybatis:3.2.5</importBundleDef>
<!-- importBundleDef>commons-logging:commons-logging:1.1.3</importBundleDef -->

<importBundleDef>org.wso2.orbit.org.restlet.jee:restlet:2.2.1.wso2v1</importBundleDef>
<importBundleDef>org.wso2.orbit.com.fasterxml.jackson.dataformat:jackson-dataformat:2.2.3.wso2v1</importBundleDef>
<importBundleDef>org.wso2.orbit.com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.2.3.wso2v1</importBundleDef>
<importBundleDef>org.codehaus.woodstox:woodstox-core-asl:4.2.0</importBundleDef>
<importBundleDef>org.yaml:snakeyaml:1.13</importBundleDef>
<importBundleDef>org.wso2.orbit.org.tinyjee.jgraphx:jgraphx:1.10.4.1.wso2v1</importBundleDef>
<importBundleDef>commons-io:commons-io:2.0.1</importBundleDef>
<importBundleDef>commons-fileupload:commons-fileupload:1.2.2</importBundleDef>
<importBundleDef>org.codehaus.woodstox:stax2-api:3.1.1</importBundleDef>

</importBundles>


Expand Down
4 changes: 2 additions & 2 deletions ...wso2.carbon.bpmn.server.feature/resources/dbscripts/create/activiti.db2.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);

insert into ACT_GE_PROPERTY
values ('schema.version', '5.16', 1);
values ('schema.version', '5.16.3.0', 1);

insert into ACT_GE_PROPERTY
values ('schema.history', 'create(5.16)', 1);
values ('schema.history', 'create(5.16.3.0)', 1);

insert into ACT_GE_PROPERTY
values ('next.dbid', '1', 1);
Expand Down
4 changes: 2 additions & 2 deletions ....wso2.carbon.bpmn.server.feature/resources/dbscripts/create/activiti.h2.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);

insert into ACT_GE_PROPERTY
values ('schema.version', '5.16', 1);
values ('schema.version', '5.16.3.0', 1);

insert into ACT_GE_PROPERTY
values ('schema.history', 'create(5.16)', 1);
values ('schema.history', 'create(5.16.3.0)', 1);

insert into ACT_GE_PROPERTY
values ('next.dbid', '1', 1);
Expand Down
4 changes: 2 additions & 2 deletions ...o2.carbon.bpmn.server.feature/resources/dbscripts/create/activiti.mssql.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);

insert into ACT_GE_PROPERTY
values ('schema.version', '5.16', 1);
values ('schema.version', '5.16.3.0', 1);

insert into ACT_GE_PROPERTY
values ('schema.history', 'create(5.16)', 1);
values ('schema.history', 'create(5.16.3.0)', 1);

insert into ACT_GE_PROPERTY
values ('next.dbid', '1', 1);
Expand Down
4 changes: 2 additions & 2 deletions ...o2.carbon.bpmn.server.feature/resources/dbscripts/create/activiti.mysql.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;

insert into ACT_GE_PROPERTY
values ('schema.version', '5.16', 1);
values ('schema.version', '5.16.3.0', 1);

insert into ACT_GE_PROPERTY
values ('schema.history', 'create(5.16)', 1);
values ('schema.history', 'create(5.16.3.0)', 1);

insert into ACT_GE_PROPERTY
values ('next.dbid', '1', 1);
Expand Down
4 changes: 2 additions & 2 deletions ....carbon.bpmn.server.feature/resources/dbscripts/create/activiti.mysql55.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;

insert into ACT_GE_PROPERTY
values ('schema.version', '5.16', 1);
values ('schema.version', '5.16.3.0', 1);

insert into ACT_GE_PROPERTY
values ('schema.history', 'create(5.16)', 1);
values ('schema.history', 'create(5.16.3.0)', 1);

insert into ACT_GE_PROPERTY
values ('next.dbid', '1', 1);
Expand Down
4 changes: 2 additions & 2 deletions ...2.carbon.bpmn.server.feature/resources/dbscripts/create/activiti.oracle.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);

insert into ACT_GE_PROPERTY
values ('schema.version', '5.16', 1);
values ('schema.version', '5.16.3.0', 1);

insert into ACT_GE_PROPERTY
values ('schema.history', 'create(5.16)', 1);
values ('schema.history', 'create(5.16.3.0)', 1);

insert into ACT_GE_PROPERTY
values ('next.dbid', '1', 1);
Expand Down
4 changes: 2 additions & 2 deletions ...carbon.bpmn.server.feature/resources/dbscripts/create/activiti.postgres.create.engine.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);

insert into ACT_GE_PROPERTY
values ('schema.version', '5.16', 1);
values ('schema.version', '5.16.3.0', 1);

insert into ACT_GE_PROPERTY
values ('schema.history', 'create(5.16)', 1);
values ('schema.history', 'create(5.16.3.0)', 1);

insert into ACT_GE_PROPERTY
values ('next.dbid', '1', 1);
Expand Down
1 change: 1 addition & 0 deletions ...erver.feature/resources/dbscripts/upgrade/activiti.db2.upgradestep.516.to.5161.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...rver.feature/resources/dbscripts/upgrade/activiti.db2.upgradestep.5161.to.5162.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.2' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...server.feature/resources/dbscripts/upgrade/activiti.h2.upgradestep.516.to.5161.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...erver.feature/resources/dbscripts/upgrade/activiti.h2.upgradestep.5161.to.5162.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.2' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...ver.feature/resources/dbscripts/upgrade/activiti.mssql.upgradestep.516.to.5161.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...er.feature/resources/dbscripts/upgrade/activiti.mssql.upgradestep.5161.to.5162.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.2' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...ver.feature/resources/dbscripts/upgrade/activiti.mysql.upgradestep.516.to.5161.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...er.feature/resources/dbscripts/upgrade/activiti.mysql.upgradestep.5161.to.5162.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...r.feature/resources/dbscripts/upgrade/activiti.mysql55.upgradestep.516.to.5161.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ....feature/resources/dbscripts/upgrade/activiti.mysql55.upgradestep.5161.to.5162.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.2' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...er.feature/resources/dbscripts/upgrade/activiti.oracle.upgradestep.516.to.5161.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...r.feature/resources/dbscripts/upgrade/activiti.oracle.upgradestep.5161.to.5162.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.2' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ....feature/resources/dbscripts/upgrade/activiti.postgres.upgradestep.516.to.5161.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version';
1 change: 1 addition & 0 deletions ...feature/resources/dbscripts/upgrade/activiti.postgres.upgradestep.5161.to.5162.engine.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update ACT_GE_PROPERTY set VALUE_ = '5.16.2' where NAME_ = 'schema.version';
29 changes: 19 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,11 @@
<artifactId>org.wso2.carbon.application.mgt.bpel</artifactId>
<version>${carbon.business-process.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.orbit.org.restlet.jee</groupId>
<artifactId>restlet</artifactId>
<version>${orbit.version.restlet}</version>
</dependency>
<dependency>
<groupId>com.h2database.wso2</groupId>
<artifactId>h2-database-engine</artifactId>
Expand Down Expand Up @@ -986,13 +991,8 @@
</dependency>

<dependency>
<groupId>org.activiti.wso2</groupId>
<artifactId>activiti-engine</artifactId>
<version>${org.activiti.wso2.version}</version>
</dependency>
<dependency>
<groupId>org.activiti.wso2</groupId>
<artifactId>activiti-rest</artifactId>
<groupId>org.wso2.orbit.org.activiti</groupId>
<artifactId>activiti-all</artifactId>
<version>${org.activiti.wso2.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -1032,6 +1032,12 @@
<version>${com.predic8.soa-model-core.wso2.version}</version>
</dependency>

<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
</dependency>

<dependency>
<groupId>org.wso2.orbit.asm4</groupId>
<artifactId>asm4-all</artifactId>
Expand Down Expand Up @@ -1542,7 +1548,9 @@
<!--geronimo-ejb_2.1_spec.version>1.1.0.wso2v1</geronimo-ejb_2.1_spec.version-->
<derby.wso2.version>10.3.2.1wso2v1</derby.wso2.version>
<version.javax.servlet>3.0.0.v201112011016</version.javax.servlet>
<orbit.version.restlet>2.2.1.wso2v1</orbit.version.restlet>
<orbit.ode.version>1.3.5-wso2v13</orbit.ode.version>
<mybatis.version>3.2.5</mybatis.version>


<!-- Servlet API -->
Expand Down Expand Up @@ -1570,9 +1578,10 @@

<!-- Activiti Version -->

<org.activiti.wso2.version>5.16-wso2v1</org.activiti.wso2.version>
<org.activiti.version>5.16</org.activiti.version>
<!--restlet.version>2.2.1</restlet.version-->
<org.activiti.wso2.version>5.16.3.wso2v2</org.activiti.wso2.version>
<restlet.version>2.2.1.wso2v1</restlet.version>

<project.scm.id>wso2-scm-server</project.scm.id>

<!-- For HT Rendering -->
<com.predic8.soa-model-core.wso2.version>1.5.0.wso2v3</com.predic8.soa-model-core.wso2.version>
Expand Down

0 comments on commit a25c833

Please sign in to comment.