Merge branch 'master' into search

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

ocis/pkg/command/accounts.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/accounts/pkg/command"
+	"github.com/owncloud/ocis/extensions/accounts/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/command/audit.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/audit/pkg/command"
+	"github.com/owncloud/ocis/extensions/audit/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/command/glauth.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/glauth/pkg/command"
+	"github.com/owncloud/ocis/extensions/glauth/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/command/graph.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/graph/pkg/command"
+	"github.com/owncloud/ocis/extensions/graph/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/command/graphexplorer.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/graph-explorer/pkg/command"
+	"github.com/owncloud/ocis/extensions/graph-explorer/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/command/idm.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/idm/pkg/command"
+	"github.com/owncloud/ocis/extensions/idm/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/command/idp.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/idp/pkg/command"
+	"github.com/owncloud/ocis/extensions/idp/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/command/natsserver.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/nats/pkg/command"
+	"github.com/owncloud/ocis/extensions/nats/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/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/command/ocdav.go

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

ocis/pkg/command/ocs.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/ocs/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/ocs/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/command/proxy.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/proxy/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/proxy/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/command/search.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/search/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/search/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/command/settings.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/settings/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/settings/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/command/storageappprovider.go

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

ocis/pkg/command/storageauthbasic.go

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

ocis/pkg/command/storageauthbearer.go

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

ocis/pkg/command/storageauthmachine.go

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

ocis/pkg/command/storagefrontend.go

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

ocis/pkg/command/storagegateway.go

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

ocis/pkg/command/storagegroupprovider.go

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

ocis/pkg/command/storagemetadata.go

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

ocis/pkg/command/storagepubliclink.go

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

ocis/pkg/command/storageshares.go

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

ocis/pkg/command/storagesharing.go

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

ocis/pkg/command/storageuserprovider.go

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

ocis/pkg/command/storageusers.go

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

ocis/pkg/command/store.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/store/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/store/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/command/thumbnails.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/thumbnails/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/thumbnails/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/command/web.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/web/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/web/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/command/webdav.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/webdav/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/webdav/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/runtime/service/service.go

@@ -19,26 +19,26 @@ import (
 	"github.com/mohae/deepcopy"
 	"github.com/olekukonko/tablewriter"
 
-	accounts "github.com/owncloud/ocis/accounts/pkg/command"
-	glauth "github.com/owncloud/ocis/glauth/pkg/command"
-	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/command"
-	graph "github.com/owncloud/ocis/graph/pkg/command"
-	idm "github.com/owncloud/ocis/idm/pkg/command"
-	idp "github.com/owncloud/ocis/idp/pkg/command"
-	nats "github.com/owncloud/ocis/nats/pkg/command"
-	notifications "github.com/owncloud/ocis/notifications/pkg/command"
+	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/command"
+	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/command"
+	graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/command"
+	graph "github.com/owncloud/ocis/extensions/graph/pkg/command"
+	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/extensions/notifications/pkg/command"
+	ocs "github.com/owncloud/ocis/extensions/ocs/pkg/command"
+	proxy "github.com/owncloud/ocis/extensions/proxy/pkg/command"
+	search "github.com/owncloud/ocis/extensions/search/pkg/command"
+	settings "github.com/owncloud/ocis/extensions/settings/pkg/command"
+	storage "github.com/owncloud/ocis/extensions/storage/pkg/command"
+	store "github.com/owncloud/ocis/extensions/store/pkg/command"
+	thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/command"
+	web "github.com/owncloud/ocis/extensions/web/pkg/command"
+	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	ocs "github.com/owncloud/ocis/ocs/pkg/command"
-	proxy "github.com/owncloud/ocis/proxy/pkg/command"
-	search "github.com/owncloud/ocis/search/pkg/command"
-	settings "github.com/owncloud/ocis/settings/pkg/command"
-	storage "github.com/owncloud/ocis/storage/pkg/command"
-	store "github.com/owncloud/ocis/store/pkg/command"
-	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/command"
-	web "github.com/owncloud/ocis/web/pkg/command"
-	webdav "github.com/owncloud/ocis/webdav/pkg/command"
 	"github.com/rs/zerolog"
 	"github.com/thejerf/suture/v4"
 	"go-micro.dev/v4/logger"