ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/2] ignite git commit: Merge branch 'ignite-1.6'
Date Fri, 13 May 2016 12:14:29 GMT
Merge branch 'ignite-1.6'


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc9b8214
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc9b8214
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc9b8214

Branch: refs/heads/master
Commit: bc9b821495a2b5512d4f170c9df8042b6f1f8855
Parents: cc9d6a5 fd0714e
Author: ashutak <ashutak@gridgain.com>
Authored: Fri May 13 15:14:07 2016 +0300
Committer: ashutak <ashutak@gridgain.com>
Committed: Fri May 13 15:14:07 2016 +0300

----------------------------------------------------------------------
 assembly/dependencies-fabric-lgpl.xml           |   3 +-
 assembly/dependencies-fabric.xml                |   3 +-
 .../configuration/TransactionConfiguration.java |   8 +
 .../websphere/WebSphereLibertyTmFactory.java    |  77 ++++++
 .../cache/jta/websphere/WebSphereTmFactory.java | 244 +++++++++++++++++++
 modules/web/ignite-appserver-test/pom.xml       |  76 ++++++
 .../webapp/META-INF/config/default-config.xml   |  37 +++
 .../src/main/webapp/WEB-INF/web.xml             |  52 ++++
 .../src/main/webapp/index.jsp                   |  36 +++
 modules/web/ignite-weblogic-test/pom.xml        |  76 ------
 .../webapp/META-INF/config/default-config.xml   |  37 ---
 .../src/main/webapp/WEB-INF/web.xml             |  52 ----
 .../src/main/webapp/index.jsp                   |  36 ---
 modules/web/ignite-websphere-test/pom.xml       |  70 ++++++
 .../apache/ignite/webtest/TestJtaTxServlet.java | 106 ++++++++
 .../webapp/META-INF/config/default-config.xml   |  70 ++++++
 .../src/main/webapp/WEB-INF/web.xml             |  62 +++++
 .../src/main/webapp/index.jsp                   |  36 +++
 pom.xml                                         |   3 +-
 19 files changed, 880 insertions(+), 204 deletions(-)
----------------------------------------------------------------------



Mime
View raw message