From 0a18424f9d648479d4dd22d4e38fc79532dff220 Mon Sep 17 00:00:00 2001 From: Ruben Verborgh Date: Fri, 30 Jul 2021 15:24:29 +0100 Subject: [PATCH] refactor: Move app/app to app/main. Closes https://github.com/solid/community-server/issues/848 --- config/app/{app => main}/default.json | 0 config/default.json | 2 +- config/dynamic.json | 2 +- config/example-https-file.json | 2 +- config/file.json | 2 +- config/memory-subdomains.json | 2 +- config/path-routing.json | 2 +- config/sparql-endpoint.json | 2 +- test/integration/config/ldp-with-auth.json | 2 +- test/integration/config/run-with-redlock.json | 2 +- test/integration/config/server-dynamic-unsafe.json | 2 +- test/integration/config/server-memory.json | 2 +- test/integration/config/server-subdomains-unsafe.json | 2 +- test/integration/config/server-without-auth.json | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename config/app/{app => main}/default.json (100%) diff --git a/config/app/app/default.json b/config/app/main/default.json similarity index 100% rename from config/app/app/default.json rename to config/app/main/default.json diff --git a/config/default.json b/config/default.json index ad353cdf5..71f0a800f 100644 --- a/config/default.json +++ b/config/default.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json", diff --git a/config/dynamic.json b/config/dynamic.json index bdcd5e865..05248946f 100644 --- a/config/dynamic.json +++ b/config/dynamic.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json", diff --git a/config/example-https-file.json b/config/example-https-file.json index 00ecbf0ff..04c1fe27b 100644 --- a/config/example-https-file.json +++ b/config/example-https-file.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json", diff --git a/config/file.json b/config/file.json index d64336f23..03bf127a9 100644 --- a/config/file.json +++ b/config/file.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json", diff --git a/config/memory-subdomains.json b/config/memory-subdomains.json index b1f35cab5..51fbe6611 100644 --- a/config/memory-subdomains.json +++ b/config/memory-subdomains.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json", diff --git a/config/path-routing.json b/config/path-routing.json index 67e3df917..8714594eb 100644 --- a/config/path-routing.json +++ b/config/path-routing.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json", diff --git a/config/sparql-endpoint.json b/config/sparql-endpoint.json index 0cba57d31..e27fc343a 100644 --- a/config/sparql-endpoint.json +++ b/config/sparql-endpoint.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json", diff --git a/test/integration/config/ldp-with-auth.json b/test/integration/config/ldp-with-auth.json index cf1b23d2c..4b6188346 100644 --- a/test/integration/config/ldp-with-auth.json +++ b/test/integration/config/ldp-with-auth.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/simple.json", "files-scs:config/http/middleware/no-websockets.json", diff --git a/test/integration/config/run-with-redlock.json b/test/integration/config/run-with-redlock.json index 9b902ce03..253c971fc 100644 --- a/test/integration/config/run-with-redlock.json +++ b/test/integration/config/run-with-redlock.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/simple.json", "files-scs:config/http/middleware/no-websockets.json", diff --git a/test/integration/config/server-dynamic-unsafe.json b/test/integration/config/server-dynamic-unsafe.json index 0e5cdef13..0288173a2 100644 --- a/test/integration/config/server-dynamic-unsafe.json +++ b/test/integration/config/server-dynamic-unsafe.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/no-websockets.json", diff --git a/test/integration/config/server-memory.json b/test/integration/config/server-memory.json index 3bc5307b6..440b146a6 100644 --- a/test/integration/config/server-memory.json +++ b/test/integration/config/server-memory.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json", diff --git a/test/integration/config/server-subdomains-unsafe.json b/test/integration/config/server-subdomains-unsafe.json index 741180e25..88b70b2a7 100644 --- a/test/integration/config/server-subdomains-unsafe.json +++ b/test/integration/config/server-subdomains-unsafe.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/no-websockets.json", diff --git a/test/integration/config/server-without-auth.json b/test/integration/config/server-without-auth.json index 7cd7a4ab4..173693a07 100644 --- a/test/integration/config/server-without-auth.json +++ b/test/integration/config/server-without-auth.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "import": [ - "files-scs:config/app/app/default.json", + "files-scs:config/app/main/default.json", "files-scs:config/app/init/default.json", "files-scs:config/http/handler/default.json", "files-scs:config/http/middleware/websockets.json",