ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject [33/67] [abbrv] ambari git commit: AMBARI-20528. Rename Log Search Portal module to Log Search Server (oleewere)
Date Wed, 29 Mar 2017 13:57:41 GMT
AMBARI-20528. Rename Log Search Portal module to Log Search Server (oleewere)


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

Branch: refs/heads/branch-dev-logsearch
Commit: b0f1e3408810349f8cc8ec524d0ae9e0700c4a6d
Parents: 51e6a82
Author: oleewere <oleewere@gmail.com>
Authored: Wed Mar 22 13:45:12 2017 +0100
Committer: oleewere <oleewere@gmail.com>
Committed: Mon Mar 27 21:12:55 2017 +0200

----------------------------------------------------------------------
 .../ambari-logsearch-assembly/pom.xml           |   16 +-
 .../ambari-logsearch-portal/.gitignore          |    9 -
 .../ambari-logsearch-portal/README.md           |   55 -
 .../ambari-logsearch-portal/build.properties    |   23 -
 .../ambari-logsearch-portal/build.xml           |   59 -
 .../ambari-logsearch-portal/pom.xml             |  745 -------
 ambari-logsearch/ambari-logsearch-portal/run.sh |   24 -
 .../configsets/audit_logs/conf/admin-extra.html |   24 -
 .../conf/admin-extra.menu-bottom.html           |   25 -
 .../audit_logs/conf/admin-extra.menu-top.html   |   25 -
 .../main/configsets/audit_logs/conf/elevate.xml |   38 -
 .../configsets/audit_logs/conf/enumsConfig.xml  |   28 -
 .../configsets/audit_logs/conf/managed-schema   |  125 --
 .../configsets/audit_logs/conf/solrconfig.xml   | 1887 ------------------
 .../hadoop_logs/conf/admin-extra.html           |   24 -
 .../conf/admin-extra.menu-bottom.html           |   25 -
 .../hadoop_logs/conf/admin-extra.menu-top.html  |   25 -
 .../configsets/hadoop_logs/conf/elevate.xml     |   38 -
 .../configsets/hadoop_logs/conf/enumsConfig.xml |   28 -
 .../configsets/hadoop_logs/conf/managed-schema  |  120 --
 .../configsets/hadoop_logs/conf/solrconfig.xml  | 1887 ------------------
 .../configsets/history/conf/admin-extra.html    |   24 -
 .../history/conf/admin-extra.menu-bottom.html   |   25 -
 .../history/conf/admin-extra.menu-top.html      |   25 -
 .../main/configsets/history/conf/elevate.xml    |   38 -
 .../main/configsets/history/conf/managed-schema |   98 -
 .../main/configsets/history/conf/solrconfig.xml | 1873 -----------------
 .../src/main/configsets/solr.xml                |   19 -
 .../org/apache/ambari/logsearch/LogSearch.java  |  176 --
 .../logsearch/common/ACLPropertiesSplitter.java |   70 -
 .../logsearch/common/ExternalServerClient.java  |   83 -
 .../common/HadoopServiceConfigHelper.java       |   80 -
 .../logsearch/common/LogSearchConstants.java    |  111 --
 .../logsearch/common/LogSearchContext.java      |   62 -
 .../apache/ambari/logsearch/common/LogType.java |   34 -
 .../logsearch/common/ManageStartEndTime.java    |   55 -
 .../apache/ambari/logsearch/common/Marker.java  |   29 -
 .../ambari/logsearch/common/MessageData.java    |  165 --
 .../ambari/logsearch/common/MessageEnums.java   |   72 -
 .../logsearch/common/PropertiesHelper.java      |  138 --
 .../ambari/logsearch/common/StatusMessage.java  |   40 -
 .../ambari/logsearch/common/VResponse.java      |  164 --
 .../logsearch/common/XMLPropertiesHelper.java   |   79 -
 .../ambari/logsearch/conf/ApiDocConfig.java     |   55 -
 .../logsearch/conf/ApplicationConfig.java       |   58 -
 .../ambari/logsearch/conf/AuthPropsConfig.java  |  159 --
 .../conf/LogSearchHttpHeaderConfig.java         |   70 -
 .../ambari/logsearch/conf/SecurityConfig.java   |  209 --
 .../logsearch/conf/SolrAuditLogPropsConfig.java |  168 --
 .../ambari/logsearch/conf/SolrConfig.java       |   76 -
 .../conf/SolrConnectionPropsConfig.java         |   78 -
 .../logsearch/conf/SolrKerberosConfig.java      |   48 -
 .../ambari/logsearch/conf/SolrPropsConfig.java  |   61 -
 .../conf/SolrServiceLogPropsConfig.java         |   91 -
 .../logsearch/conf/SolrUserPropsConfig.java     |  116 --
 .../conf/global/SolrAuditLogsState.java         |   68 -
 .../conf/global/SolrCollectionState.java        |   33 -
 .../conf/global/SolrServiceLogsState.java       |   59 -
 .../conf/global/SolrUserConfigState.java        |   60 -
 .../configurer/LogfeederFilterConfigurer.java   |   66 -
 .../configurer/SolrAuditAliasConfigurer.java    |  136 --
 .../configurer/SolrCollectionConfigurer.java    |  230 ---
 .../logsearch/configurer/SolrConfigurer.java    |   23 -
 .../AbstractAuditLogRequestQueryConverter.java  |   59 -
 .../converter/AbstractConverterAware.java       |   47 -
 .../AbstractDateRangeFacetQueryConverter.java   |   55 -
 .../AbstractLogRequestFacetQueryConverter.java  |   88 -
 .../AbstractLogRequestQueryConverter.java       |   42 -
 .../AbstractOperationHolderConverter.java       |  180 --
 .../AbstractSearchRequestQueryConverter.java    |   72 -
 ...actServiceLogRequestFacetQueryConverter.java |   44 -
 ...AbstractServiceLogRequestQueryConverter.java |   44 -
 .../AuditBarGraphRequestQueryConverter.java     |   55 -
 .../AuditComponentsRequestQueryConverter.java   |   53 -
 .../AuditLogRequestQueryConverter.java          |   44 -
 .../AuditServiceLoadRequestQueryConverter.java  |   53 -
 .../BaseServiceLogRequestQueryConverter.java    |   85 -
 .../FieldAuditLogRequestQueryConverter.java     |   54 -
 .../HostLogFilesRequestQueryConverter.java      |   61 -
 ...ServiceLogAnyGraphRequestQueryConverter.java |   60 -
 ...eLogComponentLevelRequestQueryConverter.java |   53 -
 ...eLogComponentRequestFacetQueryConverter.java |   55 -
 ...rviceLogLevelCountRequestQueryConverter.java |   68 -
 ...eLogLevelDateRangeRequestQueryConverter.java |   69 -
 ...erviceLogTreeRequestFacetQueryConverter.java |   54 -
 ...erviceLogTruncatedRequestQueryConverter.java |   95 -
 .../StringFieldFacetQueryConverter.java         |   44 -
 .../UserConfigRequestQueryConverter.java        |   67 -
 .../UserExportRequestQueryConverter.java        |   55 -
 .../ambari/logsearch/dao/AuditSolrDao.java      |   94 -
 .../logsearch/dao/ServiceLogsSolrDao.java       |   85 -
 .../ambari/logsearch/dao/SolrDaoBase.java       |  156 --
 .../logsearch/dao/SolrSchemaFieldDao.java       |  213 --
 .../ambari/logsearch/dao/UserConfigSolrDao.java |  196 --
 .../apache/ambari/logsearch/dao/UserDao.java    |  150 --
 .../ambari/logsearch/doc/DocConstants.java      |  125 --
 .../ambari/logsearch/handler/ACLHandler.java    |   97 -
 .../handler/CreateCollectionHandler.java        |  222 ---
 .../handler/ListCollectionHandler.java          |   51 -
 .../handler/ReloadCollectionHandler.java        |   45 -
 .../logsearch/handler/SolrZkRequestHandler.java |   26 -
 .../handler/UploadConfigurationHandler.java     |  151 --
 .../logsearch/manager/AuditLogsManager.java     |  223 ---
 .../logsearch/manager/JsonManagerBase.java      |   69 -
 .../ambari/logsearch/manager/ManagerBase.java   |   95 -
 .../ambari/logsearch/manager/PublicManager.java |   48 -
 .../logsearch/manager/ServiceLogsManager.java   |  617 ------
 .../logsearch/manager/SessionManager.java       |   77 -
 .../logsearch/manager/UserConfigManager.java    |  223 ---
 .../model/common/LogFeederDataMap.java          |   50 -
 .../model/common/LogfeederFilterData.java       |   87 -
 .../model/request/AnyGraphParamDefinition.java  |   44 -
 .../model/request/BundleIdParamDefinition.java  |   32 -
 .../model/request/ClustersParamDefinition.java  |   32 -
 .../request/CommonSearchParamDefinition.java    |   69 -
 .../model/request/DateRangeParamDefinition.java |   38 -
 .../model/request/FieldParamDefinition.java     |   32 -
 .../model/request/FormatParamDefinition.java    |   32 -
 .../request/HostComponentParamDefinition.java   |   38 -
 .../model/request/LastPageParamDefinition.java  |   31 -
 .../model/request/LogParamDefinition.java       |   62 -
 .../request/LogTruncatedParamDefinition.java    |   44 -
 .../logsearch/model/request/SearchRequest.java  |   22 -
 .../request/ServiceLogParamDefinition.java      |   44 -
 .../ServiceLogSearchParamDefinition.java        |   50 -
 .../model/request/TopParamDefinition.java       |   31 -
 .../model/request/UnitParamDefinition.java      |   33 -
 .../request/UserConfigParamDefinition.java      |   38 -
 .../model/request/UtcOffsetParamDefinition.java |   32 -
 .../request/impl/AuditBarGraphRequest.java      |   40 -
 .../request/impl/AuditComponentRequest.java     |   25 -
 .../model/request/impl/AuditLogRequest.java     |   40 -
 .../request/impl/AuditServiceLoadRequest.java   |   25 -
 .../model/request/impl/BaseLogRequest.java      |  132 --
 .../request/impl/BaseServiceLogRequest.java     |  107 -
 .../model/request/impl/CommonSearchRequest.java |  141 --
 .../request/impl/FieldAuditBarGraphRequest.java |   40 -
 .../request/impl/FieldAuditLogRequest.java      |   55 -
 .../model/request/impl/HostLogFilesRequest.java |   71 -
 .../request/impl/ServiceAnyGraphRequest.java    |   81 -
 .../model/request/impl/ServiceGraphRequest.java |   40 -
 .../impl/ServiceLogAggregatedInfoRequest.java   |   25 -
 .../impl/ServiceLogComponentHostRequest.java    |   25 -
 .../impl/ServiceLogComponentLevelRequest.java   |   25 -
 .../request/impl/ServiceLogExportRequest.java   |   54 -
 .../impl/ServiceLogHostComponentRequest.java    |   39 -
 .../impl/ServiceLogLevelCountRequest.java       |   25 -
 .../model/request/impl/ServiceLogRequest.java   |   93 -
 .../impl/ServiceLogTruncatedRequest.java        |   66 -
 .../model/request/impl/UserConfigRequest.java   |   53 -
 .../model/request/impl/UserExportRequest.java   |   40 -
 .../logsearch/model/response/AuditLogData.java  |  149 --
 .../model/response/AuditLogResponse.java        |   48 -
 .../logsearch/model/response/BarGraphData.java  |   53 -
 .../response/BarGraphDataListResponse.java      |   42 -
 .../logsearch/model/response/CommonLogData.java |  118 --
 .../model/response/ComponentTypeLogData.java    |   32 -
 .../logsearch/model/response/CountData.java     |   50 -
 .../model/response/CountDataListResponse.java   |   48 -
 .../logsearch/model/response/GraphData.java     |   64 -
 .../model/response/GraphDataListResponse.java   |   39 -
 .../model/response/GroupListResponse.java       |   48 -
 .../logsearch/model/response/HostLogData.java   |   30 -
 .../model/response/HostLogFilesResponse.java    |   39 -
 .../logsearch/model/response/LogData.java       |   25 -
 .../logsearch/model/response/LogFileData.java   |   48 -
 .../model/response/LogFileDataListResponse.java |   48 -
 .../model/response/LogListResponse.java         |   27 -
 .../model/response/LogSearchResponse.java       |   22 -
 .../logsearch/model/response/NameValueData.java |   62 -
 .../response/NameValueDataListResponse.java     |   49 -
 .../logsearch/model/response/NodeData.java      |  110 -
 .../model/response/NodeListResponse.java        |   50 -
 .../model/response/SearchResponse.java          |  110 -
 .../model/response/ServiceLogData.java          |   63 -
 .../model/response/ServiceLogResponse.java      |   48 -
 .../logsearch/model/response/TemplateData.java  |   36 -
 .../model/response/UserConfigData.java          |   97 -
 .../response/UserConfigDataListResponse.java    |   55 -
 .../logsearch/rest/AuditLogsResource.java       |  120 --
 .../ambari/logsearch/rest/PublicResource.java   |   48 -
 .../logsearch/rest/ServiceLogsResource.java     |  222 ---
 .../ambari/logsearch/rest/StatusResource.java   |   91 -
 .../logsearch/rest/UserConfigResource.java      |  100 -
 .../ambari/logsearch/service/UserService.java   |   44 -
 .../logsearch/solr/ResponseDataGenerator.java   |  452 -----
 .../ambari/logsearch/solr/SolrConstants.java    |  112 --
 .../logsearch/solr/model/SolrAuditLogData.java  |  341 ----
 .../logsearch/solr/model/SolrCommonLogData.java |  292 ---
 .../solr/model/SolrComponentTypeLogData.java    |   40 -
 .../logsearch/solr/model/SolrHostLogData.java   |   40 -
 .../solr/model/SolrServiceLogData.java          |  120 --
 .../ambari/logsearch/util/CommonUtil.java       |   41 -
 .../apache/ambari/logsearch/util/DateUtil.java  |  142 --
 .../ambari/logsearch/util/DownloadUtil.java     |  176 --
 .../apache/ambari/logsearch/util/FileUtil.java  |   72 -
 .../apache/ambari/logsearch/util/JSONUtil.java  |  245 ---
 .../ambari/logsearch/util/RESTErrorUtil.java    |   68 -
 .../apache/ambari/logsearch/util/SSLUtil.java   |  363 ----
 .../apache/ambari/logsearch/util/SolrUtil.java  |  258 ---
 .../apache/ambari/logsearch/util/WebUtil.java   |   65 -
 .../LogsearchAuthFailureHandler.java            |   43 -
 .../LogsearchAuthSuccessHandler.java            |   41 -
 .../LogsearchLogoutSuccessHandler.java          |   41 -
 .../AbstractLogsearchGlobalStateFilter.java     |  100 -
 .../filters/LogsearchAuditLogsStateFilter.java  |   51 -
 .../LogsearchAuthenticationEntryPoint.java      |   50 -
 .../web/filters/LogsearchCorsFilter.java        |   59 -
 .../web/filters/LogsearchJWTFilter.java         |  181 --
 .../LogsearchKRBAuthenticationFilter.java       |  338 ----
 .../web/filters/LogsearchKrbFilter.java         |  581 ------
 ...LogsearchSecurityContextFormationFilter.java |  106 -
 .../LogsearchServiceLogsStateFilter.java        |   51 -
 .../filters/LogsearchUserConfigStateFilter.java |   52 -
 ...rchUsernamePasswordAuthenticationFilter.java |   45 -
 .../logsearch/web/filters/NoServletContext.java |  300 ---
 .../web/listener/LogSearchSessionListener.java  |   48 -
 .../web/model/JWTAuthenticationToken.java       |   53 -
 .../ambari/logsearch/web/model/Privilege.java   |   42 -
 .../apache/ambari/logsearch/web/model/Role.java |   64 -
 .../apache/ambari/logsearch/web/model/User.java |  167 --
 .../logsearch/web/security/LdapProperties.java  |  365 ----
 .../web/security/LdapPropertyName.java          |   58 -
 .../ambari/logsearch/web/security/LdapUtil.java |  115 --
 ...LogsearchAbstractAuthenticationProvider.java |   48 -
 .../LogsearchAuthenticationProvider.java        |  117 --
 ...rchExternalServerAuthenticationProvider.java |  139 --
 .../LogsearchFileAuthenticationProvider.java    |   88 -
 .../LogsearchLdapAuthenticationProvider.java    |  187 --
 .../LogsearchLdapBindAuthenticator.java         |   46 -
 .../LogsearchSimpleAuthenticationProvider.java  |   61 -
 .../src/main/resources/HadoopServiceConfig.json |  488 -----
 .../src/main/resources/default.properties       |   29 -
 .../src/main/resources/log4j.xml                |  119 --
 .../src/main/resources/logsearch-admin-site.xml |  116 --
 .../src/main/resources/logsearch.properties     |   63 -
 .../src/main/resources/swagger/swagger.html     |  115 --
 .../main/resources/templates/audit_log_txt.ftl  |   42 -
 .../resources/templates/service_log_txt.ftl     |   36 -
 .../src/main/resources/user_pass.json           |    8 -
 .../src/main/scripts/run.sh                     |  100 -
 .../src/main/scripts/stop.sh                    |   44 -
 .../common/LogSearchContextUtilTest.java        |   51 -
 .../common/ManageStartEndTimeTest.java          |   35 -
 .../converter/AbstractRequestConverterTest.java |   43 -
 .../AuditBarGraphRequestQueryConverterTest.java |   63 -
 ...AuditComponentRequestQueryConverterTest.java |   66 -
 .../converter/AuditLogRequestConverterTest.java |   64 -
 ...ditServiceLoadRequestQueryConverterTest.java |   61 -
 ...BaseServiceLogRequestQueryConverterTest.java |   72 -
 .../FieldAuditLogRequestQueryConverterTest.java |   61 -
 .../HostLogFilesRequestQueryConverterTest.java  |   62 -
 .../ServiceLogAnyGraphRequestConverterTest.java |   63 -
 ...ComponentLevelRequestQueryConverterTest.java |   66 -
 ...ComponentRequestFacetQueryConverterTest.java |   67 -
 ...eLogLevelCountRequestQueryConverterTest.java |   62 -
 ...LevelDateRangeRequestQueryConverterTest.java |   68 -
 ...ceLogTreeRequestFacetQueryConverterTest.java |   64 -
 ...ceLogTruncatedRequestQueryConverterTest.java |   64 -
 .../StringFieldFacetQueryConverterTest.java     |   48 -
 .../UserConfigRequestQueryConverterTest.java    |   50 -
 .../UserExportRequestQueryConverterTest.java    |   64 -
 .../LogsearchAuthenticationProviderTest.java    |  205 --
 ...xternalServerAuthenticationProviderTest.java |  185 --
 ...LogsearchFileAuthenticationProviderTest.java |  231 ---
 ...LogsearchLdapAuthenticationProviderTest.java |   61 -
 ...gsearchSimpleAuthenticationProviderTest.java |  118 --
 .../src/test/resources/HadoopServiceConfig.json |   17 -
 .../src/test/resources/logsearch.properties     |   33 -
 .../src/test/resources/user_pass.json           |    8 -
 .../ambari-logsearch-server/.gitignore          |    9 +
 .../ambari-logsearch-server/README.md           |   55 +
 .../ambari-logsearch-server/build.properties    |   23 +
 .../ambari-logsearch-server/build.xml           |   59 +
 .../ambari-logsearch-server/pom.xml             |  745 +++++++
 ambari-logsearch/ambari-logsearch-server/run.sh |   24 +
 .../configsets/audit_logs/conf/admin-extra.html |   24 +
 .../conf/admin-extra.menu-bottom.html           |   25 +
 .../audit_logs/conf/admin-extra.menu-top.html   |   25 +
 .../main/configsets/audit_logs/conf/elevate.xml |   38 +
 .../configsets/audit_logs/conf/enumsConfig.xml  |   28 +
 .../configsets/audit_logs/conf/managed-schema   |  125 ++
 .../configsets/audit_logs/conf/solrconfig.xml   | 1887 ++++++++++++++++++
 .../hadoop_logs/conf/admin-extra.html           |   24 +
 .../conf/admin-extra.menu-bottom.html           |   25 +
 .../hadoop_logs/conf/admin-extra.menu-top.html  |   25 +
 .../configsets/hadoop_logs/conf/elevate.xml     |   38 +
 .../configsets/hadoop_logs/conf/enumsConfig.xml |   28 +
 .../configsets/hadoop_logs/conf/managed-schema  |  120 ++
 .../configsets/hadoop_logs/conf/solrconfig.xml  | 1887 ++++++++++++++++++
 .../configsets/history/conf/admin-extra.html    |   24 +
 .../history/conf/admin-extra.menu-bottom.html   |   25 +
 .../history/conf/admin-extra.menu-top.html      |   25 +
 .../main/configsets/history/conf/elevate.xml    |   38 +
 .../main/configsets/history/conf/managed-schema |   98 +
 .../main/configsets/history/conf/solrconfig.xml | 1873 +++++++++++++++++
 .../src/main/configsets/solr.xml                |   19 +
 .../org/apache/ambari/logsearch/LogSearch.java  |  176 ++
 .../logsearch/common/ACLPropertiesSplitter.java |   70 +
 .../logsearch/common/ExternalServerClient.java  |   83 +
 .../common/HadoopServiceConfigHelper.java       |   80 +
 .../logsearch/common/LogSearchConstants.java    |  111 ++
 .../logsearch/common/LogSearchContext.java      |   62 +
 .../apache/ambari/logsearch/common/LogType.java |   34 +
 .../logsearch/common/ManageStartEndTime.java    |   55 +
 .../apache/ambari/logsearch/common/Marker.java  |   29 +
 .../ambari/logsearch/common/MessageData.java    |  165 ++
 .../ambari/logsearch/common/MessageEnums.java   |   72 +
 .../logsearch/common/PropertiesHelper.java      |  138 ++
 .../ambari/logsearch/common/StatusMessage.java  |   40 +
 .../ambari/logsearch/common/VResponse.java      |  164 ++
 .../logsearch/common/XMLPropertiesHelper.java   |   79 +
 .../ambari/logsearch/conf/ApiDocConfig.java     |   55 +
 .../logsearch/conf/ApplicationConfig.java       |   58 +
 .../ambari/logsearch/conf/AuthPropsConfig.java  |  159 ++
 .../conf/LogSearchHttpHeaderConfig.java         |   70 +
 .../ambari/logsearch/conf/SecurityConfig.java   |  209 ++
 .../logsearch/conf/SolrAuditLogPropsConfig.java |  168 ++
 .../ambari/logsearch/conf/SolrConfig.java       |   76 +
 .../conf/SolrConnectionPropsConfig.java         |   78 +
 .../logsearch/conf/SolrKerberosConfig.java      |   48 +
 .../ambari/logsearch/conf/SolrPropsConfig.java  |   61 +
 .../conf/SolrServiceLogPropsConfig.java         |   91 +
 .../logsearch/conf/SolrUserPropsConfig.java     |  116 ++
 .../conf/global/SolrAuditLogsState.java         |   68 +
 .../conf/global/SolrCollectionState.java        |   33 +
 .../conf/global/SolrServiceLogsState.java       |   59 +
 .../conf/global/SolrUserConfigState.java        |   60 +
 .../configurer/LogfeederFilterConfigurer.java   |   66 +
 .../configurer/SolrAuditAliasConfigurer.java    |  136 ++
 .../configurer/SolrCollectionConfigurer.java    |  230 +++
 .../logsearch/configurer/SolrConfigurer.java    |   23 +
 .../AbstractAuditLogRequestQueryConverter.java  |   59 +
 .../converter/AbstractConverterAware.java       |   47 +
 .../AbstractDateRangeFacetQueryConverter.java   |   55 +
 .../AbstractLogRequestFacetQueryConverter.java  |   88 +
 .../AbstractLogRequestQueryConverter.java       |   42 +
 .../AbstractOperationHolderConverter.java       |  180 ++
 .../AbstractSearchRequestQueryConverter.java    |   72 +
 ...actServiceLogRequestFacetQueryConverter.java |   44 +
 ...AbstractServiceLogRequestQueryConverter.java |   44 +
 .../AuditBarGraphRequestQueryConverter.java     |   55 +
 .../AuditComponentsRequestQueryConverter.java   |   53 +
 .../AuditLogRequestQueryConverter.java          |   44 +
 .../AuditServiceLoadRequestQueryConverter.java  |   53 +
 .../BaseServiceLogRequestQueryConverter.java    |   85 +
 .../FieldAuditLogRequestQueryConverter.java     |   54 +
 .../HostLogFilesRequestQueryConverter.java      |   61 +
 ...ServiceLogAnyGraphRequestQueryConverter.java |   60 +
 ...eLogComponentLevelRequestQueryConverter.java |   53 +
 ...eLogComponentRequestFacetQueryConverter.java |   55 +
 ...rviceLogLevelCountRequestQueryConverter.java |   68 +
 ...eLogLevelDateRangeRequestQueryConverter.java |   69 +
 ...erviceLogTreeRequestFacetQueryConverter.java |   54 +
 ...erviceLogTruncatedRequestQueryConverter.java |   95 +
 .../StringFieldFacetQueryConverter.java         |   44 +
 .../UserConfigRequestQueryConverter.java        |   67 +
 .../UserExportRequestQueryConverter.java        |   55 +
 .../ambari/logsearch/dao/AuditSolrDao.java      |   94 +
 .../logsearch/dao/ServiceLogsSolrDao.java       |   85 +
 .../ambari/logsearch/dao/SolrDaoBase.java       |  156 ++
 .../logsearch/dao/SolrSchemaFieldDao.java       |  213 ++
 .../ambari/logsearch/dao/UserConfigSolrDao.java |  196 ++
 .../apache/ambari/logsearch/dao/UserDao.java    |  150 ++
 .../ambari/logsearch/doc/DocConstants.java      |  125 ++
 .../ambari/logsearch/handler/ACLHandler.java    |   97 +
 .../handler/CreateCollectionHandler.java        |  222 +++
 .../handler/ListCollectionHandler.java          |   51 +
 .../handler/ReloadCollectionHandler.java        |   45 +
 .../logsearch/handler/SolrZkRequestHandler.java |   26 +
 .../handler/UploadConfigurationHandler.java     |  151 ++
 .../logsearch/manager/AuditLogsManager.java     |  223 +++
 .../logsearch/manager/JsonManagerBase.java      |   69 +
 .../ambari/logsearch/manager/ManagerBase.java   |   95 +
 .../ambari/logsearch/manager/PublicManager.java |   48 +
 .../logsearch/manager/ServiceLogsManager.java   |  617 ++++++
 .../logsearch/manager/SessionManager.java       |   77 +
 .../logsearch/manager/UserConfigManager.java    |  223 +++
 .../model/common/LogFeederDataMap.java          |   50 +
 .../model/common/LogfeederFilterData.java       |   87 +
 .../model/request/AnyGraphParamDefinition.java  |   44 +
 .../model/request/BundleIdParamDefinition.java  |   32 +
 .../model/request/ClustersParamDefinition.java  |   32 +
 .../request/CommonSearchParamDefinition.java    |   69 +
 .../model/request/DateRangeParamDefinition.java |   38 +
 .../model/request/FieldParamDefinition.java     |   32 +
 .../model/request/FormatParamDefinition.java    |   32 +
 .../request/HostComponentParamDefinition.java   |   38 +
 .../model/request/LastPageParamDefinition.java  |   31 +
 .../model/request/LogParamDefinition.java       |   62 +
 .../request/LogTruncatedParamDefinition.java    |   44 +
 .../logsearch/model/request/SearchRequest.java  |   22 +
 .../request/ServiceLogParamDefinition.java      |   44 +
 .../ServiceLogSearchParamDefinition.java        |   50 +
 .../model/request/TopParamDefinition.java       |   31 +
 .../model/request/UnitParamDefinition.java      |   33 +
 .../request/UserConfigParamDefinition.java      |   38 +
 .../model/request/UtcOffsetParamDefinition.java |   32 +
 .../request/impl/AuditBarGraphRequest.java      |   40 +
 .../request/impl/AuditComponentRequest.java     |   25 +
 .../model/request/impl/AuditLogRequest.java     |   40 +
 .../request/impl/AuditServiceLoadRequest.java   |   25 +
 .../model/request/impl/BaseLogRequest.java      |  132 ++
 .../request/impl/BaseServiceLogRequest.java     |  107 +
 .../model/request/impl/CommonSearchRequest.java |  141 ++
 .../request/impl/FieldAuditBarGraphRequest.java |   40 +
 .../request/impl/FieldAuditLogRequest.java      |   55 +
 .../model/request/impl/HostLogFilesRequest.java |   71 +
 .../request/impl/ServiceAnyGraphRequest.java    |   81 +
 .../model/request/impl/ServiceGraphRequest.java |   40 +
 .../impl/ServiceLogAggregatedInfoRequest.java   |   25 +
 .../impl/ServiceLogComponentHostRequest.java    |   25 +
 .../impl/ServiceLogComponentLevelRequest.java   |   25 +
 .../request/impl/ServiceLogExportRequest.java   |   54 +
 .../impl/ServiceLogHostComponentRequest.java    |   39 +
 .../impl/ServiceLogLevelCountRequest.java       |   25 +
 .../model/request/impl/ServiceLogRequest.java   |   93 +
 .../impl/ServiceLogTruncatedRequest.java        |   66 +
 .../model/request/impl/UserConfigRequest.java   |   53 +
 .../model/request/impl/UserExportRequest.java   |   40 +
 .../logsearch/model/response/AuditLogData.java  |  149 ++
 .../model/response/AuditLogResponse.java        |   48 +
 .../logsearch/model/response/BarGraphData.java  |   53 +
 .../response/BarGraphDataListResponse.java      |   42 +
 .../logsearch/model/response/CommonLogData.java |  118 ++
 .../model/response/ComponentTypeLogData.java    |   32 +
 .../logsearch/model/response/CountData.java     |   50 +
 .../model/response/CountDataListResponse.java   |   48 +
 .../logsearch/model/response/GraphData.java     |   64 +
 .../model/response/GraphDataListResponse.java   |   39 +
 .../model/response/GroupListResponse.java       |   48 +
 .../logsearch/model/response/HostLogData.java   |   30 +
 .../model/response/HostLogFilesResponse.java    |   39 +
 .../logsearch/model/response/LogData.java       |   25 +
 .../logsearch/model/response/LogFileData.java   |   48 +
 .../model/response/LogFileDataListResponse.java |   48 +
 .../model/response/LogListResponse.java         |   27 +
 .../model/response/LogSearchResponse.java       |   22 +
 .../logsearch/model/response/NameValueData.java |   62 +
 .../response/NameValueDataListResponse.java     |   49 +
 .../logsearch/model/response/NodeData.java      |  110 +
 .../model/response/NodeListResponse.java        |   50 +
 .../model/response/SearchResponse.java          |  110 +
 .../model/response/ServiceLogData.java          |   63 +
 .../model/response/ServiceLogResponse.java      |   48 +
 .../logsearch/model/response/TemplateData.java  |   36 +
 .../model/response/UserConfigData.java          |   97 +
 .../response/UserConfigDataListResponse.java    |   55 +
 .../logsearch/rest/AuditLogsResource.java       |  120 ++
 .../ambari/logsearch/rest/PublicResource.java   |   48 +
 .../logsearch/rest/ServiceLogsResource.java     |  222 +++
 .../ambari/logsearch/rest/StatusResource.java   |   91 +
 .../logsearch/rest/UserConfigResource.java      |  100 +
 .../ambari/logsearch/service/UserService.java   |   44 +
 .../logsearch/solr/ResponseDataGenerator.java   |  452 +++++
 .../ambari/logsearch/solr/SolrConstants.java    |  112 ++
 .../logsearch/solr/model/SolrAuditLogData.java  |  341 ++++
 .../logsearch/solr/model/SolrCommonLogData.java |  292 +++
 .../solr/model/SolrComponentTypeLogData.java    |   40 +
 .../logsearch/solr/model/SolrHostLogData.java   |   40 +
 .../solr/model/SolrServiceLogData.java          |  120 ++
 .../ambari/logsearch/util/CommonUtil.java       |   41 +
 .../apache/ambari/logsearch/util/DateUtil.java  |  142 ++
 .../ambari/logsearch/util/DownloadUtil.java     |  176 ++
 .../apache/ambari/logsearch/util/FileUtil.java  |   72 +
 .../apache/ambari/logsearch/util/JSONUtil.java  |  245 +++
 .../ambari/logsearch/util/RESTErrorUtil.java    |   68 +
 .../apache/ambari/logsearch/util/SSLUtil.java   |  363 ++++
 .../apache/ambari/logsearch/util/SolrUtil.java  |  258 +++
 .../apache/ambari/logsearch/util/WebUtil.java   |   65 +
 .../LogsearchAuthFailureHandler.java            |   43 +
 .../LogsearchAuthSuccessHandler.java            |   41 +
 .../LogsearchLogoutSuccessHandler.java          |   41 +
 .../AbstractLogsearchGlobalStateFilter.java     |  100 +
 .../filters/LogsearchAuditLogsStateFilter.java  |   51 +
 .../LogsearchAuthenticationEntryPoint.java      |   50 +
 .../web/filters/LogsearchCorsFilter.java        |   59 +
 .../web/filters/LogsearchJWTFilter.java         |  181 ++
 .../LogsearchKRBAuthenticationFilter.java       |  338 ++++
 .../web/filters/LogsearchKrbFilter.java         |  581 ++++++
 ...LogsearchSecurityContextFormationFilter.java |  106 +
 .../LogsearchServiceLogsStateFilter.java        |   51 +
 .../filters/LogsearchUserConfigStateFilter.java |   52 +
 ...rchUsernamePasswordAuthenticationFilter.java |   45 +
 .../logsearch/web/filters/NoServletContext.java |  300 +++
 .../web/listener/LogSearchSessionListener.java  |   48 +
 .../web/model/JWTAuthenticationToken.java       |   53 +
 .../ambari/logsearch/web/model/Privilege.java   |   42 +
 .../apache/ambari/logsearch/web/model/Role.java |   64 +
 .../apache/ambari/logsearch/web/model/User.java |  167 ++
 .../logsearch/web/security/LdapProperties.java  |  365 ++++
 .../web/security/LdapPropertyName.java          |   58 +
 .../ambari/logsearch/web/security/LdapUtil.java |  115 ++
 ...LogsearchAbstractAuthenticationProvider.java |   48 +
 .../LogsearchAuthenticationProvider.java        |  117 ++
 ...rchExternalServerAuthenticationProvider.java |  139 ++
 .../LogsearchFileAuthenticationProvider.java    |   88 +
 .../LogsearchLdapAuthenticationProvider.java    |  187 ++
 .../LogsearchLdapBindAuthenticator.java         |   46 +
 .../LogsearchSimpleAuthenticationProvider.java  |   61 +
 .../src/main/resources/HadoopServiceConfig.json |  488 +++++
 .../src/main/resources/default.properties       |   29 +
 .../src/main/resources/log4j.xml                |  119 ++
 .../src/main/resources/logsearch-admin-site.xml |  116 ++
 .../src/main/resources/logsearch.properties     |   63 +
 .../src/main/resources/swagger/swagger.html     |  115 ++
 .../main/resources/templates/audit_log_txt.ftl  |   42 +
 .../resources/templates/service_log_txt.ftl     |   36 +
 .../src/main/resources/user_pass.json           |    8 +
 .../src/main/scripts/run.sh                     |  100 +
 .../src/main/scripts/stop.sh                    |   44 +
 .../common/LogSearchContextUtilTest.java        |   51 +
 .../common/ManageStartEndTimeTest.java          |   35 +
 .../converter/AbstractRequestConverterTest.java |   43 +
 .../AuditBarGraphRequestQueryConverterTest.java |   63 +
 ...AuditComponentRequestQueryConverterTest.java |   66 +
 .../converter/AuditLogRequestConverterTest.java |   64 +
 ...ditServiceLoadRequestQueryConverterTest.java |   61 +
 ...BaseServiceLogRequestQueryConverterTest.java |   72 +
 .../FieldAuditLogRequestQueryConverterTest.java |   61 +
 .../HostLogFilesRequestQueryConverterTest.java  |   62 +
 .../ServiceLogAnyGraphRequestConverterTest.java |   63 +
 ...ComponentLevelRequestQueryConverterTest.java |   66 +
 ...ComponentRequestFacetQueryConverterTest.java |   67 +
 ...eLogLevelCountRequestQueryConverterTest.java |   62 +
 ...LevelDateRangeRequestQueryConverterTest.java |   68 +
 ...ceLogTreeRequestFacetQueryConverterTest.java |   64 +
 ...ceLogTruncatedRequestQueryConverterTest.java |   64 +
 .../StringFieldFacetQueryConverterTest.java     |   48 +
 .../UserConfigRequestQueryConverterTest.java    |   50 +
 .../UserExportRequestQueryConverterTest.java    |   64 +
 .../LogsearchAuthenticationProviderTest.java    |  205 ++
 ...xternalServerAuthenticationProviderTest.java |  185 ++
 ...LogsearchFileAuthenticationProviderTest.java |  231 +++
 ...LogsearchLdapAuthenticationProviderTest.java |   61 +
 ...gsearchSimpleAuthenticationProviderTest.java |  118 ++
 .../src/test/resources/HadoopServiceConfig.json |   17 +
 .../src/test/resources/logsearch.properties     |   33 +
 .../src/test/resources/user_pass.json           |    8 +
 ambari-logsearch/docker/bin/start.sh            |    2 +-
 ambari-logsearch/docker/logsearch-docker.sh     |    6 +-
 .../test-config/logsearch/logsearch-env.sh      |    2 +-
 .../logsearch/logsearch-https.properties        |    4 +-
 .../test-config/logsearch/logsearch.properties  |    4 +-
 ambari-logsearch/pom.xml                        |    2 +-
 545 files changed, 29169 insertions(+), 29169 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-assembly/pom.xml b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
index 446448c..ff6c80e 100644
--- a/ambari-logsearch/ambari-logsearch-assembly/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
@@ -36,7 +36,7 @@
     <solr.client.dir>${project.basedir}/../ambari-logsearch-solr-client</solr.client.dir>
     <logsearch.portal.package.name>ambari-logsearch-portal</logsearch.portal.package.name>
     <logsearch.portal.mapping.path>${mapping.base.path}/ambari-logsearch-portal</logsearch.portal.mapping.path>
-    <logsearch.portal.dir>${project.basedir}/../ambari-logsearch-portal</logsearch.portal.dir>
+    <logsearch.server.dir>${project.basedir}/../ambari-logsearch-server</logsearch.server.dir>
     <logsearch.logfeeder.package.name>ambari-logsearch-logfeeder</logsearch.logfeeder.package.name>
     <logsearch.logfeeder.mapping.path>${mapping.base.path}/ambari-logsearch-logfeeder</logsearch.logfeeder.mapping.path>
     <logsearch.logfeeder.dir>${project.basedir}/../ambari-logsearch-logfeeder</logsearch.logfeeder.dir>
@@ -138,7 +138,7 @@
                       <directory>${logsearch.portal.mapping.path}</directory>
                       <sources>
                         <source>
-                          <location>${logsearch.portal.dir}/target/package</location>
+                          <location>${logsearch.server.dir}/target/package</location>
                           <excludes>
                             <exclude>classes/log4j.xml</exclude>
                             <exclude>classes/logsearch.properties</exclude>
@@ -153,7 +153,7 @@
                       <directory>${logsearch.portal.conf.mapping.path}</directory>
                       <sources>
                         <source>
-                          <location>${logsearch.portal.dir}/target/package/classes</location>
+                          <location>${logsearch.server.dir}/target/package/classes</location>
                           <includes>
                             <include>log4j.xml</include>
                             <include>logsearch.properties</include>
@@ -166,7 +166,7 @@
                       <directory>${logsearch.portal.conf.mapping.path}/solr_configsets</directory>
                       <sources>
                         <source>
-                          <location>${logsearch.portal.dir}/target/package/solr_configsets</location>
+                          <location>${logsearch.server.dir}/target/package/solr_configsets</location>
                         </source>
                       </sources>
                     </mapping>
@@ -390,7 +390,7 @@
                   <skipPOMs>false</skipPOMs>
                   <dataSet>
                     <data>
-                      <src>${logsearch.portal.dir}/target/ambari-logsearch-portal.tar.gz</src>
+                      <src>${logsearch.server.dir}/target/ambari-logsearch-portal.tar.gz</src>
                       <type>archive</type>
                       <mapper>
                         <prefix>${logsearch.portal.mapping.path}</prefix>
@@ -403,7 +403,7 @@
                       </excludes>
                     </data>
                     <data>
-                      <src>${logsearch.portal.dir}/target/package/classes</src>
+                      <src>${logsearch.server.dir}/target/package/classes</src>
                       <type>directory</type>
                       <mapper>
                         <prefix>${logsearch.portal.conf.mapping.path}</prefix>
@@ -417,7 +417,7 @@
                       </includes>
                     </data>
                     <data>
-                      <src>${logsearch.portal.dir}/target/package/solr_configsets</src>
+                      <src>${logsearch.server.dir}/target/package/solr_configsets</src>
                       <type>directory</type>
                       <mapper>
                         <prefix>${logsearch.portal.conf.mapping.path}/solr_configsets</prefix>
@@ -518,7 +518,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-logsearch-portal</artifactId>
+      <artifactId>ambari-logsearch-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/.gitignore
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/.gitignore b/ambari-logsearch/ambari-logsearch-portal/.gitignore
deleted file mode 100644
index 07e0389..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-target
-.settings
-.classpath
-.project
-/bin/
-node_modules/
-logs/
-node/
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/README.md
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/README.md b/ambari-logsearch/ambari-logsearch-portal/README.md
deleted file mode 100644
index 126f651..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-{% comment %}
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
--->
-
-#Compilation
-mvn clean compile package
-
-#Deploy
-##Copy to remote
-copy target/logsearch-portal.tar.gz to host machine
-##Setup environment
-```bash
-mkdir /opt/logsearch
-cd /opt/logsearch
-tar xfz ~/logsearch-portal.tar.gz 
-```
-#Create Solr Collection
-*Edit for log retention days (default is 7 days)*
-```bash
-vi solr_configsets/hadoop_logs/conf/solrconfig.xml
-```
-```
-    <processor class="solr.DefaultValueUpdateProcessorFactory">
-        <str name="fieldName">_ttl_</str>
-        <str name="value">+7DAYS</str>
-    </processor>
-```
-```bash
-./create_collections.sh $SOLR_HOME $NUM_SHARDS $NUM_OF_REPLICATIONS `pwd`/solr_configsets
-```
-```bash
-vi classes/logsearch.properties
-```
-```
-solr.zkhosts=$ZK1:2181,$ZK2:2181,$ZK3:2181/solr
-```
-*This script will stop logsearch if it is running and restart it*
-```bash
-./run.sh
-```

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/build.properties
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/build.properties b/ambari-logsearch/ambari-logsearch-portal/build.properties
deleted file mode 100644
index 1cd118a..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-# log4j configuration used during build and unit tests
-
-TOMCAT_HOME=/Library/Tomcat/Home
-app.work.dir=${builddir}/build/work
-app.war.dir=${app.work.dir}/war
-app.pkg.dir=${app.work.dir}/pkg
-
-app.dev.war.dir=${app.work.dir}/webapps/logsearch
-app.war.name=logsearch.war
-
-app.target.dir=${builddir}/target/classes/webapps/app
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/build.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/build.xml b/ambari-logsearch/ambari-logsearch-portal/build.xml
deleted file mode 100644
index aadacd7..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/build.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<project basedir="." default="build" name="logsearch">
-  <property environment="env"/>
-  <property name="debuglevel" value="source,lines,vars"/>
-  <dirname property="builddir" file="build.xml"/>
-  <property name="target" value="1.7"/>
-  <property name="source" value="1.7"/>
-  <property file="build.properties"/>
-
-  <target name="init">
-  </target>
-  <target name="build"/>
-
-  <target name="package">
-    <delete dir="target/package"/>
-    <copy todir="target/package/libs" includeEmptyDirs="no">
-      <fileset dir="target/libs"/>
-    </copy>
-    <copy todir="target/package/classes" includeEmptyDirs="no">
-      <fileset dir="target/classes"/>
-    </copy>
-    <copy todir="target/package/solr_configsets" includeEmptyDirs="yes">
-      <fileset dir="src/main/configsets"/>
-    </copy>
-    <copy todir="target/package" includeEmptyDirs="no">
-      <fileset file="src/main/scripts/*"/>
-    </copy>
-    <chmod file="target/package/*.sh" perm="755"/>
-    <tar compression="gzip" destfile="target/ambari-logsearch-portal.tar.gz">
-      <tarfileset mode="755" dir="target/package">
-        <include name="*.sh"/>
-      </tarfileset>
-      <tarfileset mode="664" dir="target/package">
-        <exclude name="*.sh"/>
-      </tarfileset>
-    </tar>
-
-  </target>
-
-
-  <target description="Build all projects which reference this project. Useful to propagate changes."
-          name="build-refprojects"/>
-</project>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/pom.xml b/ambari-logsearch/ambari-logsearch-portal/pom.xml
deleted file mode 100755
index 1b7fc92..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/pom.xml
+++ /dev/null
@@ -1,745 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>ambari-logsearch</artifactId>
-    <groupId>org.apache.ambari</groupId>
-    <version>2.0.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.ambari</groupId>
-  <artifactId>ambari-logsearch-portal</artifactId>
-  <packaging>jar</packaging>
-  <version>2.0.0.0-SNAPSHOT</version>
-  <url>http://maven.apache.org</url>
-  <name>Ambari Logsearch Portal</name>
-  <properties>
-    <spring.version>4.2.5.RELEASE</spring.version>
-    <spring.security.version>4.0.4.RELEASE</spring.security.version>
-    <spring.ldap.version>2.0.4.RELEASE</spring.ldap.version>
-    <jersey.version>2.23.2</jersey.version>
-    <jetty-version>9.2.11.v20150529</jetty-version>
-    <swagger.version>1.5.8</swagger.version>
-    <spring-data-solr.version>2.0.2.RELEASE</spring-data-solr.version>
-    <jjwt.version>0.6.0</jjwt.version>
-  </properties>
-  <profiles>
-    <!-- Dev Profile Start -->
-    <profile>
-      <id>dev</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <finalName>LogSearch</finalName>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.0</version>
-            </plugin>
-            <plugin>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <version>2.8</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.0</version>
-            <configuration>
-              <source>1.7</source>
-              <target>1.7</target>
-            </configuration>
-          </plugin>
-          <!-- Exec main class plugin -->
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.2.1</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>java</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <mainClass>org.apache.ambari.logsearch.LogSearch</mainClass>
-              <!-- <arguments> <argument></argument> </arguments> -->
-            </configuration>
-          </plugin>
-          <!-- copy-dependencies -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.8</version>
-            <executions>
-              <execution>
-                <id>unpack</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.apache.ambari</groupId>
-                      <artifactId>ambari-logsearch-web</artifactId>
-                      <version>${project.version}</version>
-                      <outputDirectory>${project.build.outputDirectory}/</outputDirectory>
-                      <includes>webapps/**</includes>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-dependencies</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>*</artifactItems>
-                  <excludeArtifactIds>ambari-logsearch-web</excludeArtifactIds>
-                  <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
-                  <outputDirectory>${basedir}/target/libs</outputDirectory>
-                  <overWriteReleases>false</overWriteReleases>
-                  <overWriteSnapshots>false</overWriteSnapshots>
-                  <overWriteIfNewer>true</overWriteIfNewer>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- - -->
-          <!-- ant pacakge -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <configuration>
-                  <target>
-                    <!-- <taskdef resource="build.properties" classpathref="maven.plugin.classpath" /> -->
-                    <ant antfile="build.xml">
-                      <target name="package"/>
-                    </ant>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.rat</groupId>
-            <artifactId>apache-rat-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>src/main/configsets/hadoop_logs/conf/managed-schema</exclude>
-                <exclude>**/*.log</exclude>
-                <exclude>**/*.json</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>test</phase>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- /ant package -->
-        </plugins>
-      </build>
-    </profile>
-    <!-- Dev Profile End -->
-    <!-- Production Profile Start -->
-    <profile>
-      <id>production</id>
-      <build>
-        <finalName>LogSearch</finalName>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.0</version>
-            </plugin>
-            <plugin>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <version>2.8</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.0</version>
-            <configuration>
-              <source>1.7</source>
-              <target>1.7</target>
-            </configuration>
-          </plugin>
-          <!-- Exec main class plugin -->
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.2.1</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>java</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <mainClass>org.apache.ambari.logsearch.LogSearch</mainClass>
-              <!-- <arguments> <argument></argument> </arguments> -->
-            </configuration>
-          </plugin>
-          <!-- copy-dependencies -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.8</version>
-            <executions>
-              <execution>
-                <id>copy-dependencies</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>*</artifactItems>
-                  <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
-                  <outputDirectory>${basedir}/target/libs</outputDirectory>
-                  <overWriteReleases>false</overWriteReleases>
-                  <overWriteSnapshots>false</overWriteSnapshots>
-                  <overWriteIfNewer>true</overWriteIfNewer>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- - -->
-          <!-- ant pacakge -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <configuration>
-                  <target>
-                    <!-- <taskdef resource="build.properties" classpathref="maven.plugin.classpath" /> -->
-                    <ant antfile="build.xml">
-                      <target name="package"/>
-                    </ant>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-              <!-- <execution>
-                <id>Packag Install</id>
-                <phase>generate-resources</phase>
-                <configuration>
-                  <target>
-                    <exec executable="npm">
-                      <arg value="install" />
-                    </exec>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>Js Packaging</id>
-                <phase>generate-resources</phase>
-                <configuration>
-                  <target>
-                    <exec executable="gulp">
-                      <arg value="minify-css" />
-                    </exec>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution> -->
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.rat</groupId>
-            <artifactId>apache-rat-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/*</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>test</phase>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- Production Profile End -->
-    <profile>
-      <id>skipMinify</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <finalName>LogSearch</finalName>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.0</version>
-            </plugin>
-            <plugin>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <version>2.8</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.0</version>
-            <configuration>
-              <source>1.7</source>
-              <target>1.7</target>
-            </configuration>
-          </plugin>
-          <!-- Exec main class plugin -->
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.2.1</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>java</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <mainClass>org.apache.ambari.logsearch.LogSearch</mainClass>
-              <!-- <arguments> <argument></argument> </arguments> -->
-            </configuration>
-          </plugin>
-          <!-- copy-dependencies -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.8</version>
-            <executions>
-              <execution>
-                <id>copy-dependencies</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>*</artifactItems>
-                  <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
-                  <outputDirectory>${basedir}/target/libs</outputDirectory>
-                  <overWriteReleases>false</overWriteReleases>
-                  <overWriteSnapshots>false</overWriteSnapshots>
-                  <overWriteIfNewer>true</overWriteIfNewer>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- - -->
-          <!-- ant pacakge -->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <configuration>
-                  <target>
-                    <!-- <taskdef resource="build.properties" classpathref="maven.plugin.classpath" 
-                      /> -->
-                    <ant antfile="build.xml">
-                      <target name="package"/>
-                    </ant>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.4</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- Spring dependencies -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <!-- Spring Security -->
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-web</artifactId>
-      <version>${spring.security.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-      <version>${spring.security.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-config</artifactId>
-      <version>${spring.security.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.ldap</groupId>
-      <artifactId>spring-ldap-core</artifactId>
-      <version>${spring.ldap.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-ldap</artifactId>
-      <version>${spring.security.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.ext</groupId>
-      <artifactId>jersey-spring3</artifactId>
-      <version>2.23.2</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.connectors</groupId>
-      <artifactId>jersey-apache-connector</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-client</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-json-jettison</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-json-jackson</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-common</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-  <dependency>
-    <groupId>javax.servlet</groupId>
-    <artifactId>javax.servlet-api</artifactId>
-    <version>3.1.0</version>
-  </dependency>
-      <dependency>
-    <groupId>log4j</groupId>
-    <artifactId>log4j</artifactId>
-    <version>1.2.17</version>
-  </dependency>
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-solrj</artifactId>
-      <version>${solr.version}</version>
-    </dependency>
-    <dependency>
-    <groupId>org.apache.solr</groupId>
-    <artifactId>solr-core</artifactId>
-    <version>${solr.version}</version>
-    <exclusions>
-      <exclusion>
-        <groupId>*</groupId>
-        <artifactId>*</artifactId>
-      </exclusion>
-    </exclusions>
-  </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <version>${solr.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <version>${solr.version}</version>
-    </dependency>
-    <!-- Hadoop -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>2.7.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jetty-util</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-json</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-server</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-logsearch-appender</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-metrics-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security.kerberos</groupId>
-      <artifactId>spring-security-kerberos-core</artifactId>
-      <version>1.0.1.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security.kerberos</groupId>
-      <artifactId>spring-security-kerberos-web</artifactId>
-      <version>1.0.1.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security.kerberos</groupId>
-      <artifactId>spring-security-kerberos-client</artifactId>
-      <version>1.0.1.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-security</artifactId>
-      <version>${jetty-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlets</artifactId>
-      <version>${jetty-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${jetty-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
-      <version>${jetty-version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-annotations</artifactId>
-      <version>${jetty-version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
-      <version>3.2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-core</artifactId>
-      <version>${swagger.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-jersey2-jaxrs</artifactId>
-      <version>${swagger.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.ws.rs</groupId>
-          <artifactId>jsr311-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-models</artifactId>
-      <version>${swagger.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>swagger-ui</artifactId>
-      <version>2.1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-solr</artifactId>
-      <version>${spring-data-solr.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-      <version>2.3.20</version>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt</artifactId>
-      <version>${jjwt.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.ext</groupId>
-      <artifactId>jersey-bean-validation</artifactId>
-      <version>2.25</version>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.55</version>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.55</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-logsearch-web</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/run.sh
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/run.sh b/ambari-logsearch/ambari-logsearch-portal/run.sh
deleted file mode 100755
index ae3c779..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/run.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-echo "
-██╗      ██████╗  ██████╗     ███████╗███████╗ █████╗ ██████╗  ██████╗██╗  ██╗
-██║     ██╔═══██╗██╔════╝     ██╔════╝██╔════╝██╔══██╗██╔══██╗██╔════╝██║  ██║
-██║     ██║   ██║██║  ███╗    ███████╗█████╗  ███████║██████╔╝██║     ███████║
-██║     ██║   ██║██║   ██║    ╚════██║██╔══╝  ██╔══██║██╔══██╗██║     ██╔══██║
-███████╗╚██████╔╝╚██████╔╝    ███████║███████╗██║  ██║██║  ██║╚██████╗██║  ██║
-╚══════╝ ╚═════╝  ╚═════╝     ╚══════╝╚══════╝╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝
-"
-cd ..
-mvn clean compile package -Pdev
-cd ambari-logsearch-portal
-#mvn exec:java -Pdev
-java -cp target/libs/*:target/classes/ org.apache.ambari.logsearch.LogSearch

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.html b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.html
deleted file mode 100755
index fecab20..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top-
-right box of the cores overview page. Uncomment this as an example to 
-see there the content will show up.
-
-<img src="img/ico/construction.png"> This line will appear at the top-
-right box on collection1's Overview
--->

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.menu-bottom.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.menu-bottom.html b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.menu-bottom.html
deleted file mode 100755
index 3359a46..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.menu-bottom.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-bottom.html -->
-<!--
-<li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
-    LAST ITEM
-  </a>
-</li>
--->

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.menu-top.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.menu-top.html b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.menu-top.html
deleted file mode 100755
index 0886cee..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/admin-extra.menu-top.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-top.html -->
-<!--
-<li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
-    FIRST ITEM
-  </a>
-</li>
--->

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/elevate.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/elevate.xml b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/elevate.xml
deleted file mode 100644
index 25d5ceb..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/elevate.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- If this file is found in the config directory, it will only be
-     loaded once at startup.  If it is found in Solr's data
-     directory, it will be re-loaded every commit.
-
-   See http://wiki.apache.org/solr/QueryElevationComponent for more info
-
--->
-<elevate>
- <query text="foo bar">
-  <doc id="1" />
-  <doc id="2" />
-  <doc id="3" />
- </query>
- 
- <query text="ipod">
-   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
-   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
- 
-</elevate>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f1e340/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/enumsConfig.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/enumsConfig.xml b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/enumsConfig.xml
deleted file mode 100644
index 458ee7e..0000000
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/audit_logs/conf/enumsConfig.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<enumsConfig>
-  <enum name="log_levels">
-    <value>UNKNOWN</value>
-    <value>TRACE</value>
-    <value>DEBUG</value>
-    <value>INFO</value>
-    <value>WARN</value>
-    <value>ERROR</value>
-    <value>FATAL</value>
-  </enum>
-</enumsConfig>


Mime
View raw message