changed directory name

diff --git a/Makefile b/Makefile
index 316a7303bdfa5c779e2f71d57103adb925fd2bda..3f556676e0854dc5a5d003a96c21096ac8249992 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ GO_LDFLAGS  := -ldflags '-extldflags "-static"'
 BINARY_FILE    := edge-orchestration
 OBJECT_FILE            := orchestration.so
 HEADER_FILE            := orchestration.h
-EXEC_SRC_DIR    := orchestration
+EXEC_SRC_DIR    := GoMain
 OBJ_SRC_DIR            := interface
 BIN_DIR        := $(BASE_DIR)/bin
 CMAIN_DIR              := $(BASE_DIR)/src/main-c
-PKG_DIRS               := devicemgr discoverymgr interface orchestration restapi/v1 servicemgr
+PKG_DIRS               := devicemgr discoverymgr interface restapi/v1 servicemgr
 
 .DEFAULT_GOAL := help
 

diff --git a/src/CMain/orchestration.h b/src/CMain/orchestration.h
new file mode 100644 (file)
index 0000000..50bfb22
--- /dev/null
+++ b/src/CMain/orchestration.h
@@ -0,0 +1,74 @@
+/* Code generated by cmd/cgo; DO NOT EDIT. */
+
+/* package interface */
+
+
+#line 1 "cgo-builtin-prolog"
+
+#include <stddef.h> /* for ptrdiff_t below */
+
+#ifndef GO_CGO_EXPORT_PROLOGUE_H
+#define GO_CGO_EXPORT_PROLOGUE_H
+
+typedef struct { const char *p; ptrdiff_t n; } _GoString_;
+
+#endif
+
+/* Start of preamble from import "C" comments.  */
+
+
+
+
+/* End of preamble from import "C" comments.  */
+
+
+/* Start of boilerplate cgo prologue.  */
+#line 1 "cgo-gcc-export-header-prolog"
+
+#ifndef GO_CGO_PROLOGUE_H
+#define GO_CGO_PROLOGUE_H
+
+typedef signed char GoInt8;
+typedef unsigned char GoUint8;
+typedef short GoInt16;
+typedef unsigned short GoUint16;
+typedef int GoInt32;
+typedef unsigned int GoUint32;
+typedef long long GoInt64;
+typedef unsigned long long GoUint64;
+typedef GoInt64 GoInt;
+typedef GoUint64 GoUint;
+typedef __SIZE_TYPE__ GoUintptr;
+typedef float GoFloat32;
+typedef double GoFloat64;
+typedef float _Complex GoComplex64;
+typedef double _Complex GoComplex128;
+
+/*
+  static assertion to make sure the file is being used on architecture
+  at least with matching size of GoInt.
+*/
+typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
+
+typedef _GoString_ GoString;
+typedef void *GoMap;
+typedef void *GoChan;
+typedef struct { void *t; void *v; } GoInterface;
+typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
+
+#endif
+
+/* End of boilerplate cgo prologue.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern int OrchestrationInit();
+
+extern int OrchestrationRequestService();
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/src/CMain/orchestration.so b/src/CMain/orchestration.so
new file mode 100644 (file)
index 0000000..45cf92f
Binary files /dev/null and b/src/CMain/orchestration.so differ

diff --git a/src/GoMain/main.go b/src/GoMain/main.go
new file mode 100644 (file)
index 0000000..1395b47
--- /dev/null
+++ b/src/GoMain/main.go
@@ -0,0 +1,31 @@
+/*
+ * Edge Orchestration
+ *
+ * Edge Orchestration support to deliver distributed service process environment.
+ *
+ * API version: v1-20190307
+ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ */
+
+package main
+
+import (
+       "devicemgr"
+       "discoverymgr"
+       "log"
+       "net/http"
+       restapi "restapi/v1"
+       "servicemgr"
+)
+
+func main() {
+       log.Printf("[%s] Server started", logPrefix)
+
+       devicemgr.InitDeviceMgr()
+       servicemgr.InitServiceMap()
+       discoverymgr.InitDiscovery()
+       router := restapi.NewRouter()
+
+       log.Fatal(http.ListenAndServe(":9090", router))
+
+}

diff --git a/src/GoMain/types.go b/src/GoMain/types.go
new file mode 100644 (file)
index 0000000..702c1cf
--- /dev/null
+++ b/src/GoMain/types.go
@@ -0,0 +1,3 @@
+package main
+
+var logPrefix = "orchestration main"

diff --git a/src/main-c b/src/main-c
new file mode 100644 (file)
index 0000000..50bfb22
--- /dev/null
+++ b/src/main-c
@@ -0,0 +1,74 @@
+/* Code generated by cmd/cgo; DO NOT EDIT. */
+
+/* package interface */
+
+
+#line 1 "cgo-builtin-prolog"
+
+#include <stddef.h> /* for ptrdiff_t below */
+
+#ifndef GO_CGO_EXPORT_PROLOGUE_H
+#define GO_CGO_EXPORT_PROLOGUE_H
+
+typedef struct { const char *p; ptrdiff_t n; } _GoString_;
+
+#endif
+
+/* Start of preamble from import "C" comments.  */
+
+
+
+
+/* End of preamble from import "C" comments.  */
+
+
+/* Start of boilerplate cgo prologue.  */
+#line 1 "cgo-gcc-export-header-prolog"
+
+#ifndef GO_CGO_PROLOGUE_H
+#define GO_CGO_PROLOGUE_H
+
+typedef signed char GoInt8;
+typedef unsigned char GoUint8;
+typedef short GoInt16;
+typedef unsigned short GoUint16;
+typedef int GoInt32;
+typedef unsigned int GoUint32;
+typedef long long GoInt64;
+typedef unsigned long long GoUint64;
+typedef GoInt64 GoInt;
+typedef GoUint64 GoUint;
+typedef __SIZE_TYPE__ GoUintptr;
+typedef float GoFloat32;
+typedef double GoFloat64;
+typedef float _Complex GoComplex64;
+typedef double _Complex GoComplex128;
+
+/*
+  static assertion to make sure the file is being used on architecture
+  at least with matching size of GoInt.
+*/
+typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
+
+typedef _GoString_ GoString;
+typedef void *GoMap;
+typedef void *GoChan;
+typedef struct { void *t; void *v; } GoInterface;
+typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
+
+#endif
+
+/* End of boilerplate cgo prologue.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern int OrchestrationInit();
+
+extern int OrchestrationRequestService();
+
+#ifdef __cplusplus
+}
+#endif

diff --git a/src/main-c/orchestration.h b/src/main-c/orchestration.h
deleted file mode 100644 (file)
index 50bfb22..0000000
--- a/src/main-c/orchestration.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Code generated by cmd/cgo; DO NOT EDIT. */
-
-/* package interface */
-
-
-#line 1 "cgo-builtin-prolog"
-
-#include <stddef.h> /* for ptrdiff_t below */
-
-#ifndef GO_CGO_EXPORT_PROLOGUE_H
-#define GO_CGO_EXPORT_PROLOGUE_H
-
-typedef struct { const char *p; ptrdiff_t n; } _GoString_;
-
-#endif
-
-/* Start of preamble from import "C" comments.  */
-
-
-
-
-/* End of preamble from import "C" comments.  */
-
-
-/* Start of boilerplate cgo prologue.  */
-#line 1 "cgo-gcc-export-header-prolog"
-
-#ifndef GO_CGO_PROLOGUE_H
-#define GO_CGO_PROLOGUE_H
-
-typedef signed char GoInt8;
-typedef unsigned char GoUint8;
-typedef short GoInt16;
-typedef unsigned short GoUint16;
-typedef int GoInt32;
-typedef unsigned int GoUint32;
-typedef long long GoInt64;
-typedef unsigned long long GoUint64;
-typedef GoInt64 GoInt;
-typedef GoUint64 GoUint;
-typedef __SIZE_TYPE__ GoUintptr;
-typedef float GoFloat32;
-typedef double GoFloat64;
-typedef float _Complex GoComplex64;
-typedef double _Complex GoComplex128;
-
-/*
-  static assertion to make sure the file is being used on architecture
-  at least with matching size of GoInt.
-*/
-typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
-
-typedef _GoString_ GoString;
-typedef void *GoMap;
-typedef void *GoChan;
-typedef struct { void *t; void *v; } GoInterface;
-typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
-
-#endif
-
-/* End of boilerplate cgo prologue.  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-extern int OrchestrationInit();
-
-extern int OrchestrationRequestService();
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/src/main-c/orchestration.so b/src/main-c/orchestration.so
deleted file mode 100644 (file)
index 45cf92f..0000000
Binary files a/src/main-c/orchestration.so and /dev/null differ

diff --git a/src/orchestration/main.go b/src/orchestration/main.go
deleted file mode 100644 (file)
index 1395b47..0000000
--- a/src/orchestration/main.go
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Edge Orchestration
- *
- * Edge Orchestration support to deliver distributed service process environment.
- *
- * API version: v1-20190307
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-
-package main
-
-import (
-       "devicemgr"
-       "discoverymgr"
-       "log"
-       "net/http"
-       restapi "restapi/v1"
-       "servicemgr"
-)
-
-func main() {
-       log.Printf("[%s] Server started", logPrefix)
-
-       devicemgr.InitDeviceMgr()
-       servicemgr.InitServiceMap()
-       discoverymgr.InitDiscovery()
-       router := restapi.NewRouter()
-
-       log.Fatal(http.ListenAndServe(":9090", router))
-
-}

diff --git a/src/orchestration/types.go b/src/orchestration/types.go
deleted file mode 100644 (file)
index 702c1cf..0000000
--- a/src/orchestration/types.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package main
-
-var logPrefix = "orchestration main"