This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch branch-feature-logsearch-ga in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 85ce982a7011a306a0f1dd3a11bcbb9eb281c9f4 Author: Oliver Szabo <[email protected]> AuthorDate: Mon Sep 24 19:43:24 2018 +0200 repackage logfeeder container registry --- .../ambari/logfeeder/{ => container}/ContainerMetadata.java | 2 +- .../ambari/logfeeder/{ => container}/ContainerRegistry.java | 2 +- .../logfeeder/{ => container}/docker/DockerContainerRegistry.java | 8 ++++---- .../{ => container}/docker/DockerContainerRegistryMonitor.java | 4 ++-- .../ambari/logfeeder/{ => container}/docker/DockerMetadata.java | 4 ++-- .../{ => container}/docker/command/CommandExecutionHelper.java | 2 +- .../logfeeder/{ => container}/docker/command/CommandResponse.java | 2 +- .../{ => container}/docker/command/ContainerCommand.java | 2 +- .../docker/command/DockerInspectContainerCommand.java | 2 +- .../docker/command/DockerListContainerCommand.java | 2 +- .../java/org/apache/ambari/logfeeder/conf/ApplicationConfig.java | 2 +- .../main/java/org/apache/ambari/logfeeder/input/InputFile.java | 4 ++-- .../java/org/apache/ambari/logfeeder/input/InputManagerImpl.java | 4 ++-- .../logfeeder/input/monitor/DockerLogFileUpdateMonitor.java | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/ContainerMetadata.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/ContainerMetadata.java similarity index 96% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/ContainerMetadata.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/ContainerMetadata.java index df3a80a..ac8770f 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/ContainerMetadata.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/ContainerMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder; +package org.apache.ambari.logfeeder.container; /** * Holds container related metadata diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/ContainerRegistry.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/ContainerRegistry.java similarity index 96% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/ContainerRegistry.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/ContainerRegistry.java index 94f6a82..4d9d765 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/ContainerRegistry.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/ContainerRegistry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder; +package org.apache.ambari.logfeeder.container; import java.util.Map; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerContainerRegistry.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerContainerRegistry.java similarity index 95% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerContainerRegistry.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerContainerRegistry.java index 1294dbe..715b751 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerContainerRegistry.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerContainerRegistry.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder.docker; +package org.apache.ambari.logfeeder.container.docker; -import org.apache.ambari.logfeeder.ContainerRegistry; -import org.apache.ambari.logfeeder.docker.command.DockerInspectContainerCommand; -import org.apache.ambari.logfeeder.docker.command.DockerListContainerCommand; +import org.apache.ambari.logfeeder.container.ContainerRegistry; +import org.apache.ambari.logfeeder.container.docker.command.DockerInspectContainerCommand; +import org.apache.ambari.logfeeder.container.docker.command.DockerListContainerCommand; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerContainerRegistryMonitor.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerContainerRegistryMonitor.java similarity index 93% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerContainerRegistryMonitor.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerContainerRegistryMonitor.java index ff2a3a0..137be7f 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerContainerRegistryMonitor.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerContainerRegistryMonitor.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder.docker; +package org.apache.ambari.logfeeder.container.docker; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; /** - * Periodically re-register docker container metadata for {@link org.apache.ambari.logfeeder.docker.DockerContainerRegistry} + * Periodically re-register docker container metadata for {@link org.apache.ambari.logfeeder.container.docker.DockerContainerRegistry} * based on a time interval in seconds (property: logfeeder.container.registry.docker.interval, default: 5) */ public class DockerContainerRegistryMonitor implements Runnable { diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerMetadata.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerMetadata.java similarity index 94% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerMetadata.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerMetadata.java index 65842b4..f5cafcf 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/DockerMetadata.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/DockerMetadata.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder.docker; +package org.apache.ambari.logfeeder.container.docker; -import org.apache.ambari.logfeeder.ContainerMetadata; +import org.apache.ambari.logfeeder.container.ContainerMetadata; public class DockerMetadata implements ContainerMetadata { diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/CommandExecutionHelper.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/CommandExecutionHelper.java similarity index 96% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/CommandExecutionHelper.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/CommandExecutionHelper.java index aa65c60..d13969d 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/CommandExecutionHelper.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/CommandExecutionHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder.docker.command; +package org.apache.ambari.logfeeder.container.docker.command; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/CommandResponse.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/CommandResponse.java similarity index 95% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/CommandResponse.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/CommandResponse.java index 7ead791..9152bf4 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/CommandResponse.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/CommandResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder.docker.command; +package org.apache.ambari.logfeeder.container.docker.command; import java.util.List; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/ContainerCommand.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/ContainerCommand.java similarity index 95% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/ContainerCommand.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/ContainerCommand.java index db3de01..92c24ee 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/ContainerCommand.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/ContainerCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder.docker.command; +package org.apache.ambari.logfeeder.container.docker.command; import java.util.Map; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/DockerInspectContainerCommand.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/DockerInspectContainerCommand.java similarity index 97% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/DockerInspectContainerCommand.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/DockerInspectContainerCommand.java index 89be7d0..6e166eb 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/DockerInspectContainerCommand.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/DockerInspectContainerCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder.docker.command; +package org.apache.ambari.logfeeder.container.docker.command; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang.StringUtils; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/DockerListContainerCommand.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/DockerListContainerCommand.java similarity index 97% rename from ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/DockerListContainerCommand.java rename to ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/DockerListContainerCommand.java index c530eb3..fc12a22 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/docker/command/DockerListContainerCommand.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/org/apache/ambari/logfeeder/container/docker/command/DockerListContainerCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ambari.logfeeder.docker.command; +package org.apache.ambari.logfeeder.container.docker.command; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/ApplicationConfig.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/ApplicationConfig.java index 8c7e7d9..086ad70 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/ApplicationConfig.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/ApplicationConfig.java @@ -20,7 +20,7 @@ package org.apache.ambari.logfeeder.conf; import com.google.common.collect.Maps; import org.apache.ambari.logfeeder.common.LogFeederSolrClientFactory; -import org.apache.ambari.logfeeder.docker.DockerContainerRegistry; +import org.apache.ambari.logfeeder.container.docker.DockerContainerRegistry; import org.apache.ambari.logfeeder.common.LogFeederConstants; import org.apache.ambari.logfeeder.input.InputConfigUploader; import org.apache.ambari.logfeeder.input.InputManagerImpl; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java index 74e2ed4..022dc01 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputFile.java @@ -20,8 +20,8 @@ package org.apache.ambari.logfeeder.input; import org.apache.ambari.logfeeder.conf.LogEntryCacheConfig; import org.apache.ambari.logfeeder.conf.LogFeederProps; -import org.apache.ambari.logfeeder.docker.DockerContainerRegistry; -import org.apache.ambari.logfeeder.docker.DockerMetadata; +import org.apache.ambari.logfeeder.container.docker.DockerContainerRegistry; +import org.apache.ambari.logfeeder.container.docker.DockerMetadata; import org.apache.ambari.logfeeder.input.monitor.DockerLogFileUpdateMonitor; import org.apache.ambari.logfeeder.input.monitor.LogFileDetachMonitor; import org.apache.ambari.logfeeder.input.monitor.LogFilePathUpdateMonitor; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputManagerImpl.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputManagerImpl.java index 60bd4ca..91ffd5e 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputManagerImpl.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputManagerImpl.java @@ -20,8 +20,8 @@ package org.apache.ambari.logfeeder.input; import com.google.common.annotations.VisibleForTesting; import org.apache.ambari.logfeeder.conf.LogFeederProps; -import org.apache.ambari.logfeeder.docker.DockerContainerRegistry; -import org.apache.ambari.logfeeder.docker.DockerContainerRegistryMonitor; +import org.apache.ambari.logfeeder.container.docker.DockerContainerRegistry; +import org.apache.ambari.logfeeder.container.docker.DockerContainerRegistryMonitor; import org.apache.ambari.logfeeder.plugin.manager.CheckpointManager; import org.apache.ambari.logfeeder.plugin.common.MetricData; import org.apache.ambari.logfeeder.plugin.input.Input; diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/monitor/DockerLogFileUpdateMonitor.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/monitor/DockerLogFileUpdateMonitor.java index f33063f..859e6e0 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/monitor/DockerLogFileUpdateMonitor.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/monitor/DockerLogFileUpdateMonitor.java @@ -18,8 +18,8 @@ */ package org.apache.ambari.logfeeder.input.monitor; -import org.apache.ambari.logfeeder.docker.DockerContainerRegistry; -import org.apache.ambari.logfeeder.docker.DockerMetadata; +import org.apache.ambari.logfeeder.container.docker.DockerContainerRegistry; +import org.apache.ambari.logfeeder.container.docker.DockerMetadata; import org.apache.ambari.logfeeder.input.InputFile; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger;
