diff --git a/eftl/sdk/golang/conn.go b/eftl/sdk/golang/eftl/conn.go similarity index 100% rename from eftl/sdk/golang/conn.go rename to eftl/sdk/golang/eftl/conn.go diff --git a/eftl/sdk/golang/eftl.go b/eftl/sdk/golang/eftl/eftl.go similarity index 100% rename from eftl/sdk/golang/eftl.go rename to eftl/sdk/golang/eftl/eftl.go diff --git a/eftl/sdk/golang/example_test.go b/eftl/sdk/golang/eftl/example_test.go similarity index 98% rename from eftl/sdk/golang/example_test.go rename to eftl/sdk/golang/eftl/example_test.go index e5b6054..ef06a67 100755 --- a/eftl/sdk/golang/example_test.go +++ b/eftl/sdk/golang/eftl/example_test.go @@ -11,7 +11,7 @@ import ( "fmt" "time" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) // Connect to the server. @@ -230,12 +230,12 @@ func ExampleConnection_SendRequest() { defer conn.Disconnect() // publish a request message and wait for a reply. - reply, err = conn.SendRequest(eftl.Message{ + reply, err := conn.SendRequest(eftl.Message{ "type": "request", "text": "this is a request message", }, 10*time.Second) if err == eftl.ErrTimeout { - fmt.Println("request failed:", timeout) + fmt.Println("request timeout") } else if err != nil { fmt.Println("request failed:", err) } else { diff --git a/eftl/sdk/golang/examples/kvget/kvget.go b/eftl/sdk/golang/eftl/examples/kvget/kvget.go similarity index 89% rename from eftl/sdk/golang/examples/kvget/kvget.go rename to eftl/sdk/golang/eftl/examples/kvget/kvget.go index 5c733f2..33a154b 100644 --- a/eftl/sdk/golang/examples/kvget/kvget.go +++ b/eftl/sdk/golang/eftl/examples/kvget/kvget.go @@ -13,7 +13,7 @@ import ( "log" "os" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -32,7 +32,7 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // set connection options opts := eftl.DefaultOptions() diff --git a/eftl/sdk/golang/examples/kvremove/kvremove.go b/eftl/sdk/golang/eftl/examples/kvremove/kvremove.go similarity index 88% rename from eftl/sdk/golang/examples/kvremove/kvremove.go rename to eftl/sdk/golang/eftl/examples/kvremove/kvremove.go index a2cb49c..29a4cd5 100644 --- a/eftl/sdk/golang/examples/kvremove/kvremove.go +++ b/eftl/sdk/golang/eftl/examples/kvremove/kvremove.go @@ -13,7 +13,7 @@ import ( "log" "os" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -32,7 +32,7 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // set connection options opts := eftl.DefaultOptions() diff --git a/eftl/sdk/golang/examples/kvset/kvset.go b/eftl/sdk/golang/eftl/examples/kvset/kvset.go similarity index 89% rename from eftl/sdk/golang/examples/kvset/kvset.go rename to eftl/sdk/golang/eftl/examples/kvset/kvset.go index 931a0d2..3cdcc2a 100644 --- a/eftl/sdk/golang/examples/kvset/kvset.go +++ b/eftl/sdk/golang/eftl/examples/kvset/kvset.go @@ -14,7 +14,7 @@ import ( "os" "time" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -33,7 +33,7 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // set connection options opts := eftl.DefaultOptions() diff --git a/eftl/sdk/golang/examples/lastValueSubscriber/lastValueSubscriber.go b/eftl/sdk/golang/eftl/examples/lastValueSubscriber/lastValueSubscriber.go similarity index 93% rename from eftl/sdk/golang/examples/lastValueSubscriber/lastValueSubscriber.go rename to eftl/sdk/golang/eftl/examples/lastValueSubscriber/lastValueSubscriber.go index 692ed88..172aab3 100644 --- a/eftl/sdk/golang/examples/lastValueSubscriber/lastValueSubscriber.go +++ b/eftl/sdk/golang/eftl/examples/lastValueSubscriber/lastValueSubscriber.go @@ -14,7 +14,7 @@ import ( "log" "os" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -33,7 +33,7 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // channel for receiving connection errors errChan := make(chan error, 1) diff --git a/eftl/sdk/golang/examples/publisher/publisher.go b/eftl/sdk/golang/eftl/examples/publisher/publisher.go similarity index 92% rename from eftl/sdk/golang/examples/publisher/publisher.go rename to eftl/sdk/golang/eftl/examples/publisher/publisher.go index 2d66a0f..8ca319c 100644 --- a/eftl/sdk/golang/examples/publisher/publisher.go +++ b/eftl/sdk/golang/eftl/examples/publisher/publisher.go @@ -14,7 +14,7 @@ import ( "os" "time" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -33,7 +33,7 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // channel for receiving connection errors errChan := make(chan error, 1) diff --git a/eftl/sdk/golang/examples/reply/reply.go b/eftl/sdk/golang/eftl/examples/reply/reply.go similarity index 93% rename from eftl/sdk/golang/examples/reply/reply.go rename to eftl/sdk/golang/eftl/examples/reply/reply.go index 6235e11..dc4bd21 100644 --- a/eftl/sdk/golang/examples/reply/reply.go +++ b/eftl/sdk/golang/eftl/examples/reply/reply.go @@ -14,7 +14,7 @@ import ( "log" "os" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -31,7 +31,7 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // channel for receiving connection errors errChan := make(chan error, 1) diff --git a/eftl/sdk/golang/examples/request/request.go b/eftl/sdk/golang/eftl/examples/request/request.go similarity index 90% rename from eftl/sdk/golang/examples/request/request.go rename to eftl/sdk/golang/eftl/examples/request/request.go index 976cb40..93874f6 100644 --- a/eftl/sdk/golang/examples/request/request.go +++ b/eftl/sdk/golang/eftl/examples/request/request.go @@ -15,7 +15,7 @@ import ( "os" "time" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -32,7 +32,7 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // channel for receiving connection errors errChan := make(chan error, 1) diff --git a/eftl/sdk/golang/examples/sharedSubscriber/sharedSubscriber.go b/eftl/sdk/golang/eftl/examples/sharedSubscriber/sharedSubscriber.go similarity index 93% rename from eftl/sdk/golang/examples/sharedSubscriber/sharedSubscriber.go rename to eftl/sdk/golang/eftl/examples/sharedSubscriber/sharedSubscriber.go index 3040462..c5699fd 100644 --- a/eftl/sdk/golang/examples/sharedSubscriber/sharedSubscriber.go +++ b/eftl/sdk/golang/eftl/examples/sharedSubscriber/sharedSubscriber.go @@ -14,7 +14,7 @@ import ( "log" "os" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -33,7 +33,7 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // channel for receiving connection errors errChan := make(chan error, 1) diff --git a/eftl/sdk/golang/examples/subscriber/subscriber.go b/eftl/sdk/golang/eftl/examples/subscriber/subscriber.go similarity index 91% rename from eftl/sdk/golang/examples/subscriber/subscriber.go rename to eftl/sdk/golang/eftl/examples/subscriber/subscriber.go index 97af204..0bd5d72 100644 --- a/eftl/sdk/golang/examples/subscriber/subscriber.go +++ b/eftl/sdk/golang/eftl/examples/subscriber/subscriber.go @@ -13,7 +13,7 @@ import ( "log" "os" - "tibco.com/eftl" + "github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl" ) var ( @@ -34,11 +34,11 @@ func main() { if len(os.Args) > 1 { url = os.Args[1] } - log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) + log.Printf("%s : TIBCO eFTL Version: %s\n", os.Args[0], eftl.Version) // set the log level log file - eftl.SetLogLevel(eftl.LogLevelDebug) - eftl.SetLogFile("subscriber.log") + eftl.SetLogLevel(eftl.LogLevelDebug) + eftl.SetLogFile("subscriber.log") // channel for receiving connection errors errChan := make(chan error, 1) diff --git a/eftl/sdk/golang/eftl/go.mod b/eftl/sdk/golang/eftl/go.mod new file mode 100644 index 0000000..c1c63d5 --- /dev/null +++ b/eftl/sdk/golang/eftl/go.mod @@ -0,0 +1,8 @@ +module github.com/TIBCOSoftware/TIBCO-Messaging/eftl/sdk/golang/eftl + +go 1.17 + +require ( + github.com/gorilla/websocket v1.5.0 + github.com/rs/zerolog v1.26.1 +) diff --git a/eftl/sdk/golang/go.sum b/eftl/sdk/golang/eftl/go.sum similarity index 100% rename from eftl/sdk/golang/go.sum rename to eftl/sdk/golang/eftl/go.sum diff --git a/eftl/sdk/golang/kvmap.go b/eftl/sdk/golang/eftl/kvmap.go similarity index 100% rename from eftl/sdk/golang/kvmap.go rename to eftl/sdk/golang/eftl/kvmap.go diff --git a/eftl/sdk/golang/msg.go b/eftl/sdk/golang/eftl/msg.go similarity index 100% rename from eftl/sdk/golang/msg.go rename to eftl/sdk/golang/eftl/msg.go diff --git a/eftl/sdk/golang/readme.txt b/eftl/sdk/golang/eftl/readme.txt similarity index 100% rename from eftl/sdk/golang/readme.txt rename to eftl/sdk/golang/eftl/readme.txt diff --git a/eftl/sdk/golang/go.mod b/eftl/sdk/golang/go.mod deleted file mode 100644 index 91803ef..0000000 --- a/eftl/sdk/golang/go.mod +++ /dev/null @@ -1,11 +0,0 @@ -module eftl - -go 1.17 - -replace tibco.com/eftl => ../eftl - -require ( - github.com/gorilla/websocket v1.5.0 - github.com/rs/zerolog v1.26.1 - tibco.com/eftl v0.0.0-00010101000000-000000000000 -)