From a81305041f0e8dd1cb097ebdb36a8573db3b7e6c Mon Sep 17 00:00:00 2001 From: "tomasz.kowalczewski" Date: Mon, 9 Nov 2020 20:04:38 +0100 Subject: [PATCH] Some project restructuring. --- {log4j2-appender => loki-log4j2-appender}/pom.xml | 0 .../main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java | 0 .../pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java | 0 .../src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java | 0 .../src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java | 0 .../main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java | 0 .../src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java | 0 .../java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java | 0 .../src/test/resources/log4j2.xml | 0 .../src/test/resources/loki-config.yaml | 0 pom.xml | 6 +++--- {core => tjahzi-core}/pom.xml | 0 .../src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java | 0 .../src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java | 0 .../src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java | 0 .../src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java | 0 .../java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java | 0 .../pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java | 0 .../java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java | 0 .../java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java | 0 .../main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java | 0 .../src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java | 0 .../pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java | 0 .../src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java | 0 .../src/test/resources/loki-config.yaml | 0 {loki-protobuf => tjahzi-protobuf}/pom.xml | 0 .../resources/github.com/gogo/protobuf/gogoproto/gogo.proto | 0 .../src/main/resources/google/protobuf/descriptor.proto | 0 .../src/main/resources/google/protobuf/timestamp.proto | 0 .../src/main/resources/logproto.proto | 0 30 files changed, 3 insertions(+), 3 deletions(-) rename {log4j2-appender => loki-log4j2-appender}/pom.xml (100%) rename {log4j2-appender => loki-log4j2-appender}/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java (100%) rename {log4j2-appender => loki-log4j2-appender}/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java (100%) rename {log4j2-appender => loki-log4j2-appender}/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java (100%) rename {log4j2-appender => loki-log4j2-appender}/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java (100%) rename {log4j2-appender => loki-log4j2-appender}/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java (100%) rename {log4j2-appender => loki-log4j2-appender}/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java (100%) rename {log4j2-appender => loki-log4j2-appender}/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java (100%) rename {log4j2-appender => loki-log4j2-appender}/src/test/resources/log4j2.xml (100%) rename {core => loki-log4j2-appender}/src/test/resources/loki-config.yaml (100%) rename {core => tjahzi-core}/pom.xml (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java (100%) rename {core => tjahzi-core}/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java (100%) rename {core => tjahzi-core}/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java (100%) rename {core => tjahzi-core}/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java (100%) rename {log4j2-appender => tjahzi-core}/src/test/resources/loki-config.yaml (100%) rename {loki-protobuf => tjahzi-protobuf}/pom.xml (100%) rename {loki-protobuf => tjahzi-protobuf}/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto (100%) rename {loki-protobuf => tjahzi-protobuf}/src/main/resources/google/protobuf/descriptor.proto (100%) rename {loki-protobuf => tjahzi-protobuf}/src/main/resources/google/protobuf/timestamp.proto (100%) rename {loki-protobuf => tjahzi-protobuf}/src/main/resources/logproto.proto (100%) diff --git a/log4j2-appender/pom.xml b/loki-log4j2-appender/pom.xml similarity index 100% rename from log4j2-appender/pom.xml rename to loki-log4j2-appender/pom.xml diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java similarity index 100% rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogic.java diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java similarity index 100% rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/ByteBufferDestinations.java diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java similarity index 100% rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Header.java diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java similarity index 100% rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Label.java diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java similarity index 100% rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/LokiAppender.java diff --git a/log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java b/loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java similarity index 100% rename from log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java rename to loki-log4j2-appender/src/main/java/pl/tkowalcz/tjahzi/log4j2/Property.java diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java b/loki-log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java similarity index 100% rename from log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java rename to loki-log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java diff --git a/log4j2-appender/src/test/resources/log4j2.xml b/loki-log4j2-appender/src/test/resources/log4j2.xml similarity index 100% rename from log4j2-appender/src/test/resources/log4j2.xml rename to loki-log4j2-appender/src/test/resources/log4j2.xml diff --git a/core/src/test/resources/loki-config.yaml b/loki-log4j2-appender/src/test/resources/loki-config.yaml similarity index 100% rename from core/src/test/resources/loki-config.yaml rename to loki-log4j2-appender/src/test/resources/loki-config.yaml diff --git a/pom.xml b/pom.xml index 4563dfa..74ece89 100644 --- a/pom.xml +++ b/pom.xml @@ -12,9 +12,9 @@ https://github.com/tkowalcz/tjahzi - loki-protobuf - log4j2-appender - core + tjahzi-protobuf + loki-log4j2-appender + tjahzi-core diff --git a/core/pom.xml b/tjahzi-core/pom.xml similarity index 100% rename from core/pom.xml rename to tjahzi-core/pom.xml diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziInitializer.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/TjahziLogger.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java b/tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java similarity index 100% rename from core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java rename to tjahzi-core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java diff --git a/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java b/tjahzi-core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java similarity index 100% rename from core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java rename to tjahzi-core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java diff --git a/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java b/tjahzi-core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java similarity index 100% rename from core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java rename to tjahzi-core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java diff --git a/log4j2-appender/src/test/resources/loki-config.yaml b/tjahzi-core/src/test/resources/loki-config.yaml similarity index 100% rename from log4j2-appender/src/test/resources/loki-config.yaml rename to tjahzi-core/src/test/resources/loki-config.yaml diff --git a/loki-protobuf/pom.xml b/tjahzi-protobuf/pom.xml similarity index 100% rename from loki-protobuf/pom.xml rename to tjahzi-protobuf/pom.xml diff --git a/loki-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto b/tjahzi-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto similarity index 100% rename from loki-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto rename to tjahzi-protobuf/src/main/resources/github.com/gogo/protobuf/gogoproto/gogo.proto diff --git a/loki-protobuf/src/main/resources/google/protobuf/descriptor.proto b/tjahzi-protobuf/src/main/resources/google/protobuf/descriptor.proto similarity index 100% rename from loki-protobuf/src/main/resources/google/protobuf/descriptor.proto rename to tjahzi-protobuf/src/main/resources/google/protobuf/descriptor.proto diff --git a/loki-protobuf/src/main/resources/google/protobuf/timestamp.proto b/tjahzi-protobuf/src/main/resources/google/protobuf/timestamp.proto similarity index 100% rename from loki-protobuf/src/main/resources/google/protobuf/timestamp.proto rename to tjahzi-protobuf/src/main/resources/google/protobuf/timestamp.proto diff --git a/loki-protobuf/src/main/resources/logproto.proto b/tjahzi-protobuf/src/main/resources/logproto.proto similarity index 100% rename from loki-protobuf/src/main/resources/logproto.proto rename to tjahzi-protobuf/src/main/resources/logproto.proto