From 973b29bc7a7ba857deb5c15389e42b9cae2da38a Mon Sep 17 00:00:00 2001 From: gbrodman Date: Wed, 19 Jun 2019 12:10:57 -0400 Subject: [PATCH] Move the Soy files to the resources folder (#120) --- build.gradle | 9 +++------ core/build.gradle | 14 +++++++------- .../registry/reporting/spec11/soy/Spec11Email.soy | 0 .../google/registry/tools/soy/ContactCreate.soy | 0 .../registry/tools/soy/CreateAnchorTenant.soy | 0 .../google/registry/tools/soy/DeleteDomain.soy | 0 .../google/registry/tools/soy/DeleteHost.soy | 0 .../google/registry/tools/soy/DomainCheck.soy | 0 .../registry/tools/soy/DomainCheckClaims.soy | 0 .../google/registry/tools/soy/DomainCreate.soy | 0 .../google/registry/tools/soy/DomainUpdate.soy | 0 .../google/registry/tools/soy/HostCreate.soy | 0 .../google/registry/tools/soy/RemoveIpAddress.soy | 0 .../google/registry/tools/soy/RenewDomain.soy | 0 .../registry/tools/soy/UniformRapidSuspension.soy | 0 .../registry/tools/soy/UpdateServerLocks.soy | 0 .../google/registry/ui/globals.txt | 0 .../google/registry/ui/soy/Analytics.soy | 0 .../google/registry/ui/soy/Console.soy | 0 .../google/registry/ui/soy/Forms.soy | 0 .../registry/ui/soy/registrar/AdminSettings.soy | 0 .../google/registry/ui/soy/registrar/Console.soy | 0 .../registry/ui/soy/registrar/ContactSettings.soy | 0 .../registry/ui/soy/registrar/OteSetupConsole.soy | 0 .../ui/soy/registrar/RegistrarCreateConsole.soy | 0 .../registry/ui/soy/registrar/SecuritySettings.soy | 0 .../registry/ui/soy/registrar/WhoisSettings.soy | 0 27 files changed, 10 insertions(+), 13 deletions(-) rename core/src/main/{java => resources}/google/registry/reporting/spec11/soy/Spec11Email.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/ContactCreate.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/CreateAnchorTenant.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/DeleteDomain.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/DeleteHost.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/DomainCheck.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/DomainCheckClaims.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/DomainCreate.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/DomainUpdate.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/HostCreate.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/RemoveIpAddress.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/RenewDomain.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/UniformRapidSuspension.soy (100%) rename core/src/main/{java => resources}/google/registry/tools/soy/UpdateServerLocks.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/globals.txt (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/Analytics.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/Console.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/Forms.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/registrar/AdminSettings.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/registrar/Console.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/registrar/ContactSettings.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/registrar/OteSetupConsole.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/registrar/SecuritySettings.soy (100%) rename core/src/main/{java => resources}/google/registry/ui/soy/registrar/WhoisSettings.soy (100%) diff --git a/build.gradle b/build.gradle index f1865d0a9..00b9ee503 100644 --- a/build.gradle +++ b/build.gradle @@ -163,6 +163,7 @@ subprojects { project.ext.javaDir = "${project.projectDir}/src/main/java" project.ext.javaTestDir = "${project.projectDir}/src/test/java" + project.ext.resourcesSourceDir = "${project.projectDir}/src/main/resources" sourceSets { main { @@ -170,9 +171,7 @@ subprojects { srcDirs += aptGeneratedDir } resources { - srcDirs = [ - project.ext.javaDir - ] + srcDirs += project.ext.javaDir exclude commonlyExcludedResources } } @@ -181,9 +180,7 @@ subprojects { srcDirs += aptGeneratedTestDir } resources { - srcDirs = [ - project.ext.javaTestDir - ] + srcDirs += project.ext.javaTestDir exclude commonlyExcludedResources } } diff --git a/core/build.gradle b/core/build.gradle index a09d8a888..9e32ce71c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -372,7 +372,7 @@ task soyToJava { spec11SoyDir, toolsSoyDir, uiSoyDir, registrarSoyDir, ] soyRelativeDirs.each { - inputs.dir "${javaDir}/${it}" + inputs.dir "${resourcesSourceDir}/${it}" outputs.dir "${generatedDir}/${it}" } @@ -392,19 +392,19 @@ task soyToJava { soyToJava('google.registry.tools.soy', "${generatedDir}/${toolsSoyDir}", fileTree( - dir: "${javaDir}/${toolsSoyDir}", + dir: "${resourcesSourceDir}/${toolsSoyDir}", include: ['**/*.soy'])) soyToJava('google.registry.ui.soy.registrar', "${generatedDir}/${registrarSoyDir}", fileTree( - dir: "${javaDir}/${registrarSoyDir}", + dir: "${resourcesSourceDir}/${registrarSoyDir}", include: ['**/*.soy'])) soyToJava('google.registry.ui.soy', "${generatedDir}/${uiSoyDir}", files { - file("${javaDir}/${uiSoyDir}").listFiles() + file("${resourcesSourceDir}/${uiSoyDir}").listFiles() }.filter { it.name.endsWith(".soy") }) @@ -412,13 +412,13 @@ task soyToJava { soyToJava('google.registry.reporting.spec11.soy', "${generatedDir}/${spec11SoyDir}", fileTree( - dir: "${javaDir}/${spec11SoyDir}", + dir: "${resourcesSourceDir}/${spec11SoyDir}", include: ['**/*.soy'])) } } task soyToJS { - def rootSoyDirectory = "${javaDir}/google/registry/ui/soy" + def rootSoyDirectory = "${resourcesSourceDir}/google/registry/ui/soy" def outputSoyDirectory = "${generatedDir}/google/registry/ui/soy" inputs.dir rootSoyDirectory outputs.dir outputSoyDirectory @@ -432,7 +432,7 @@ task soyToJS { "--allowExternalCalls", "false", "--srcs", "${soyFiles.join(',')}", "--shouldProvideRequireSoyNamespaces", "true", - "--compileTimeGlobalsFile", "${javaDir}/google/registry/ui/globals.txt", + "--compileTimeGlobalsFile", "${resourcesSourceDir}/google/registry/ui/globals.txt", "--deps", "${deps.join(',')}" } } diff --git a/core/src/main/java/google/registry/reporting/spec11/soy/Spec11Email.soy b/core/src/main/resources/google/registry/reporting/spec11/soy/Spec11Email.soy similarity index 100% rename from core/src/main/java/google/registry/reporting/spec11/soy/Spec11Email.soy rename to core/src/main/resources/google/registry/reporting/spec11/soy/Spec11Email.soy diff --git a/core/src/main/java/google/registry/tools/soy/ContactCreate.soy b/core/src/main/resources/google/registry/tools/soy/ContactCreate.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/ContactCreate.soy rename to core/src/main/resources/google/registry/tools/soy/ContactCreate.soy diff --git a/core/src/main/java/google/registry/tools/soy/CreateAnchorTenant.soy b/core/src/main/resources/google/registry/tools/soy/CreateAnchorTenant.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/CreateAnchorTenant.soy rename to core/src/main/resources/google/registry/tools/soy/CreateAnchorTenant.soy diff --git a/core/src/main/java/google/registry/tools/soy/DeleteDomain.soy b/core/src/main/resources/google/registry/tools/soy/DeleteDomain.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/DeleteDomain.soy rename to core/src/main/resources/google/registry/tools/soy/DeleteDomain.soy diff --git a/core/src/main/java/google/registry/tools/soy/DeleteHost.soy b/core/src/main/resources/google/registry/tools/soy/DeleteHost.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/DeleteHost.soy rename to core/src/main/resources/google/registry/tools/soy/DeleteHost.soy diff --git a/core/src/main/java/google/registry/tools/soy/DomainCheck.soy b/core/src/main/resources/google/registry/tools/soy/DomainCheck.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/DomainCheck.soy rename to core/src/main/resources/google/registry/tools/soy/DomainCheck.soy diff --git a/core/src/main/java/google/registry/tools/soy/DomainCheckClaims.soy b/core/src/main/resources/google/registry/tools/soy/DomainCheckClaims.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/DomainCheckClaims.soy rename to core/src/main/resources/google/registry/tools/soy/DomainCheckClaims.soy diff --git a/core/src/main/java/google/registry/tools/soy/DomainCreate.soy b/core/src/main/resources/google/registry/tools/soy/DomainCreate.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/DomainCreate.soy rename to core/src/main/resources/google/registry/tools/soy/DomainCreate.soy diff --git a/core/src/main/java/google/registry/tools/soy/DomainUpdate.soy b/core/src/main/resources/google/registry/tools/soy/DomainUpdate.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/DomainUpdate.soy rename to core/src/main/resources/google/registry/tools/soy/DomainUpdate.soy diff --git a/core/src/main/java/google/registry/tools/soy/HostCreate.soy b/core/src/main/resources/google/registry/tools/soy/HostCreate.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/HostCreate.soy rename to core/src/main/resources/google/registry/tools/soy/HostCreate.soy diff --git a/core/src/main/java/google/registry/tools/soy/RemoveIpAddress.soy b/core/src/main/resources/google/registry/tools/soy/RemoveIpAddress.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/RemoveIpAddress.soy rename to core/src/main/resources/google/registry/tools/soy/RemoveIpAddress.soy diff --git a/core/src/main/java/google/registry/tools/soy/RenewDomain.soy b/core/src/main/resources/google/registry/tools/soy/RenewDomain.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/RenewDomain.soy rename to core/src/main/resources/google/registry/tools/soy/RenewDomain.soy diff --git a/core/src/main/java/google/registry/tools/soy/UniformRapidSuspension.soy b/core/src/main/resources/google/registry/tools/soy/UniformRapidSuspension.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/UniformRapidSuspension.soy rename to core/src/main/resources/google/registry/tools/soy/UniformRapidSuspension.soy diff --git a/core/src/main/java/google/registry/tools/soy/UpdateServerLocks.soy b/core/src/main/resources/google/registry/tools/soy/UpdateServerLocks.soy similarity index 100% rename from core/src/main/java/google/registry/tools/soy/UpdateServerLocks.soy rename to core/src/main/resources/google/registry/tools/soy/UpdateServerLocks.soy diff --git a/core/src/main/java/google/registry/ui/globals.txt b/core/src/main/resources/google/registry/ui/globals.txt similarity index 100% rename from core/src/main/java/google/registry/ui/globals.txt rename to core/src/main/resources/google/registry/ui/globals.txt diff --git a/core/src/main/java/google/registry/ui/soy/Analytics.soy b/core/src/main/resources/google/registry/ui/soy/Analytics.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/Analytics.soy rename to core/src/main/resources/google/registry/ui/soy/Analytics.soy diff --git a/core/src/main/java/google/registry/ui/soy/Console.soy b/core/src/main/resources/google/registry/ui/soy/Console.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/Console.soy rename to core/src/main/resources/google/registry/ui/soy/Console.soy diff --git a/core/src/main/java/google/registry/ui/soy/Forms.soy b/core/src/main/resources/google/registry/ui/soy/Forms.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/Forms.soy rename to core/src/main/resources/google/registry/ui/soy/Forms.soy diff --git a/core/src/main/java/google/registry/ui/soy/registrar/AdminSettings.soy b/core/src/main/resources/google/registry/ui/soy/registrar/AdminSettings.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/registrar/AdminSettings.soy rename to core/src/main/resources/google/registry/ui/soy/registrar/AdminSettings.soy diff --git a/core/src/main/java/google/registry/ui/soy/registrar/Console.soy b/core/src/main/resources/google/registry/ui/soy/registrar/Console.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/registrar/Console.soy rename to core/src/main/resources/google/registry/ui/soy/registrar/Console.soy diff --git a/core/src/main/java/google/registry/ui/soy/registrar/ContactSettings.soy b/core/src/main/resources/google/registry/ui/soy/registrar/ContactSettings.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/registrar/ContactSettings.soy rename to core/src/main/resources/google/registry/ui/soy/registrar/ContactSettings.soy diff --git a/core/src/main/java/google/registry/ui/soy/registrar/OteSetupConsole.soy b/core/src/main/resources/google/registry/ui/soy/registrar/OteSetupConsole.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/registrar/OteSetupConsole.soy rename to core/src/main/resources/google/registry/ui/soy/registrar/OteSetupConsole.soy diff --git a/core/src/main/java/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy b/core/src/main/resources/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy rename to core/src/main/resources/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy diff --git a/core/src/main/java/google/registry/ui/soy/registrar/SecuritySettings.soy b/core/src/main/resources/google/registry/ui/soy/registrar/SecuritySettings.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/registrar/SecuritySettings.soy rename to core/src/main/resources/google/registry/ui/soy/registrar/SecuritySettings.soy diff --git a/core/src/main/java/google/registry/ui/soy/registrar/WhoisSettings.soy b/core/src/main/resources/google/registry/ui/soy/registrar/WhoisSettings.soy similarity index 100% rename from core/src/main/java/google/registry/ui/soy/registrar/WhoisSettings.soy rename to core/src/main/resources/google/registry/ui/soy/registrar/WhoisSettings.soy