Merge branch 'master' into stack
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/760e5f74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/760e5f74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/760e5f74 Branch: refs/heads/stack Commit: 760e5f74d5c492664bd8f4f26a5d1f118be7fab5 Parents: 2abad1a 163a6d0 Author: Madhan Neethiraj <[email protected]> Authored: Wed Feb 4 08:52:13 2015 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Wed Feb 4 08:52:13 2015 -0800 ---------------------------------------------------------------------- .../utils/RangerCredentialProviderTest.java | 9 +- .../credentialapi/TestCredentialReader.java | 8 +- .../ranger/credentialapi/Testbuildks.java | 16 +- docs/src/site/site.xml | 1 + embeddedwebserver/.gitignore | 2 + .../.settings/org.eclipse.core.resources.prefs | 4 + .../.settings/org.eclipse.jdt.core.prefs | 5 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../conf/ranger_webserver.properties | 39 +++ embeddedwebserver/pom.xml | 68 ++++++ embeddedwebserver/scripts/ranger-admin | 48 ++++ .../scripts/ranger-admin-services.sh | 79 ++++++ .../ranger/server/tomcat/EmbeddedServer.java | 240 +++++++++++++++++++ .../server/tomcat/StopEmbeddedServer.java | 62 +++++ embededwebserver/.gitignore | 2 - .../.settings/org.eclipse.core.resources.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../conf/ranger_webserver.properties | 39 --- embededwebserver/pom.xml | 68 ------ embededwebserver/scripts/ranger-admin | 45 ---- embededwebserver/scripts/start-ranger-admin.sh | 49 ---- embededwebserver/scripts/stop-ranger-admin.sh | 48 ---- .../ranger/server/tomcat/EmbededServer.java | 240 ------------------- .../ranger/server/tomcat/StopEmbededServer.java | 62 ----- pom.xml | 5 +- ranger-util/.gitignore | 1 + ranger-util/pom.xml | 135 +++++++++++ .../org/apache/ranger/common/package-info.java | 26 ++ .../ranger/common/RangerVersionAnnotation.java | 83 +++++++ .../apache/ranger/common/RangerVersionInfo.java | 135 +++++++++++ ranger-util/src/scripts/saveVersion.sh | 109 +++++++++ security-admin/pom.xml | 5 + security-admin/scripts/setup.sh | 5 +- src/main/assembly/admin-web.xml | 8 +- src/main/assembly/usersync.xml | 1 + ugsync/pom.xml | 12 +- .../config/UserGroupSyncConfig.java | 3 - .../conf.dist/unixauthservice.properties | 66 +++++ unixauthservice/scripts/initd | 16 +- unixauthservice/scripts/install.properties | 64 +++++ .../scripts/ranger-usersync-services.sh | 111 +++++++++ unixauthservice/scripts/setup.sh | 38 ++- unixauthservice/scripts/start.sh | 61 ----- unixauthservice/scripts/stop.sh | 46 ---- 45 files changed, 1374 insertions(+), 707 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/760e5f74/embeddedwebserver/.settings/org.eclipse.jdt.core.prefs ---------------------------------------------------------------------- diff --cc embeddedwebserver/.settings/org.eclipse.jdt.core.prefs index 0000000,60105c1..ec4300d mode 000000,100644..100644 --- a/embeddedwebserver/.settings/org.eclipse.jdt.core.prefs +++ b/embeddedwebserver/.settings/org.eclipse.jdt.core.prefs @@@ -1,0 -1,5 +1,5 @@@ + eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 ++org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 ++org.eclipse.jdt.core.compiler.compliance=1.7 + org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 ++org.eclipse.jdt.core.compiler.source=1.7 http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/760e5f74/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/760e5f74/security-admin/pom.xml ----------------------------------------------------------------------
