Move the environment configuration YAML files into the main JAR

This allows configuration to work properly from the nomulus tool.

TESTED=I built and ran it against several environments, and all worked
properly.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=146697124
This commit is contained in:
mcilwain 2017-02-06 12:36:27 -08:00 committed by Ben McIlwain
parent a904f2c6ee
commit bf068e61d9
14 changed files with 51 additions and 128 deletions

View file

@ -53,7 +53,6 @@ zip_file(
"env/common/default/WEB-INF/logging.properties",
"env/common/default/WEB-INF/queue.xml",
"env/common/default/WEB-INF/web.xml",
"env/production/common/WEB-INF/nomulus-config.yaml",
"env/production/default/WEB-INF/appengine-web.xml",
"env/production/default/WEB-INF/cron.xml",
"//java/google/registry/module/frontend:frontend_jar_deploy.jar",
@ -61,7 +60,6 @@ zip_file(
out = "registry_default.war",
mappings = {
"domain_registry/java/google/registry/env/common/default": "",
"domain_registry/java/google/registry/env/production/common": "",
"domain_registry/java/google/registry/env/production/default": "",
"domain_registry/java/google/registry/module/frontend": "WEB-INF/lib",
},
@ -77,14 +75,12 @@ zip_file(
"env/common/backend/WEB-INF/logging.properties",
"env/common/backend/WEB-INF/web.xml",
"env/production/backend/WEB-INF/appengine-web.xml",
"env/production/common/WEB-INF/nomulus-config.yaml",
"//java/google/registry/module/backend:backend_jar_deploy.jar",
],
out = "registry_backend.war",
mappings = {
"domain_registry/java/google/registry/env/common/backend": "",
"domain_registry/java/google/registry/env/production/backend": "",
"domain_registry/java/google/registry/env/production/common": "",
"domain_registry/java/google/registry/module/backend": "WEB-INF/lib",
},
deps = [
@ -98,14 +94,12 @@ zip_file(
srcs = [
"env/common/tools/WEB-INF/logging.properties",
"env/common/tools/WEB-INF/web.xml",
"env/production/common/WEB-INF/nomulus-config.yaml",
"env/production/tools/WEB-INF/appengine-web.xml",
"//java/google/registry/module/tools:tools_jar_deploy.jar",
],
out = "registry_tools.war",
mappings = {
"domain_registry/java/google/registry/env/common/tools": "",
"domain_registry/java/google/registry/env/production/common": "",
"domain_registry/java/google/registry/env/production/tools": "",
"domain_registry/java/google/registry/module/tools": "WEB-INF/lib",
},
@ -138,13 +132,11 @@ registry_ear_file(
zip_file(
name = "registry_default_sandbox_war",
srcs = [
"env/sandbox/common/WEB-INF/nomulus-config.yaml",
"env/sandbox/default/WEB-INF/appengine-web.xml",
"env/sandbox/default/WEB-INF/cron.xml",
],
out = "registry_default_sandbox.war",
mappings = {
"domain_registry/java/google/registry/env/sandbox/common": "",
"domain_registry/java/google/registry/env/sandbox/default": "",
},
deps = [":registry_default_war"],
@ -154,12 +146,10 @@ zip_file(
name = "registry_backend_sandbox_war",
srcs = [
"env/sandbox/backend/WEB-INF/appengine-web.xml",
"env/sandbox/common/WEB-INF/nomulus-config.yaml",
],
out = "registry_backend_sandbox.war",
mappings = {
"domain_registry/java/google/registry/env/sandbox/backend": "",
"domain_registry/java/google/registry/env/sandbox/common": "",
},
deps = [":registry_backend_war"],
)
@ -167,12 +157,10 @@ zip_file(
zip_file(
name = "registry_tools_sandbox_war",
srcs = [
"env/sandbox/common/WEB-INF/nomulus-config.yaml",
"env/sandbox/tools/WEB-INF/appengine-web.xml",
],
out = "registry_tools_sandbox.war",
mappings = {
"domain_registry/java/google/registry/env/sandbox/common": "",
"domain_registry/java/google/registry/env/sandbox/tools": "",
},
deps = [":registry_tools_war"],
@ -200,13 +188,11 @@ registry_ear_file(
zip_file(
name = "registry_default_alpha_war",
srcs = [
"env/alpha/common/WEB-INF/nomulus-config.yaml",
"env/alpha/default/WEB-INF/appengine-web.xml",
"env/alpha/default/WEB-INF/cron.xml",
],
out = "registry_default_alpha.war",
mappings = {
"domain_registry/java/google/registry/env/alpha/common": "",
"domain_registry/java/google/registry/env/alpha/default": "",
},
deps = [":registry_default_war"],
@ -216,12 +202,10 @@ zip_file(
name = "registry_backend_alpha_war",
srcs = [
"env/alpha/backend/WEB-INF/appengine-web.xml",
"env/alpha/common/WEB-INF/nomulus-config.yaml",
],
out = "registry_backend_alpha.war",
mappings = {
"domain_registry/java/google/registry/env/alpha/backend": "",
"domain_registry/java/google/registry/env/alpha/common": "",
},
deps = [":registry_backend_war"],
)
@ -229,12 +213,10 @@ zip_file(
zip_file(
name = "registry_tools_alpha_war",
srcs = [
"env/alpha/common/WEB-INF/nomulus-config.yaml",
"env/alpha/tools/WEB-INF/appengine-web.xml",
],
out = "registry_tools_alpha.war",
mappings = {
"domain_registry/java/google/registry/env/alpha/common": "",
"domain_registry/java/google/registry/env/alpha/tools": "",
},
deps = [":registry_tools_war"],
@ -262,13 +244,11 @@ registry_ear_file(
zip_file(
name = "registry_default_crash_war",
srcs = [
"env/crash/common/WEB-INF/nomulus-config.yaml",
"env/crash/default/WEB-INF/appengine-web.xml",
"env/crash/default/WEB-INF/cron.xml",
],
out = "registry_default_crash.war",
mappings = {
"domain_registry/java/google/registry/env/crash/common": "",
"domain_registry/java/google/registry/env/crash/default": "",
},
deps = [":registry_default_war"],
@ -278,12 +258,10 @@ zip_file(
name = "registry_backend_crash_war",
srcs = [
"env/crash/backend/WEB-INF/appengine-web.xml",
"env/crash/common/WEB-INF/nomulus-config.yaml",
],
out = "registry_backend_crash.war",
mappings = {
"domain_registry/java/google/registry/env/crash/backend": "",
"domain_registry/java/google/registry/env/crash/common": "",
},
deps = [":registry_backend_war"],
)
@ -291,12 +269,10 @@ zip_file(
zip_file(
name = "registry_tools_crash_war",
srcs = [
"env/crash/common/WEB-INF/nomulus-config.yaml",
"env/crash/tools/WEB-INF/appengine-web.xml",
],
out = "registry_tools_crash.war",
mappings = {
"domain_registry/java/google/registry/env/crash/common": "",
"domain_registry/java/google/registry/env/crash/tools": "",
},
deps = [":registry_tools_war"],
@ -324,12 +300,10 @@ registry_ear_file(
zip_file(
name = "registry_default_local_war",
srcs = [
"env/local/common/WEB-INF/nomulus-config.yaml",
"env/local/default/WEB-INF/appengine-web.xml",
],
out = "registry_default_local.war",
mappings = {
"domain_registry/java/google/registry/env/local/common": "",
"domain_registry/java/google/registry/env/local/default": "",
},
deps = [":registry_default_war"],
@ -339,12 +313,10 @@ zip_file(
name = "registry_backend_local_war",
srcs = [
"env/local/backend/WEB-INF/appengine-web.xml",
"env/local/common/WEB-INF/nomulus-config.yaml",
],
out = "registry_backend_local.war",
mappings = {
"domain_registry/java/google/registry/env/local/backend": "",
"domain_registry/java/google/registry/env/local/common": "",
},
deps = [":registry_backend_war"],
)
@ -352,12 +324,10 @@ zip_file(
zip_file(
name = "registry_tools_local_war",
srcs = [
"env/local/common/WEB-INF/nomulus-config.yaml",
"env/local/tools/WEB-INF/appengine-web.xml",
],
out = "registry_tools_local.war",
mappings = {
"domain_registry/java/google/registry/env/local/common": "",
"domain_registry/java/google/registry/env/local/tools": "",
},
deps = [":registry_tools_war"],