usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [16/37] incubator-usergrid git commit: Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer
Date Tue, 03 Mar 2015 20:00:55 GMT
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-273-indexbuffer


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3f637da7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3f637da7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3f637da7

Branch: refs/heads/USERGRID-422
Commit: 3f637da722bce89aa8ca1c885923f2f1e146f99b
Parents: 5c3a3c5 b82999e
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Tue Feb 24 08:58:09 2015 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Tue Feb 24 08:58:09 2015 -0700

----------------------------------------------------------------------
 .../corepersistence/CpEntityManagerFactory.java |    1 -
 .../cassandra/EntityManagerFactoryImpl.java     |    5 -
 .../batch/job/AbstractSchedulerRuntimeIT.java   |    3 +-
 stack/corepersistence/pom.xml                   |    4 +-
 stack/pom.xml                                   |    6 +-
 stack/rest/README.md                            |   13 +-
 stack/rest/catalina_base/conf/server.xml        |  144 +
 stack/rest/catalina_base/conf/tomcat-users.xml  |   36 +
 stack/rest/catalina_base/conf/web.xml           | 4614 ++++++++++++++++++
 .../lib/usergrid-deployment.properties          |  113 +
 .../webapps/host-manager/META-INF/context.xml   |   27 +
 .../webapps/host-manager/WEB-INF/jsp/401.jsp    |   70 +
 .../webapps/host-manager/WEB-INF/jsp/403.jsp    |   84 +
 .../webapps/host-manager/WEB-INF/jsp/404.jsp    |   61 +
 .../webapps/host-manager/WEB-INF/web.xml        |  144 +
 .../webapps/host-manager/images/add.gif         |  Bin 0 -> 1037 bytes
 .../webapps/host-manager/images/asf-logo.gif    |  Bin 0 -> 7279 bytes
 .../webapps/host-manager/images/code.gif        |  Bin 0 -> 394 bytes
 .../webapps/host-manager/images/design.gif      |  Bin 0 -> 608 bytes
 .../webapps/host-manager/images/docs.gif        |  Bin 0 -> 261 bytes
 .../webapps/host-manager/images/fix.gif         |  Bin 0 -> 345 bytes
 .../webapps/host-manager/images/tomcat.gif      |  Bin 0 -> 1934 bytes
 .../webapps/host-manager/images/update.gif      |  Bin 0 -> 627 bytes
 .../webapps/host-manager/images/void.gif        |  Bin 0 -> 43 bytes
 .../webapps/host-manager/index.jsp              |   18 +
 .../webapps/host-manager/manager.xml            |   26 +
 .../webapps/manager/META-INF/context.xml        |   27 +
 .../webapps/manager/WEB-INF/jsp/401.jsp         |   79 +
 .../webapps/manager/WEB-INF/jsp/403.jsp         |   94 +
 .../webapps/manager/WEB-INF/jsp/404.jsp         |   62 +
 .../manager/WEB-INF/jsp/sessionDetail.jsp       |  197 +
 .../manager/WEB-INF/jsp/sessionsList.jsp        |  172 +
 .../webapps/manager/WEB-INF/web.xml             |  209 +
 .../webapps/manager/images/add.gif              |  Bin 0 -> 1037 bytes
 .../webapps/manager/images/asf-logo.gif         |  Bin 0 -> 7279 bytes
 .../webapps/manager/images/code.gif             |  Bin 0 -> 394 bytes
 .../webapps/manager/images/design.gif           |  Bin 0 -> 608 bytes
 .../webapps/manager/images/docs.gif             |  Bin 0 -> 261 bytes
 .../webapps/manager/images/fix.gif              |  Bin 0 -> 345 bytes
 .../webapps/manager/images/tomcat.gif           |  Bin 0 -> 2066 bytes
 .../webapps/manager/images/update.gif           |  Bin 0 -> 627 bytes
 .../webapps/manager/images/void.gif             |  Bin 0 -> 43 bytes
 .../catalina_base/webapps/manager/index.jsp     |   18 +
 .../catalina_base/webapps/manager/status.xsd    |   84 +
 .../catalina_base/webapps/manager/xform.xsl     |  125 +
 stack/rest/catalina_base/webapps/portal         |    1 +
 .../manager/org/apache/jsp/index_jsp.java       |   83 +
 stack/rest/pom.xml                              |   35 +-
 .../usergrid/rest/JobServiceBoostrap.java       |    3 +-
 .../apache/usergrid/rest/AbstractRestIT.java    |   18 +-
 .../rest/management/ImportResourceIT.java       |    3 +-
 stack/rest/src/test/resources/arquillian.xml    |   10 +-
 .../resources/usergrid-custom-test.properties   |    8 +-
 .../management/export/ExportServiceIT.java      |    3 +-
 .../management/importer/ImportCollectionIT.java |    3 +-
 .../management/importer/ImportServiceIT.java    |    3 +-
 56 files changed, 6532 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f637da7/stack/corepersistence/pom.xml
----------------------------------------------------------------------


Mime
View raw message