diff --git a/src/java/kafkabridge/pom.xml b/src/java/kafkabridge/pom.xml index 4352ab52b9..121b98a87e 100644 --- a/src/java/kafkabridge/pom.xml +++ b/src/java/kafkabridge/pom.xml @@ -9,7 +9,7 @@ mases.kafkabridge Apache Kafka interface bridging implementation https://github.com/masesgroup/KafkaBridge - 1.1.2.0 + 1.1.3.0 diff --git a/src/net/KafkaBridge/InternalConst.cs b/src/net/KafkaBridge/InternalConst.cs index 3ad32e0910..2a8570c53a 100644 --- a/src/net/KafkaBridge/InternalConst.cs +++ b/src/net/KafkaBridge/InternalConst.cs @@ -17,6 +17,7 @@ */ using System; +using System.IO; namespace MASES.KafkaBridge { @@ -34,6 +35,10 @@ class CLIParam /// public class Const { + /// + /// The location of this assembly + /// + public static readonly string AssemblyLocation = Path.GetDirectoryName(typeof(Const).Assembly.Location); /// /// Default Scala version /// @@ -41,11 +46,11 @@ public class Const /// /// Default root path, i.e. consider installation within bin folder /// - public const string DefaultRootPath = "./jars"; + public static readonly string DefaultRootPath = Path.Combine(AssemblyLocation, "jars") + Path.DirectorySeparatorChar; /// /// Default log4j path, i.e. consider installation within bin folder /// - public const string DefaultLog4JPath = "./config/log4j.properties"; + public static readonly string DefaultLog4JPath = Path.Combine(AssemblyLocation, "config", "log4j.properties"); } class InternalConst diff --git a/src/net/KafkaBridge/KafkaBridge.csproj b/src/net/KafkaBridge/KafkaBridge.csproj index 98c0b84e62..3e0304c1d0 100644 --- a/src/net/KafkaBridge/KafkaBridge.csproj +++ b/src/net/KafkaBridge/KafkaBridge.csproj @@ -8,7 +8,7 @@ MASES s.r.l. MASES s.r.l. MASES s.r.l. - 1.1.2.0 + 1.1.3.0 KafkaBridge true net461;netcoreapp3.1;net5.0;net5.0-windows;net6.0;net6.0-windows @@ -20,7 +20,7 @@ https://github.com/masesgroup/KafkaBridge/releases LICENSE JCOB128x128.png - kafka apache-kafka dotnet clr netcore net5 net6 + kafka apache-kafka dotnet clr netcore net5 net6 kafka connect streams producer consumer providers streamprovider confluent MASES.KafkaBridge true snupkg @@ -54,7 +54,7 @@ - + diff --git a/src/net/KafkaBridge/KafkaBridgeCore.cs b/src/net/KafkaBridge/KafkaBridgeCore.cs index 65238ecf84..b264ad6b1a 100644 --- a/src/net/KafkaBridge/KafkaBridgeCore.cs +++ b/src/net/KafkaBridge/KafkaBridgeCore.cs @@ -315,10 +315,9 @@ protected virtual IDictionary Options { "-Dcom.sun.management.jmxremote", null }, { "com.sun.management.jmxremote.authenticate", "false" }, { "com.sun.management.jmxremote.ssl", "false" }, - { "log4j.configuration", Log4JOpts}, + { "log4j.configuration", string.IsNullOrEmpty(GlobalLog4JPath) ? ((GlobalRootPath == Const.DefaultRootPath) ? Log4JOpts : null) : $"file:{GlobalLog4JPath}"}, { "kafka.logs.dir", LogDir}, { "-Xmx" + GlobalHeapSize, null}, - { "log4j.configuration", $"file:{GlobalLog4JPath}"}, }; if (!string.IsNullOrEmpty(InitialHeapSize)) @@ -349,8 +348,12 @@ protected virtual IDictionary Options string buildClassPath() { +#if DEBUG + Console.WriteLine("RootPath is: {0}", RootPath); +#endif + classPath = string.Empty; - buildClassPath(GlobalRootPath); + buildClassPath(RootPath, "*.jar"); buildClassPath(CoreDependenciesPath); buildClassPath(ExamplesPath); buildClassPath(ClientsPath); @@ -374,13 +377,19 @@ string buildClassPath() classPath += !string.IsNullOrEmpty(ExtraClassPath) ? InternalConst.PathSeparator + ExtraClassPath : string.Empty; +#if DEBUG + Console.WriteLine("ClassPath is: {0}", classPath); +#endif return classPath; } - string buildClassPath(string path) + string buildClassPath(string path, string pattern = null) { var folder = Path.GetDirectoryName(path); - var pattern = Path.GetFileName(path); + if (pattern == null) pattern = Path.GetFileName(path); +#if DEBUG + Console.WriteLine("Search on {0} with pattern {1}", folder, pattern); +#endif if (Directory.Exists(folder)) { foreach (var item in Directory.GetFiles(folder, pattern, SearchOption.TopDirectoryOnly)) diff --git a/src/net/KafkaBridge/mases.kafkabridge.targets b/src/net/KafkaBridge/mases.kafkabridge.targets index cd50189d66..eb21a972ea 100644 --- a/src/net/KafkaBridge/mases.kafkabridge.targets +++ b/src/net/KafkaBridge/mases.kafkabridge.targets @@ -10,4 +10,10 @@ - \ No newline at end of file + + + + + + + diff --git a/src/net/KafkaBridgeCLI/KafkaBridgeCLI.csproj b/src/net/KafkaBridgeCLI/KafkaBridgeCLI.csproj index 3f0e2dd190..55f13e6680 100644 --- a/src/net/KafkaBridgeCLI/KafkaBridgeCLI.csproj +++ b/src/net/KafkaBridgeCLI/KafkaBridgeCLI.csproj @@ -9,7 +9,7 @@ MASES s.r.l. MASES s.r.l. MASES s.r.l. - 1.1.2.0 + 1.1.3.0 KafkaBridgeCLI true net461;netcoreapp3.1;net5.0;net5.0-windows;net6.0;net6.0-windows @@ -21,7 +21,7 @@ https://github.com/masesgroup/KafkaBridge/releases LICENSE JCOB128x128.png - kafka apache-kafka dotnet clr netcore net5 net6 + kafka apache-kafka dotnet clr netcore net5 net6 kafka connect streams producer consumer providers streamprovider confluent MASES.KafkaBridgeCLI true snupkg diff --git a/src/net/templates/templatepack.csproj b/src/net/templates/templatepack.csproj index f097de1c85..fa3a250ee0 100644 --- a/src/net/templates/templatepack.csproj +++ b/src/net/templates/templatepack.csproj @@ -1,7 +1,7 @@ Template - 1.1.2.0 + 1.1.3.0 MASES.KafkaBridge.Templates KafkaBridge Templates - Templates to use the KafkaBridge MASES s.r.l. @@ -19,7 +19,7 @@ https://github.com/masesgroup/KafkaBridge/releases LICENSE JCOB128x128.png - kafka apache-kafka dotnet clr netcore net5 net6 template + kafka apache-kafka dotnet clr netcore net5 net6 template kafka connect streams producer consumer providers streamprovider confluent 8.0 KafkaBridge Templates true diff --git a/src/net/templates/templates/kafkabridgeConsumerApp/Program.cs b/src/net/templates/templates/kafkabridgeConsumerApp/Program.cs index ec1827dc34..4afb684fb1 100644 --- a/src/net/templates/templates/kafkabridgeConsumerApp/Program.cs +++ b/src/net/templates/templates/kafkabridgeConsumerApp/Program.cs @@ -22,6 +22,8 @@ static void Main(string[] args) serverToUse = args[0]; } + Console.WriteLine("Server in use {0}", serverToUse); + Properties props = new Properties(); props.Put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, serverToUse); props.Put(ConsumerConfig.GROUP_ID_CONFIG, "test"); diff --git a/src/net/templates/templates/kafkabridgeConsumerApp/kafkabridgeConsumerApp.csproj b/src/net/templates/templates/kafkabridgeConsumerApp/kafkabridgeConsumerApp.csproj index ea9c8e188c..eb886de593 100644 --- a/src/net/templates/templates/kafkabridgeConsumerApp/kafkabridgeConsumerApp.csproj +++ b/src/net/templates/templates/kafkabridgeConsumerApp/kafkabridgeConsumerApp.csproj @@ -13,6 +13,8 @@ - + + + diff --git a/src/net/templates/templates/kafkabridgePipeStreamApp/Program.cs b/src/net/templates/templates/kafkabridgePipeStreamApp/Program.cs index c85bef13ee..4f7917e90d 100644 --- a/src/net/templates/templates/kafkabridgePipeStreamApp/Program.cs +++ b/src/net/templates/templates/kafkabridgePipeStreamApp/Program.cs @@ -24,6 +24,8 @@ static void Main(string[] args) serverToUse = args[0]; } + Console.WriteLine("Server in use {0}", serverToUse); + var props = new Properties(); props.Put(StreamsConfig.APPLICATION_ID_CONFIG, "streams-pipe"); diff --git a/src/net/templates/templates/kafkabridgePipeStreamApp/kafkabridgePipeStreamApp.csproj b/src/net/templates/templates/kafkabridgePipeStreamApp/kafkabridgePipeStreamApp.csproj index ea9c8e188c..eb886de593 100644 --- a/src/net/templates/templates/kafkabridgePipeStreamApp/kafkabridgePipeStreamApp.csproj +++ b/src/net/templates/templates/kafkabridgePipeStreamApp/kafkabridgePipeStreamApp.csproj @@ -13,6 +13,8 @@ - + + + diff --git a/src/net/templates/templates/kafkabridgeProducerApp/Program.cs b/src/net/templates/templates/kafkabridgeProducerApp/Program.cs index a41e495335..c2c12372c9 100644 --- a/src/net/templates/templates/kafkabridgeProducerApp/Program.cs +++ b/src/net/templates/templates/kafkabridgeProducerApp/Program.cs @@ -22,6 +22,8 @@ static void Main(string[] args) serverToUse = args[0]; } + Console.WriteLine("Server in use {0}", serverToUse); + Properties props = new Properties(); props.Put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, serverToUse); props.Put(ProducerConfig.ACKS_CONFIG, "all"); diff --git a/src/net/templates/templates/kafkabridgeProducerApp/kafkabridgeProducerApp.csproj b/src/net/templates/templates/kafkabridgeProducerApp/kafkabridgeProducerApp.csproj index ea9c8e188c..eb886de593 100644 --- a/src/net/templates/templates/kafkabridgeProducerApp/kafkabridgeProducerApp.csproj +++ b/src/net/templates/templates/kafkabridgeProducerApp/kafkabridgeProducerApp.csproj @@ -13,6 +13,8 @@ - + + +