[6/6] incubator-ranger git commit: Merge branch 'master' into tag-policy

[madhan]

Merge branch 'master' into tag-policy


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

Branch: refs/heads/tag-policy
Commit: f360a3ba30dc56c958cb1162566f82a72205ae82
Parents: f7ec821 0512610
Author: Madhan Neethiraj <mad...@apache.org>
Authored: Mon Jun 8 01:14:27 2015 -0700
Committer: Madhan Neethiraj <mad...@apache.org>
Committed: Mon Jun 8 01:14:27 2015 -0700

----------------------------------------------------------------------
 .../apache/ranger/audit/provider/MiscUtil.java  |   1 -
 .../ranger/audit/queue/AuditAsyncQueue.java     |   2 +-
 .../ranger/audit/queue/AuditBatchQueue.java     |   2 +-
 .../ranger/audit/queue/AuditFileSpool.java      |  22 +-
 .../ranger/audit/queue/AuditSummaryQueue.java   |   2 +-
 .../hadoop/crypto/key/RangerKeyStore.java       | 235 ++++------------
 .../crypto/key/RangerKeyStoreProvider.java      |   4 +-
 .../kafka/authorizer/RangerKafkaAuthorizer.java |   6 +
 .../org/apache/ranger/biz/RangerBizUtil.java    |  50 ++--
 .../org/apache/ranger/biz/ServiceDBStore.java   |   1 +
 .../org/apache/ranger/common/AppConstants.java  |   8 +
 .../org/apache/ranger/common/ServiceUtil.java   |   2 +-
 .../org/apache/ranger/common/db/BaseDao.java    |  21 ++
 .../java/org/apache/ranger/db/XXPolicyDao.java  |  10 +
 .../java/org/apache/ranger/db/XXServiceDao.java |  13 +-
 .../org/apache/ranger/db/XXServiceDefDao.java   |  21 ++
 .../ranger/patch/PatchMigration_J10002.java     | 268 +++++++++++--------
 .../resources/META-INF/jpa_named_queries.xml    |   4 +
 18 files changed, 334 insertions(+), 338 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f360a3ba/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f360a3ba/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
----------------------------------------------------------------------
diff --cc security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
index 5a38aaa,0a0e44a..adc13c6
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
@@@ -69,16 -71,13 +71,25 @@@ public class XXServiceDao extends BaseD
                }
        }
  
 +      public List<XXService> findByTagServiceId(Long tagServiceId) {
 +              if (tagServiceId == null) {
 +                      return new ArrayList<XXService>();
 +              }
 +              try {
 +                      return 
getEntityManager().createNamedQuery("XXService.findByTagServiceId", tClass)
 +                                      .setParameter("tagServiceId", 
tagServiceId).getResultList();
 +              } catch (NoResultException e) {
 +                      return new ArrayList<XXService>();
 +              }
 +      }
 +
- }
+       public void updateSequence() {
+               Long maxId = getMaxIdOfXXService();
+ 
+               if(maxId == null) {
+                       return;
+               }
+ 
+               updateSequence("X_SERVICE_SEQ", maxId + 1);
+       }
 -}
++}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f360a3ba/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
----------------------------------------------------------------------