refactor notifications

Signed-off-by: Christian Richter <crichter@owncloud.com>

extensions/notifications/cmd/notifications/main.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"os"
+
+	"github.com/owncloud/ocis/extensions/notifications/pkg/command"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
+)
+
+func main() {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
+		os.Exit(1)
+	}
+}

extensions/notifications/pkg/channels/channels.go

@@ -9,7 +9,7 @@ import (
 	groups "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
-	"github.com/owncloud/ocis/notifications/pkg/config"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/pkg/errors"
 )

extensions/notifications/pkg/command/health.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/notifications/pkg/config"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/notifications/pkg/command/root.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/notifications/pkg/config"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"

extensions/notifications/pkg/command/server.go

@@ -6,11 +6,11 @@ import (
 	"github.com/asim/go-micro/plugins/events/natsjs/v4"
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/server"
-	"github.com/owncloud/ocis/notifications/pkg/channels"
-	"github.com/owncloud/ocis/notifications/pkg/config"
-	"github.com/owncloud/ocis/notifications/pkg/config/parser"
-	"github.com/owncloud/ocis/notifications/pkg/logging"
-	"github.com/owncloud/ocis/notifications/pkg/service"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/channels"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/logging"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/service"
 	"github.com/urfave/cli/v2"
 )
 

extensions/notifications/pkg/command/version.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/notifications/pkg/config"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/notifications/pkg/config/defaults/defaultconfig.go

@@ -1,6 +1,6 @@
 package defaults
 
-import "github.com/owncloud/ocis/notifications/pkg/config"
+import "github.com/owncloud/ocis/extensions/notifications/pkg/config"
 
 func FullDefaultConfig() *config.Config {
 	cfg := DefaultConfig()

extensions/notifications/pkg/config/parser/parse.go

@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/notifications/pkg/config"
-	"github.com/owncloud/ocis/notifications/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"

extensions/notifications/pkg/logging/logging.go

@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/notifications/pkg/config"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/notifications/pkg/service/service.go

@@ -6,7 +6,7 @@ import (
 	"syscall"
 
 	"github.com/cs3org/reva/v2/pkg/events"
-	"github.com/owncloud/ocis/notifications/pkg/channels"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/channels"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

notifications/cmd/notifications/main.go

@@ -1,14 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/owncloud/ocis/notifications/pkg/command"
-	"github.com/owncloud/ocis/notifications/pkg/config/defaults"
-)
-
-func main() {
-	if err := command.Execute(defaults.DefaultConfig()); err != nil {
-		os.Exit(1)
-	}
-}

ocis-pkg/config/config.go

@@ -11,7 +11,7 @@ import (
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/config"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/config"
 	nats "github.com/owncloud/ocis/extensions/nats/pkg/config"
-	notifications "github.com/owncloud/ocis/notifications/pkg/config"
+	notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config"
 	ocs "github.com/owncloud/ocis/ocs/pkg/config"
 	proxy "github.com/owncloud/ocis/proxy/pkg/config"
 	settings "github.com/owncloud/ocis/settings/pkg/config"

ocis-pkg/config/defaultconfig.go

@@ -9,7 +9,7 @@ import (
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults"
 	nats "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults"
-	notifications "github.com/owncloud/ocis/notifications/pkg/config/defaults"
+	notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
 	ocs "github.com/owncloud/ocis/ocs/pkg/config/defaults"
 	proxy "github.com/owncloud/ocis/proxy/pkg/config/defaults"
 	settings "github.com/owncloud/ocis/settings/pkg/config/defaults"

ocis/pkg/command/notifications.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/notifications/pkg/command"
+	"github.com/owncloud/ocis/extensions/notifications/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"

ocis/pkg/runtime/service/service.go

@@ -26,7 +26,7 @@ import (
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/command"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/command"
 	nats "github.com/owncloud/ocis/extensions/nats/pkg/command"
-	notifications "github.com/owncloud/ocis/notifications/pkg/command"
+	notifications "github.com/owncloud/ocis/extensions/notifications/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"