From 71d7a382f35ae74302a0e093d5d0f339bccc78aa Mon Sep 17 00:00:00 2001 From: jianglai Date: Thu, 13 Oct 2016 12:00:05 -0700 Subject: [PATCH] Change all references to Domain Registry to Nomulus ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=136068582 --- AUTHORS | 2 +- java/google/registry/builddefs/defs.bzl | 2 +- java/google/registry/builddefs/registry_ear_file.bzl | 2 +- java/google/registry/config/ConfigModule.java | 12 ++++++------ java/google/registry/config/RegistryConfig.java | 6 +++--- java/google/registry/config/RegistryEnvironment.java | 2 +- java/google/registry/config/TestRegistryConfig.java | 2 +- .../registry/env/common/backend/WEB-INF/web.xml | 2 +- .../registry/env/common/default/WEB-INF/web.xml | 2 +- .../google/registry/env/common/tools/WEB-INF/web.xml | 2 +- java/google/registry/keyring/api/Keyring.java | 2 +- .../registry/model/eppcommon/package-info.java | 2 +- java/google/registry/repositories.bzl | 2 +- java/google/registry/request/RequestHandler.java | 2 +- java/google/registry/request/Router.java | 2 +- java/google/registry/ui/html/index.html | 2 +- java/google/registry/ui/soy/Console.soy | 2 +- java/google/registry/util/SendEmailUtils.java | 4 ++-- .../google/registry/rde/RydeGpgIntegrationTest.java | 2 +- .../google/registry/server/RegistryTestServer.java | 2 +- .../google/registry/testing/RegistryConfigRule.java | 2 +- .../testing/mapreduce/MapreduceTestCase.java | 2 +- .../google/registry/ui/js/registrar/console_test.js | 2 +- .../ui/js/registrar/contact_settings_test.js | 2 +- .../google/registry/ui/js/registrar/contact_test.js | 2 +- .../google/registry/ui/js/registrar/domain_test.js | 2 +- .../google/registry/ui/js/registrar/host_test.js | 2 +- .../ui/js/registrar/security_settings_test.js | 2 +- .../registry/ui/js/registrar/whois_settings_test.js | 2 +- .../ui/server/registrar/ConsoleUiActionTest.java | 2 +- 30 files changed, 38 insertions(+), 38 deletions(-) diff --git a/AUTHORS b/AUTHORS index e09e1cbbe..6d1d5c007 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -# This the official list of Domain Registry authors for copyright purposes. +# This the official list of Nomulus authors for copyright purposes. # This file is distinct from the CONTRIBUTORS files. # See the latter for an explanation. diff --git a/java/google/registry/builddefs/defs.bzl b/java/google/registry/builddefs/defs.bzl index eff62e64c..b7999e08c 100644 --- a/java/google/registry/builddefs/defs.bzl +++ b/java/google/registry/builddefs/defs.bzl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Common routines for Domain Registry build rules.""" +"""Common routines for Nomulus build rules.""" ZIPPER = "@bazel_tools//tools/zip:zipper" diff --git a/java/google/registry/builddefs/registry_ear_file.bzl b/java/google/registry/builddefs/registry_ear_file.bzl index d3844be09..20a817fe0 100644 --- a/java/google/registry/builddefs/registry_ear_file.bzl +++ b/java/google/registry/builddefs/registry_ear_file.bzl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Build macro for creating App Engine EAR archives for Domain Registry.""" +"""Build macro for creating App Engine EAR archives for Nomulus.""" load("//java/google/registry/builddefs:defs.bzl", "ZIPPER") diff --git a/java/google/registry/config/ConfigModule.java b/java/google/registry/config/ConfigModule.java index b82bcc0a5..a9186b2fb 100644 --- a/java/google/registry/config/ConfigModule.java +++ b/java/google/registry/config/ConfigModule.java @@ -30,13 +30,13 @@ import org.joda.time.DateTimeConstants; import org.joda.time.Duration; /** - * Configuration example for the Domain Registry codebase. + * Configuration example for the Nomulus codebase. * - *

The Domain Registry codebase contains many classes that inject configurable settings. This is + *

The Nomulus codebase contains many classes that inject configurable settings. This is * the centralized class that is used by default to configure them all, in hard-coded type-safe * Java code. * - *

This class does not represent the total configuration of the Domain Registry service. It's + *

This class does not represent the total configuration of the Nomulus service. It's * only meant for settings that need to be configured once. Settings which may * be subject to change in the future, should instead be retrieved from Datastore. The * {@link google.registry.model.registry.Registry Registry} class is one such example of this. @@ -102,7 +102,7 @@ public final class ConfigModule { switch (environment) { case UNITTEST: case LOCAL: - return "Domain Registry"; + return "Nomulus"; default: // Change this to the name of your product. return "Google Registry"; @@ -616,7 +616,7 @@ public final class ConfigModule { case PRODUCTION: return "6gm2mm48k9ty4zmx"; default: - // Valentine: Domain Registry Braintree Sandbox + // Valentine: Nomulus Braintree Sandbox return "vqgn8khkq2cs6y9s"; } } @@ -635,7 +635,7 @@ public final class ConfigModule { case PRODUCTION: return "tzcfxggzgbh2jg5x"; default: - // Valentine: Domain Registry Braintree Sandbox + // Valentine: Nomulus Braintree Sandbox return "tzcyzvm3mn7zkdnx"; } } diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java index 28a802c88..4ec2ba61b 100644 --- a/java/google/registry/config/RegistryConfig.java +++ b/java/google/registry/config/RegistryConfig.java @@ -21,7 +21,7 @@ import java.net.URL; import org.joda.time.Duration; /** - * Domain Registry configuration for global constants that can't be injected. + * Nomulus configuration for global constants that can't be injected. * *

The goal of this custom configuration system is to have our project environments configured * in type-safe Java code that can be refactored, rather than XML files and system properties. @@ -109,7 +109,7 @@ public interface RegistryConfig { public Optional getECatcherAddress(); /** - * Returns the address of the Domain Registry app HTTP server. + * Returns the address of the Nomulus app HTTP server. * *

This is used by the {@code nomulus} tool to connect to the App Engine remote API. */ @@ -137,7 +137,7 @@ public interface RegistryConfig { public String getReservedTermsExportDisclaimer(); /** - * Returns a display name that is used on outgoing emails sent by Domain Registry. + * Returns a display name that is used on outgoing emails sent by Nomulus. * * @see google.registry.util.SendEmailUtils */ diff --git a/java/google/registry/config/RegistryEnvironment.java b/java/google/registry/config/RegistryEnvironment.java index 01a7e6989..5e66d274e 100644 --- a/java/google/registry/config/RegistryEnvironment.java +++ b/java/google/registry/config/RegistryEnvironment.java @@ -55,7 +55,7 @@ public enum RegistryEnvironment { } /** - * Returns configuration for this Domain Registry environment. + * Returns configuration for this Nomulus environment. * *

WARNING: Do not store this value to a static field, otherwise you won't be able to * override it for testing. You should instead store the environment object to a static field. diff --git a/java/google/registry/config/TestRegistryConfig.java b/java/google/registry/config/TestRegistryConfig.java index 28fd6c67c..5dcebef6a 100644 --- a/java/google/registry/config/TestRegistryConfig.java +++ b/java/google/registry/config/TestRegistryConfig.java @@ -109,7 +109,7 @@ public class TestRegistryConfig implements RegistryConfig { @Override public String getGoogleAppsAdminEmailDisplayName() { - return "Testing Domain Registry"; + return "Testing Nomulus"; } @Override diff --git a/java/google/registry/env/common/backend/WEB-INF/web.xml b/java/google/registry/env/common/backend/WEB-INF/web.xml index ae343d817..3c3aa64b8 100644 --- a/java/google/registry/env/common/backend/WEB-INF/web.xml +++ b/java/google/registry/env/common/backend/WEB-INF/web.xml @@ -287,7 +287,7 @@ Any request path starting with `/_dr/` will be restricted to requests originating from the backend or by anyone authenticated to a Google account that's listed in the AppEngine control panel settings for this project as a Viewer/Owner/Developer. - The `_dr` is short for Domain Registry to follow AppEngine naming conventions. + The `_dr` is short for Nomulus to follow AppEngine naming conventions. /_dr/* diff --git a/java/google/registry/env/common/default/WEB-INF/web.xml b/java/google/registry/env/common/default/WEB-INF/web.xml index de84e0888..be435c9d2 100644 --- a/java/google/registry/env/common/default/WEB-INF/web.xml +++ b/java/google/registry/env/common/default/WEB-INF/web.xml @@ -86,7 +86,7 @@ Any request path starting with `/_dr/` will be restricted to requests originating from the backend or by anyone authenticated to a Google account that's listed in the AppEngine control panel settings for this project as a Viewer/Owner/Developer. - The `_dr` is short for Domain Registry to follow AppEngine naming conventions. + The `_dr` is short for Nomulus to follow AppEngine naming conventions. /_dr/* diff --git a/java/google/registry/env/common/tools/WEB-INF/web.xml b/java/google/registry/env/common/tools/WEB-INF/web.xml index 8aa2680dd..28db3c4ad 100644 --- a/java/google/registry/env/common/tools/WEB-INF/web.xml +++ b/java/google/registry/env/common/tools/WEB-INF/web.xml @@ -142,7 +142,7 @@ Any request path starting with `/_dr/` will be restricted to requests originating from the backend or by anyone authenticated to a Google account that's listed in the AppEngine control panel settings for this project as a Viewer/Owner/Developer. - The `_dr` is short for Domain Registry to follow AppEngine naming conventions. + The `_dr` is short for Nomulus to follow AppEngine naming conventions. /_dr/* diff --git a/java/google/registry/keyring/api/Keyring.java b/java/google/registry/keyring/api/Keyring.java index 9d71c4fb9..27b7fc91b 100644 --- a/java/google/registry/keyring/api/Keyring.java +++ b/java/google/registry/keyring/api/Keyring.java @@ -20,7 +20,7 @@ import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; /** - * Domain Registry keyring interface. + * Nomulus keyring interface. * *

Separate methods are defined for each specific situation in which the * registry server needs a secret value, like a PGP key or password. diff --git a/java/google/registry/model/eppcommon/package-info.java b/java/google/registry/model/eppcommon/package-info.java index 88399bf64..af0f57702 100644 --- a/java/google/registry/model/eppcommon/package-info.java +++ b/java/google/registry/model/eppcommon/package-info.java @@ -13,7 +13,7 @@ // limitations under the License. /** - * Domain Registry datastore model common/shared classes. + * Nomulus datastore model common/shared classes. * *

This package is intended to hold classes which are shared across multiple XML namespaces. As * such, no default namespace is declared in this package, and all objects in this package should be diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index 88beae399..9528c3343 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""External dependencies for Domain Registry.""" +"""External dependencies for Nomulus.""" def domain_registry_repositories(): diff --git a/java/google/registry/request/RequestHandler.java b/java/google/registry/request/RequestHandler.java index bfc7339af..ecb718e37 100644 --- a/java/google/registry/request/RequestHandler.java +++ b/java/google/registry/request/RequestHandler.java @@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletResponse; import org.joda.time.Duration; /** - * Dagger request processor for Domain Registry. + * Dagger request processor for Nomulus. * *

This class creates an HTTP request processor from a Dagger component. It routes requests from * your servlet to an {@link Action @Action} annotated handler class. diff --git a/java/google/registry/request/Router.java b/java/google/registry/request/Router.java index 37c692d7d..0349c3d7c 100644 --- a/java/google/registry/request/Router.java +++ b/java/google/registry/request/Router.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.TreeMap; /** - * Path prefix request router for Domain Registry. + * Path prefix request router for Nomulus. * *

See the documentation of {@link RequestHandler} for more information. * diff --git a/java/google/registry/ui/html/index.html b/java/google/registry/ui/html/index.html index c7dd4b8a2..f28ba0d5d 100644 --- a/java/google/registry/ui/html/index.html +++ b/java/google/registry/ui/html/index.html @@ -1,6 +1,6 @@ -Domain Registry +Nomulus If this page doesn't change automatically, please go to http://registry.google.com/registrar diff --git a/java/google/registry/ui/soy/Console.soy b/java/google/registry/ui/soy/Console.soy index 7ee4855aa..9525c33eb 100644 --- a/java/google/registry/ui/soy/Console.soy +++ b/java/google/registry/ui/soy/Console.soy @@ -42,7 +42,7 @@ |___/ |___/ -->{/literal} - Domain Registry {if isNonnull($subtitle)} - {$subtitle}{/if} + Nomulus {if isNonnull($subtitle)} - {$subtitle}{/if} {switch DEBUG} {case google.registry.ui.ConsoleDebug.PRODUCTION} diff --git a/java/google/registry/util/SendEmailUtils.java b/java/google/registry/util/SendEmailUtils.java index 638ad8e62..835254485 100644 --- a/java/google/registry/util/SendEmailUtils.java +++ b/java/google/registry/util/SendEmailUtils.java @@ -40,7 +40,7 @@ public class SendEmailUtils { private static SendEmailService emailService = new SendEmailService(); /** - * Sends an email from Domain Registry to the specified recipient. Returns true iff sending was + * Sends an email from Nomulus to the specified recipient. Returns true iff sending was * successful. */ public static boolean sendEmail(String address, String subject, String body) { @@ -48,7 +48,7 @@ public class SendEmailUtils { } /** - * Sends an email from Domain Registry to the specified recipients. Returns true iff sending was + * Sends an email from Nomulus to the specified recipients. Returns true iff sending was * successful. */ public static boolean sendEmail(Iterable addresses, final String subject, String body) { diff --git a/javatests/google/registry/rde/RydeGpgIntegrationTest.java b/javatests/google/registry/rde/RydeGpgIntegrationTest.java index b1501698a..a62cc036c 100644 --- a/javatests/google/registry/rde/RydeGpgIntegrationTest.java +++ b/javatests/google/registry/rde/RydeGpgIntegrationTest.java @@ -183,7 +183,7 @@ public class RydeGpgIntegrationTest extends ShardableTestCase { // // jart@jart:/tmp$ gpg --verify /tmp/deposit.sig /tmp/deposit.ryde // gpg: Signature made Mon 26 Aug 2013 12:04:27 PM EDT using RSA-S key ID 2774D88E - // gpg: Good signature from "Domain Registry Dev " + // gpg: Good signature from "Nomulus Dev " logger.info("Running GPG to verify signature..."); { Process pid = gpg.exec(cmd.get(), "--verify", sigFile.toString(), rydeFile.toString()); diff --git a/javatests/google/registry/server/RegistryTestServer.java b/javatests/google/registry/server/RegistryTestServer.java index d352c2f4b..6e9a1ffe9 100644 --- a/javatests/google/registry/server/RegistryTestServer.java +++ b/javatests/google/registry/server/RegistryTestServer.java @@ -23,7 +23,7 @@ import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; -/** Lightweight HTTP server for testing the Domain Registry Admin and Registrar consoles. */ +/** Lightweight HTTP server for testing the Nomulus Admin and Registrar consoles. */ public final class RegistryTestServer { public static final ImmutableMap RUNFILES = diff --git a/javatests/google/registry/testing/RegistryConfigRule.java b/javatests/google/registry/testing/RegistryConfigRule.java index e4c3dbb9d..7095e4dde 100644 --- a/javatests/google/registry/testing/RegistryConfigRule.java +++ b/javatests/google/registry/testing/RegistryConfigRule.java @@ -22,7 +22,7 @@ import google.registry.config.RegistryEnvironment; import google.registry.config.TestRegistryConfig; import org.junit.rules.ExternalResource; -/** JUnit Rule for overriding Domain Registry configuration values. */ +/** JUnit Rule for overriding Nomulus configuration values. */ public final class RegistryConfigRule extends ExternalResource { private final Optional override; diff --git a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java index bd07bbbb9..46f89fcf5 100644 --- a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java +++ b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java @@ -55,7 +55,7 @@ import org.junit.Rule; /** * Base test class for mapreduces. Adapted from EndToEndTestCase with some modifications that - * allow it to work with the Domain Registry project, most notably inside knowledge of our + * allow it to work with the Nomulus project, most notably inside knowledge of our * routing paths and our Datastore/Task Queue configurations. * *

See https://github.com/GoogleCloudPlatform/appengine-mapreduce/blob/master/java/src/test/java/com/google/appengine/tools/mapreduce/EndToEndTestCase.java diff --git a/javatests/google/registry/ui/js/registrar/console_test.js b/javatests/google/registry/ui/js/registrar/console_test.js index 3a4bd85f1..0c98b16ee 100644 --- a/javatests/google/registry/ui/js/registrar/console_test.js +++ b/javatests/google/registry/ui/js/registrar/console_test.js @@ -53,7 +53,7 @@ function setUp() { clientId: test.testClientId, showPaymentLink: false, logoFilename: 'logo.png', - productName: 'Domain Registry' + productName: 'Nomulus' }); registry.registrar.ConsoleTestUtil.setup(test); var regNavlist = $('reg-navlist'); diff --git a/javatests/google/registry/ui/js/registrar/contact_settings_test.js b/javatests/google/registry/ui/js/registrar/contact_settings_test.js index 34040e938..b9a2d4249 100644 --- a/javatests/google/registry/ui/js/registrar/contact_settings_test.js +++ b/javatests/google/registry/ui/js/registrar/contact_settings_test.js @@ -52,7 +52,7 @@ function setUp() { clientId: test.testClientId, showPaymentLink: false, logoFilename: 'logo.png', - productName: 'Domain Registry' + productName: 'Nomulus' }); stubs.setPath('goog.net.XhrIo', goog.testing.net.XhrIo); registry.registrar.ConsoleTestUtil.setup(test); diff --git a/javatests/google/registry/ui/js/registrar/contact_test.js b/javatests/google/registry/ui/js/registrar/contact_test.js index f5e58a795..9cfa49c40 100644 --- a/javatests/google/registry/ui/js/registrar/contact_test.js +++ b/javatests/google/registry/ui/js/registrar/contact_test.js @@ -43,7 +43,7 @@ function setUp() { clientId: 'daddy', showPaymentLink: false, logoFilename: 'logo.png', - productName: 'Domain Registry' + productName: 'Nomulus' }); registry.registrar.ConsoleTestUtil.setup(test); } diff --git a/javatests/google/registry/ui/js/registrar/domain_test.js b/javatests/google/registry/ui/js/registrar/domain_test.js index 605529f2e..7002df41f 100644 --- a/javatests/google/registry/ui/js/registrar/domain_test.js +++ b/javatests/google/registry/ui/js/registrar/domain_test.js @@ -49,7 +49,7 @@ function setUp() { clientId: 'ignore', showPaymentLink: false, logoFilename: 'logo.png', - productName: 'Domain Registry' + productName: 'Nomulus' }); stubs.setPath('goog.net.XhrIo', goog.testing.net.XhrIo); diff --git a/javatests/google/registry/ui/js/registrar/host_test.js b/javatests/google/registry/ui/js/registrar/host_test.js index ee1584b3c..ac139f917 100644 --- a/javatests/google/registry/ui/js/registrar/host_test.js +++ b/javatests/google/registry/ui/js/registrar/host_test.js @@ -49,7 +49,7 @@ function setUp() { clientId: 'ignore', showPaymentLink: false, logoFilename: 'logo.png', - productName: 'Domain Registry' + productName: 'Nomulus' }); stubs.setPath('goog.net.XhrIo', goog.testing.net.XhrIo); diff --git a/javatests/google/registry/ui/js/registrar/security_settings_test.js b/javatests/google/registry/ui/js/registrar/security_settings_test.js index 11f622230..d14d5c3a6 100644 --- a/javatests/google/registry/ui/js/registrar/security_settings_test.js +++ b/javatests/google/registry/ui/js/registrar/security_settings_test.js @@ -57,7 +57,7 @@ function setUp() { clientId: test.testClientId, showPaymentLink: false, logoFilename: 'logo.png', - productName: 'Domain Registry' + productName: 'Nomulus' }); stubs.setPath('goog.net.XhrIo', goog.testing.net.XhrIo); registry.registrar.ConsoleTestUtil.setup(test); diff --git a/javatests/google/registry/ui/js/registrar/whois_settings_test.js b/javatests/google/registry/ui/js/registrar/whois_settings_test.js index e59a3f240..6fc9fa5a9 100644 --- a/javatests/google/registry/ui/js/registrar/whois_settings_test.js +++ b/javatests/google/registry/ui/js/registrar/whois_settings_test.js @@ -51,7 +51,7 @@ function setUp() { clientId: test.testClientId, showPaymentLink: false, logoFilename: 'logo.png', - productName: 'Domain Registry' + productName: 'Nomulus' }); stubs.setPath('goog.net.XhrIo', goog.testing.net.XhrIo); registry.registrar.ConsoleTestUtil.setup(test); diff --git a/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java b/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java index a34c9f81f..7a8175fd4 100644 --- a/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java +++ b/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java @@ -51,7 +51,7 @@ public class ConsoleUiActionTest { public void setUp() throws Exception { action.enabled = true; action.logoFilename = "logo.png"; - action.productName = "Domain Registry"; + action.productName = "Nomulus"; action.response = response; action.sessionUtils = sessionUtils; action.userService = UserServiceFactory.getUserService();