diff --git a/.github/workflows/graal-tests.yml b/.github/workflows/graal-tests.yml index 14495f4..8a8c54f 100644 --- a/.github/workflows/graal-tests.yml +++ b/.github/workflows/graal-tests.yml @@ -26,7 +26,8 @@ jobs: - uses: actions/cache@v4 with: path: ~/.m2/repository - key: deps-${{ hashFiles('deps.edn') }} + key: deps-${{ hashFiles('projects/main/project.clj') }} restore-keys: deps- - run: bb graal-tests + working-directory: projects/main diff --git a/.github/workflows/main-tests.yml b/.github/workflows/main-tests.yml index af8717b..7e41d9d 100644 --- a/.github/workflows/main-tests.yml +++ b/.github/workflows/main-tests.yml @@ -24,7 +24,8 @@ jobs: id: cache-deps with: path: ~/.m2/repository - key: deps-${{ hashFiles('project.clj') }} + key: deps-${{ hashFiles('projects/main/project.clj') }} restore-keys: deps- - run: lein test-all + working-directory: projects/main diff --git a/handlers/carmine.clj b/handlers/carmine.clj deleted file mode 120000 index 0434f2b..0000000 --- a/handlers/carmine.clj +++ /dev/null @@ -1 +0,0 @@ -../src/taoensso/telemere/carmine.clj \ No newline at end of file diff --git a/handlers/consoles.cljc b/handlers/consoles.cljc deleted file mode 120000 index cc87a77..0000000 --- a/handlers/consoles.cljc +++ /dev/null @@ -1 +0,0 @@ -../src/taoensso/telemere/consoles.cljc \ No newline at end of file diff --git a/handlers/files.clj b/handlers/files.clj deleted file mode 120000 index 1b3d8cb..0000000 --- a/handlers/files.clj +++ /dev/null @@ -1 +0,0 @@ -../src/taoensso/telemere/files.clj \ No newline at end of file diff --git a/handlers/logstash.clj b/handlers/logstash.clj deleted file mode 120000 index b06b21e..0000000 --- a/handlers/logstash.clj +++ /dev/null @@ -1 +0,0 @@ -../src/taoensso/telemere/logstash.clj \ No newline at end of file diff --git a/handlers/open_telemetry.clj b/handlers/open_telemetry.clj deleted file mode 120000 index 37c8c70..0000000 --- a/handlers/open_telemetry.clj +++ /dev/null @@ -1 +0,0 @@ -../src/taoensso/telemere/open_telemetry.clj \ No newline at end of file diff --git a/handlers/postal.clj b/handlers/postal.clj deleted file mode 120000 index 659f495..0000000 --- a/handlers/postal.clj +++ /dev/null @@ -1 +0,0 @@ -../src/taoensso/telemere/postal.clj \ No newline at end of file diff --git a/handlers/slack.clj b/handlers/slack.clj deleted file mode 120000 index 27c051a..0000000 --- a/handlers/slack.clj +++ /dev/null @@ -1 +0,0 @@ -../src/taoensso/telemere/slack.clj \ No newline at end of file diff --git a/handlers/sockets.clj b/handlers/sockets.clj deleted file mode 120000 index ea22f56..0000000 --- a/handlers/sockets.clj +++ /dev/null @@ -1 +0,0 @@ -../src/taoensso/telemere/sockets.clj \ No newline at end of file diff --git a/projects/handlers/consoles.cljc b/projects/handlers/consoles.cljc new file mode 120000 index 0000000..ac21317 --- /dev/null +++ b/projects/handlers/consoles.cljc @@ -0,0 +1 @@ +../main/src/taoensso/telemere/consoles.cljc \ No newline at end of file diff --git a/projects/handlers/files.clj b/projects/handlers/files.clj new file mode 120000 index 0000000..cc226f7 --- /dev/null +++ b/projects/handlers/files.clj @@ -0,0 +1 @@ +../main/src/taoensso/telemere/files.clj \ No newline at end of file diff --git a/projects/handlers/open_telemetry.clj b/projects/handlers/open_telemetry.clj new file mode 120000 index 0000000..bb41473 --- /dev/null +++ b/projects/handlers/open_telemetry.clj @@ -0,0 +1 @@ +../main/src/taoensso/telemere/open_telemetry.clj \ No newline at end of file diff --git a/projects/handlers/postal.clj b/projects/handlers/postal.clj new file mode 120000 index 0000000..25d4b8a --- /dev/null +++ b/projects/handlers/postal.clj @@ -0,0 +1 @@ +../main/src/taoensso/telemere/postal.clj \ No newline at end of file diff --git a/projects/handlers/slack.clj b/projects/handlers/slack.clj new file mode 120000 index 0000000..d052c4f --- /dev/null +++ b/projects/handlers/slack.clj @@ -0,0 +1 @@ +../main/src/taoensso/telemere/slack.clj \ No newline at end of file diff --git a/projects/handlers/sockets.clj b/projects/handlers/sockets.clj new file mode 120000 index 0000000..4a0222c --- /dev/null +++ b/projects/handlers/sockets.clj @@ -0,0 +1 @@ +../main/src/taoensso/telemere/sockets.clj \ No newline at end of file diff --git a/.gitignore b/projects/main/.gitignore similarity index 100% rename from .gitignore rename to projects/main/.gitignore diff --git a/bb.edn b/projects/main/bb.edn similarity index 100% rename from bb.edn rename to projects/main/bb.edn diff --git a/bb/graal_tests.clj b/projects/main/bb/graal_tests.clj similarity index 100% rename from bb/graal_tests.clj rename to projects/main/bb/graal_tests.clj diff --git a/projects/main/jaeger.sh b/projects/main/jaeger.sh new file mode 100755 index 0000000..a7a864c --- /dev/null +++ b/projects/main/jaeger.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +docker run --rm \ + -p 16686:16686 \ + -p 4318:4318 \ + jaegertracing/all-in-one:latest + +open "http://localhost:16686" diff --git a/project.clj b/projects/main/project.clj similarity index 98% rename from project.clj rename to projects/main/project.clj index 1166a15..501644e 100644 --- a/project.clj +++ b/projects/main/project.clj @@ -7,6 +7,8 @@ {:name "Eclipse Public License - v 1.0" :url "https://www.eclipse.org/legal/epl-v10.html"} + :scm {:name "git" :url "https://github.com/taoensso/telemere"} + :dependencies [[com.taoensso/encore "3.117.0-SNAPSHOT"]] diff --git a/public/index.html b/projects/main/public/index.html similarity index 100% rename from public/index.html rename to projects/main/public/index.html diff --git a/resources/signal-docstrings/catch-to-error!.txt b/projects/main/resources/signal-docstrings/catch-to-error!.txt similarity index 100% rename from resources/signal-docstrings/catch-to-error!.txt rename to projects/main/resources/signal-docstrings/catch-to-error!.txt diff --git a/resources/signal-docstrings/environmental-config.txt b/projects/main/resources/signal-docstrings/environmental-config.txt similarity index 100% rename from resources/signal-docstrings/environmental-config.txt rename to projects/main/resources/signal-docstrings/environmental-config.txt diff --git a/resources/signal-docstrings/error!.txt b/projects/main/resources/signal-docstrings/error!.txt similarity index 100% rename from resources/signal-docstrings/error!.txt rename to projects/main/resources/signal-docstrings/error!.txt diff --git a/resources/signal-docstrings/event!.txt b/projects/main/resources/signal-docstrings/event!.txt similarity index 100% rename from resources/signal-docstrings/event!.txt rename to projects/main/resources/signal-docstrings/event!.txt diff --git a/resources/signal-docstrings/log!.txt b/projects/main/resources/signal-docstrings/log!.txt similarity index 100% rename from resources/signal-docstrings/log!.txt rename to projects/main/resources/signal-docstrings/log!.txt diff --git a/resources/signal-docstrings/signal!.txt b/projects/main/resources/signal-docstrings/signal!.txt similarity index 100% rename from resources/signal-docstrings/signal!.txt rename to projects/main/resources/signal-docstrings/signal!.txt diff --git a/resources/signal-docstrings/signal-content.txt b/projects/main/resources/signal-docstrings/signal-content.txt similarity index 100% rename from resources/signal-docstrings/signal-content.txt rename to projects/main/resources/signal-docstrings/signal-content.txt diff --git a/resources/signal-docstrings/signal-creators.txt b/projects/main/resources/signal-docstrings/signal-creators.txt similarity index 100% rename from resources/signal-docstrings/signal-creators.txt rename to projects/main/resources/signal-docstrings/signal-creators.txt diff --git a/resources/signal-docstrings/signal-options.txt b/projects/main/resources/signal-docstrings/signal-options.txt similarity index 100% rename from resources/signal-docstrings/signal-options.txt rename to projects/main/resources/signal-docstrings/signal-options.txt diff --git a/resources/signal-docstrings/spy!.txt b/projects/main/resources/signal-docstrings/spy!.txt similarity index 100% rename from resources/signal-docstrings/spy!.txt rename to projects/main/resources/signal-docstrings/spy!.txt diff --git a/resources/signal-docstrings/trace!.txt b/projects/main/resources/signal-docstrings/trace!.txt similarity index 100% rename from resources/signal-docstrings/trace!.txt rename to projects/main/resources/signal-docstrings/trace!.txt diff --git a/shadow-cljs.edn b/projects/main/shadow-cljs.edn similarity index 100% rename from shadow-cljs.edn rename to projects/main/shadow-cljs.edn diff --git a/shadow-cljs.sh b/projects/main/shadow-cljs.sh similarity index 100% rename from shadow-cljs.sh rename to projects/main/shadow-cljs.sh diff --git a/src/taoensso/telemere.cljc b/projects/main/src/taoensso/telemere.cljc similarity index 100% rename from src/taoensso/telemere.cljc rename to projects/main/src/taoensso/telemere.cljc diff --git a/src/taoensso/telemere/consoles.cljc b/projects/main/src/taoensso/telemere/consoles.cljc similarity index 100% rename from src/taoensso/telemere/consoles.cljc rename to projects/main/src/taoensso/telemere/consoles.cljc diff --git a/src/taoensso/telemere/files.clj b/projects/main/src/taoensso/telemere/files.clj similarity index 100% rename from src/taoensso/telemere/files.clj rename to projects/main/src/taoensso/telemere/files.clj diff --git a/src/taoensso/telemere/impl.cljc b/projects/main/src/taoensso/telemere/impl.cljc similarity index 100% rename from src/taoensso/telemere/impl.cljc rename to projects/main/src/taoensso/telemere/impl.cljc diff --git a/src/taoensso/telemere/open_telemetry.clj b/projects/main/src/taoensso/telemere/open_telemetry.clj similarity index 100% rename from src/taoensso/telemere/open_telemetry.clj rename to projects/main/src/taoensso/telemere/open_telemetry.clj diff --git a/src/taoensso/telemere/postal.clj b/projects/main/src/taoensso/telemere/postal.clj similarity index 100% rename from src/taoensso/telemere/postal.clj rename to projects/main/src/taoensso/telemere/postal.clj diff --git a/src/taoensso/telemere/slack.clj b/projects/main/src/taoensso/telemere/slack.clj similarity index 100% rename from src/taoensso/telemere/slack.clj rename to projects/main/src/taoensso/telemere/slack.clj diff --git a/src/taoensso/telemere/sockets.clj b/projects/main/src/taoensso/telemere/sockets.clj similarity index 100% rename from src/taoensso/telemere/sockets.clj rename to projects/main/src/taoensso/telemere/sockets.clj diff --git a/src/taoensso/telemere/streams.clj b/projects/main/src/taoensso/telemere/streams.clj similarity index 100% rename from src/taoensso/telemere/streams.clj rename to projects/main/src/taoensso/telemere/streams.clj diff --git a/src/taoensso/telemere/timbre.cljc b/projects/main/src/taoensso/telemere/timbre.cljc similarity index 100% rename from src/taoensso/telemere/timbre.cljc rename to projects/main/src/taoensso/telemere/timbre.cljc diff --git a/src/taoensso/telemere/tools_logging.clj b/projects/main/src/taoensso/telemere/tools_logging.clj similarity index 100% rename from src/taoensso/telemere/tools_logging.clj rename to projects/main/src/taoensso/telemere/tools_logging.clj diff --git a/src/taoensso/telemere/utils.cljc b/projects/main/src/taoensso/telemere/utils.cljc similarity index 100% rename from src/taoensso/telemere/utils.cljc rename to projects/main/src/taoensso/telemere/utils.cljc diff --git a/test/taoensso/graal_tests.clj b/projects/main/test/taoensso/graal_tests.clj similarity index 100% rename from test/taoensso/graal_tests.clj rename to projects/main/test/taoensso/graal_tests.clj diff --git a/test/taoensso/telemere_tests.cljc b/projects/main/test/taoensso/telemere_tests.cljc similarity index 100% rename from test/taoensso/telemere_tests.cljc rename to projects/main/test/taoensso/telemere_tests.cljc diff --git a/slf4j/.gitignore b/projects/slf4j/.gitignore similarity index 100% rename from slf4j/.gitignore rename to projects/slf4j/.gitignore diff --git a/slf4j/project.clj b/projects/slf4j/project.clj similarity index 92% rename from slf4j/project.clj rename to projects/slf4j/project.clj index facab8c..509cf06 100644 --- a/slf4j/project.clj +++ b/projects/slf4j/project.clj @@ -7,6 +7,8 @@ {:name "Eclipse Public License - v 1.0" :url "https://www.eclipse.org/legal/epl-v10.html"} + :scm {:name "git" :url "https://github.com/taoensso/telemere"} + :java-source-paths ["src/java"] :javac-options ["--release" "8" "-g"] ; Support Java >= v8 :dependencies [] diff --git a/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/projects/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider similarity index 100% rename from slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider rename to projects/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider diff --git a/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLogger.java b/projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLogger.java similarity index 100% rename from slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLogger.java rename to projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLogger.java diff --git a/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLoggerFactory.java b/projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLoggerFactory.java similarity index 100% rename from slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLoggerFactory.java rename to projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereLoggerFactory.java diff --git a/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereServiceProvider.java b/projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereServiceProvider.java similarity index 100% rename from slf4j/src/java/com/taoensso/telemere/slf4j/TelemereServiceProvider.java rename to projects/slf4j/src/java/com/taoensso/telemere/slf4j/TelemereServiceProvider.java diff --git a/slf4j/src/taoensso/telemere/slf4j.clj b/projects/slf4j/src/taoensso/telemere/slf4j.clj similarity index 100% rename from slf4j/src/taoensso/telemere/slf4j.clj rename to projects/slf4j/src/taoensso/telemere/slf4j.clj