From 3081c83f06d9a65cae1507a5db358df84ed7c192 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 9 Apr 2021 14:30:00 -0400 Subject: [PATCH] Move liblttng-ust-java* to 'src/lib/' Move all public libraries under 'src/lib/'. This is part of an effort to standardize our autotools setup across projects to simplify maintenance. Change-Id: I98ed0e9da28c111e62b189f26b0a225b5aa500e1 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 52 +++++++++---------- configure.ac | 22 ++++---- doc/examples/Makefile.am | 8 +-- doc/examples/java-jul/run | 6 +-- doc/examples/java-log4j/run | 6 +-- src/Makefile.am | 8 --- src/lib/Makefile.am | 8 +++ .../lttng-ust-java-agent}/Makefile.am | 0 .../lttng-ust-java-agent}/java/Makefile.am | 0 .../java/lttng-ust-agent-all/Makefile.am | 0 .../java/lttng-ust-agent-all/Manifest.txt | 0 .../java/lttng-ust-agent-common/Makefile.am | 0 .../java/lttng-ust-agent-common/Manifest.txt | 0 .../lttng/ust/agent/AbstractLttngAgent.java | 0 .../org/lttng/ust/agent/EventNamePattern.java | 0 .../org/lttng/ust/agent/ILttngAgent.java | 0 .../org/lttng/ust/agent/ILttngHandler.java | 0 .../org/lttng/ust/agent/LTTngAgent.java | 0 .../agent/client/ILttngTcpClientListener.java | 0 .../ust/agent/client/LttngAgentResponse.java | 0 .../agent/client/LttngTcpSessiondClient.java | 0 .../ust/agent/client/SessiondCommand.java | 0 .../agent/client/SessiondCommandHeader.java | 0 .../SessiondDisableAppContextCommand.java | 0 .../client/SessiondDisableEventCommand.java | 0 .../SessiondEnableAppContextCommand.java | 0 .../client/SessiondEnableEventCommand.java | 0 .../client/SessiondListLoggersCommand.java | 0 .../ust/agent/context/ContextInfoManager.java | 0 .../agent/context/ContextInfoSerializer.java | 0 .../agent/context/IContextInfoRetriever.java | 0 .../ust/agent/context/LttngContextApi.java | 0 .../agent/filter/FilterChangeNotifier.java | 0 .../agent/filter/IFilterChangeListener.java | 0 .../lttng/ust/agent/session/EventRule.java | 0 .../ust/agent/session/LogLevelSelector.java | 0 .../ust/agent/utils/LttngUstAgentLogger.java | 0 .../java/lttng-ust-agent-jul/Makefile.am | 0 .../java/lttng-ust-agent-jul/Manifest.txt | 0 .../lttng/ust/agent/jul/LttngJulAgent.java | 0 .../org/lttng/ust/agent/jul/LttngJulApi.java | 0 .../lttng/ust/agent/jul/LttngLogHandler.java | 0 .../java/lttng-ust-agent-log4j/Makefile.am | 0 .../java/lttng-ust-agent-log4j/Manifest.txt | 0 .../ust/agent/log4j/LttngLog4jAgent.java | 0 .../lttng/ust/agent/log4j/LttngLog4jApi.java | 0 .../ust/agent/log4j/LttngLogAppender.java | 0 .../lttng-ust-java-agent}/jni/Makefile.am | 0 .../jni/common/Makefile.am | 0 .../jni/common/lttng_ust_context.c | 0 .../jni/common/lttng_ust_context.h | 0 .../lttng-ust-java-agent}/jni/jul/Makefile.am | 2 +- .../jni/jul/lttng_ust_jul.c | 0 .../jni/jul/lttng_ust_jul.h | 0 .../jni/log4j/Makefile.am | 2 +- .../jni/log4j/lttng_ust_log4j.c | 0 .../jni/log4j/lttng_ust_log4j.h | 0 .../lttng-ust-java}/.gitignore | 0 .../lttng-ust-java}/LTTngUst.c | 0 .../lttng-ust-java}/Makefile.am | 0 .../lttng-ust-java}/README | 0 .../lttng-ust-java}/lttng_ust_java.h | 0 .../org/lttng/ust/LTTngUst.java | 0 63 files changed, 57 insertions(+), 57 deletions(-) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/Makefile.am (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/Makefile.am (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-all/Makefile.am (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-all/Manifest.txt (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/Makefile.am (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/Manifest.txt (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-jul/Makefile.am (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-jul/Manifest.txt (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-log4j/Makefile.am (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-log4j/Manifest.txt (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/Makefile.am (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/common/Makefile.am (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/common/lttng_ust_context.c (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/common/lttng_ust_context.h (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/jul/Makefile.am (81%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/jul/lttng_ust_jul.c (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/jul/lttng_ust_jul.h (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/log4j/Makefile.am (82%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/log4j/lttng_ust_log4j.c (100%) rename src/{liblttng-ust-java-agent => lib/lttng-ust-java-agent}/jni/log4j/lttng_ust_log4j.h (100%) rename src/{liblttng-ust-java => lib/lttng-ust-java}/.gitignore (100%) rename src/{liblttng-ust-java => lib/lttng-ust-java}/LTTngUst.c (100%) rename src/{liblttng-ust-java => lib/lttng-ust-java}/Makefile.am (100%) rename src/{liblttng-ust-java => lib/lttng-ust-java}/README (100%) rename src/{liblttng-ust-java => lib/lttng-ust-java}/lttng_ust_java.h (100%) rename src/{liblttng-ust-java => lib/lttng-ust-java}/org/lttng/ust/LTTngUst.java (100%) diff --git a/.gitignore b/.gitignore index 88f36282..0ad9442d 100644 --- a/.gitignore +++ b/.gitignore @@ -93,21 +93,21 @@ cscope.* /tests/unit/ust-utils/test_ust_utils_cxx # Java agent library -/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/*.jar -/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/classnoinst.stamp -/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/context-jni-header.stamp -/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/*.jar -/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/classnoinst.stamp -/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/jul-jni-header.stamp -/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/*.jar -/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/classnoinst.stamp -/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/log4j-jni-header.stamp -/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/*.jar -/src/liblttng-ust-java-agent/jni/common/org_lttng_ust_agent_context_LttngContextApi.h -/src/liblttng-ust-java-agent/jni/jul/org_lttng_ust_agent_jul_LttngJulApi.h -/src/liblttng-ust-java-agent/jni/log4j/org_lttng_ust_agent_log4j_LttngLog4jApi.h -/src/liblttng-ust-java/classnoinst.stamp -/src/liblttng-ust-java/jni-header.stamp +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/*.jar +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/classnoinst.stamp +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/context-jni-header.stamp +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/*.jar +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/classnoinst.stamp +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/jul-jni-header.stamp +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/*.jar +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/classnoinst.stamp +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/log4j-jni-header.stamp +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/*.jar +/src/lib/lttng-ust-java-agent/jni/common/org_lttng_ust_agent_context_LttngContextApi.h +/src/lib/lttng-ust-java-agent/jni/jul/org_lttng_ust_agent_jul_LttngJulApi.h +/src/lib/lttng-ust-java-agent/jni/log4j/org_lttng_ust_agent_log4j_LttngLog4jApi.h +/src/lib/lttng-ust-java/classnoinst.stamp +/src/lib/lttng-ust-java/jni-header.stamp # Python agent /src/python-lttngust/lttngust/version.py @@ -132,17 +132,17 @@ cscope.* /src/lib/lttng-ust-dl/Makefile /src/lib/lttng-ust-fd/Makefile /src/lib/lttng-ust-fork/Makefile -/src/liblttng-ust-java-agent/Makefile -/src/liblttng-ust-java-agent/java/Makefile -/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile -/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile -/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile -/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile -/src/liblttng-ust-java-agent/jni/Makefile -/src/liblttng-ust-java-agent/jni/common/Makefile -/src/liblttng-ust-java-agent/jni/jul/Makefile -/src/liblttng-ust-java-agent/jni/log4j/Makefile -/src/liblttng-ust-java/Makefile +/src/lib/lttng-ust-java-agent/Makefile +/src/lib/lttng-ust-java-agent/java/Makefile +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Makefile +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile +/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile +/src/lib/lttng-ust-java-agent/jni/Makefile +/src/lib/lttng-ust-java-agent/jni/common/Makefile +/src/lib/lttng-ust-java-agent/jni/jul/Makefile +/src/lib/lttng-ust-java-agent/jni/log4j/Makefile +/src/lib/lttng-ust-java/Makefile /src/lib/lttng-ust-libc-wrapper/Makefile /src/lib/lttng-ust-python-agent/Makefile /src/lib/Makefile diff --git a/configure.ac b/configure.ac index 8b6fb562..d705ecb6 100644 --- a/configure.ac +++ b/configure.ac @@ -526,17 +526,17 @@ AC_CONFIG_FILES([ src/lib/lttng-ust-dl/Makefile src/lib/lttng-ust-fd/Makefile src/lib/lttng-ust-fork/Makefile - src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile - src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile - src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile - src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile - src/liblttng-ust-java-agent/java/Makefile - src/liblttng-ust-java-agent/jni/common/Makefile - src/liblttng-ust-java-agent/jni/jul/Makefile - src/liblttng-ust-java-agent/jni/log4j/Makefile - src/liblttng-ust-java-agent/jni/Makefile - src/liblttng-ust-java-agent/Makefile - src/liblttng-ust-java/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile + src/lib/lttng-ust-java-agent/java/Makefile + src/lib/lttng-ust-java-agent/jni/common/Makefile + src/lib/lttng-ust-java-agent/jni/jul/Makefile + src/lib/lttng-ust-java-agent/jni/log4j/Makefile + src/lib/lttng-ust-java-agent/jni/Makefile + src/lib/lttng-ust-java-agent/Makefile + src/lib/lttng-ust-java/Makefile src/lib/lttng-ust-libc-wrapper/Makefile src/liblttng-ust/Makefile src/lib/lttng-ust-python-agent/Makefile diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 06e40662..ce517922 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -155,8 +155,8 @@ all-local: cd $$subdir && \ $(MAKE) all \ CLASSPATH="$(CLASSPATH)" \ - JAVA_CLASSPATH_OVERRIDE_JUL="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-jul" \ - JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-common" \ + JAVA_CLASSPATH_OVERRIDE_JUL="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul" \ + JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common" \ $(AM_MAKEFLAGS) \ ) || exit 1; \ done; \ @@ -167,8 +167,8 @@ all-local: cd $$subdir && \ $(MAKE) all \ CLASSPATH="$(CLASSPATH)" \ - JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j" \ - JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-common" \ + JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j" \ + JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common" \ $(AM_MAKEFLAGS) \ ) || exit 1; \ done; \ diff --git a/doc/examples/java-jul/run b/doc/examples/java-jul/run index 03a5fd6f..911b04ca 100755 --- a/doc/examples/java-jul/run +++ b/doc/examples/java-jul/run @@ -15,9 +15,9 @@ JAVA_OPTIONS="" cd $DIR if [ -f "$DIR/.intree" ]; then - CLASSPATH="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON" - CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-jul/$JARFILE_JUL" - LIBPATH="../../../liblttng-ust-java-agent/jni/jul/.libs" + CLASSPATH="../../../lib/lttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON" + CLASSPATH="$CLASSPATH:../../../lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/$JARFILE_JUL" + LIBPATH="../../../lib/lttng-ust-java-agent/jni/jul/.libs" else CLASSPATH="/usr/local/share/java/$JARFILE_COMMON:/usr/share/java/$JARFILE_COMMON" CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_JUL:/usr/share/java/$JARFILE_JUL" diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run index 056ea67f..d6e5afa4 100755 --- a/doc/examples/java-log4j/run +++ b/doc/examples/java-log4j/run @@ -21,9 +21,9 @@ fi cd $DIR if [ -f "$DIR/.intree" ]; then - CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON" - CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j/$JARFILE_LOG4J" - LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs" + CLASSPATH="$CLASSPATH:../../../lib/lttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON" + CLASSPATH="$CLASSPATH:../../../lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/$JARFILE_LOG4J" + LIBPATH="../../../lib/lttng-ust-java-agent/jni/log4j/.libs" else CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_COMMON:/usr/share/java/$JARFILE_COMMON" CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_LOG4J:/usr/share/java/$JARFILE_LOG4J" diff --git a/src/Makefile.am b/src/Makefile.am index f51694ec..7facaf2b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,14 +9,6 @@ SUBDIRS = \ liblttng-ust-ctl \ lib -if ENABLE_JNI_INTERFACE -SUBDIRS += liblttng-ust-java -endif - -if ENABLE_JAVA_AGENT -SUBDIRS += liblttng-ust-java-agent -endif - if ENABLE_PYTHON_AGENT SUBDIRS += python-lttngust endif diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 0b33906e..ec0b4538 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -10,6 +10,14 @@ if ENABLE_UST_DL SUBDIRS += lttng-ust-dl endif +if ENABLE_JNI_INTERFACE +SUBDIRS += lttng-ust-java +endif + +if ENABLE_JAVA_AGENT +SUBDIRS += lttng-ust-java-agent +endif + if ENABLE_PYTHON_AGENT SUBDIRS += lttng-ust-python-agent endif diff --git a/src/liblttng-ust-java-agent/Makefile.am b/src/lib/lttng-ust-java-agent/Makefile.am similarity index 100% rename from src/liblttng-ust-java-agent/Makefile.am rename to src/lib/lttng-ust-java-agent/Makefile.am diff --git a/src/liblttng-ust-java-agent/java/Makefile.am b/src/lib/lttng-ust-java-agent/java/Makefile.am similarity index 100% rename from src/liblttng-ust-java-agent/java/Makefile.am rename to src/lib/lttng-ust-java-agent/java/Makefile.am diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Manifest.txt b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Manifest.txt similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Manifest.txt rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Manifest.txt diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Manifest.txt b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Manifest.txt similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Manifest.txt rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Manifest.txt diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Manifest.txt b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Manifest.txt similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Manifest.txt rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Manifest.txt diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java diff --git a/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java similarity index 100% rename from src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java rename to src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java diff --git a/src/liblttng-ust-java-agent/jni/Makefile.am b/src/lib/lttng-ust-java-agent/jni/Makefile.am similarity index 100% rename from src/liblttng-ust-java-agent/jni/Makefile.am rename to src/lib/lttng-ust-java-agent/jni/Makefile.am diff --git a/src/liblttng-ust-java-agent/jni/common/Makefile.am b/src/lib/lttng-ust-java-agent/jni/common/Makefile.am similarity index 100% rename from src/liblttng-ust-java-agent/jni/common/Makefile.am rename to src/lib/lttng-ust-java-agent/jni/common/Makefile.am diff --git a/src/liblttng-ust-java-agent/jni/common/lttng_ust_context.c b/src/lib/lttng-ust-java-agent/jni/common/lttng_ust_context.c similarity index 100% rename from src/liblttng-ust-java-agent/jni/common/lttng_ust_context.c rename to src/lib/lttng-ust-java-agent/jni/common/lttng_ust_context.c diff --git a/src/liblttng-ust-java-agent/jni/common/lttng_ust_context.h b/src/lib/lttng-ust-java-agent/jni/common/lttng_ust_context.h similarity index 100% rename from src/liblttng-ust-java-agent/jni/common/lttng_ust_context.h rename to src/lib/lttng-ust-java-agent/jni/common/lttng_ust_context.h diff --git a/src/liblttng-ust-java-agent/jni/jul/Makefile.am b/src/lib/lttng-ust-java-agent/jni/jul/Makefile.am similarity index 81% rename from src/liblttng-ust-java-agent/jni/jul/Makefile.am rename to src/lib/lttng-ust-java-agent/jni/jul/Makefile.am index 32089ae3..295b033d 100644 --- a/src/liblttng-ust-java-agent/jni/jul/Makefile.am +++ b/src/lib/lttng-ust-java-agent/jni/jul/Makefile.am @@ -10,4 +10,4 @@ nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngJulApi.h liblttng_ust_jul_jni_la_LIBADD = -lc \ $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ - $(top_builddir)/src/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la + $(top_builddir)/src/lib/lttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la diff --git a/src/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.c similarity index 100% rename from src/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c rename to src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.c diff --git a/src/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h similarity index 100% rename from src/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h rename to src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h diff --git a/src/liblttng-ust-java-agent/jni/log4j/Makefile.am b/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am similarity index 82% rename from src/liblttng-ust-java-agent/jni/log4j/Makefile.am rename to src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am index 383bb9cb..029462e9 100644 --- a/src/liblttng-ust-java-agent/jni/log4j/Makefile.am +++ b/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am @@ -10,4 +10,4 @@ nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLog4jA liblttng_ust_log4j_jni_la_LIBADD = -lc \ $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ - $(top_builddir)/src/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la + $(top_builddir)/src/lib/lttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la diff --git a/src/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c similarity index 100% rename from src/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c rename to src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c diff --git a/src/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h similarity index 100% rename from src/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h rename to src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h diff --git a/src/liblttng-ust-java/.gitignore b/src/lib/lttng-ust-java/.gitignore similarity index 100% rename from src/liblttng-ust-java/.gitignore rename to src/lib/lttng-ust-java/.gitignore diff --git a/src/liblttng-ust-java/LTTngUst.c b/src/lib/lttng-ust-java/LTTngUst.c similarity index 100% rename from src/liblttng-ust-java/LTTngUst.c rename to src/lib/lttng-ust-java/LTTngUst.c diff --git a/src/liblttng-ust-java/Makefile.am b/src/lib/lttng-ust-java/Makefile.am similarity index 100% rename from src/liblttng-ust-java/Makefile.am rename to src/lib/lttng-ust-java/Makefile.am diff --git a/src/liblttng-ust-java/README b/src/lib/lttng-ust-java/README similarity index 100% rename from src/liblttng-ust-java/README rename to src/lib/lttng-ust-java/README diff --git a/src/liblttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h similarity index 100% rename from src/liblttng-ust-java/lttng_ust_java.h rename to src/lib/lttng-ust-java/lttng_ust_java.h diff --git a/src/liblttng-ust-java/org/lttng/ust/LTTngUst.java b/src/lib/lttng-ust-java/org/lttng/ust/LTTngUst.java similarity index 100% rename from src/liblttng-ust-java/org/lttng/ust/LTTngUst.java rename to src/lib/lttng-ust-java/org/lttng/ust/LTTngUst.java -- 2.34.1