From d355aebe0174856bdf30f8769c8e8323482c9864 Mon Sep 17 00:00:00 2001 From: jianglai Date: Thu, 13 Oct 2016 13:37:28 -0700 Subject: [PATCH] Fix a few incorrect mentions of Nomulus ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=136079699 --- java/google/registry/config/RegistryConfig.java | 2 +- java/google/registry/config/RegistryEnvironment.java | 2 +- java/google/registry/env/common/backend/WEB-INF/web.xml | 2 +- java/google/registry/env/common/default/WEB-INF/web.xml | 2 +- java/google/registry/env/common/tools/WEB-INF/web.xml | 2 +- javatests/google/registry/rde/RydeGpgIntegrationTest.java | 5 ++--- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java index 4ec2ba61b..08cdc0512 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; /** - * Nomulus configuration for global constants that can't be injected. + * Registry 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. diff --git a/java/google/registry/config/RegistryEnvironment.java b/java/google/registry/config/RegistryEnvironment.java index 5e66d274e..d485863e4 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 Nomulus environment. + * Returns configuration for this registry 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/env/common/backend/WEB-INF/web.xml b/java/google/registry/env/common/backend/WEB-INF/web.xml index 3c3aa64b8..8eb70695d 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 Nomulus to follow AppEngine naming conventions. + The `_dr` is short for domain registry 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 be435c9d2..9e5840bb9 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 Nomulus to follow AppEngine naming conventions. + The `_dr` is short for domain registry 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 28db3c4ad..d6b72a6ff 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 Nomulus to follow AppEngine naming conventions. + The `_dr` is short for domain registry to follow AppEngine naming conventions. /_dr/* diff --git a/javatests/google/registry/rde/RydeGpgIntegrationTest.java b/javatests/google/registry/rde/RydeGpgIntegrationTest.java index a62cc036c..aec422a46 100644 --- a/javatests/google/registry/rde/RydeGpgIntegrationTest.java +++ b/javatests/google/registry/rde/RydeGpgIntegrationTest.java @@ -134,7 +134,6 @@ public class RydeGpgIntegrationTest extends ShardableTestCase { // Iron Mountain examines the ryde file to see what sort of OpenPGP layers it contains. // - // jart@jart:/tmp$ gpg --list-packets /tmp/deposit.ryde // :pubkey enc packet: version 3, algo 1, keyid 239F455A2ACEE5C2 // data: [2047 bits] // :encrypted data packet: @@ -179,11 +178,11 @@ public class RydeGpgIntegrationTest extends ShardableTestCase { assertWithMessage("Unexpected receiver public key").that(stderr).contains("ID 54E1EB0F"); } - // Iron Mountain now verifies that rydeFile is authentic and was signed by Google. + // Iron Mountain now verifies that rydeFile is authentic and was signed appropriately. // // 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 "Nomulus Dev " + // gpg: Good signature from logger.info("Running GPG to verify signature..."); { Process pid = gpg.exec(cmd.get(), "--verify", sigFile.toString(), rydeFile.toString());