Rename Java packages to use the .google TLD

The dark lord Gosling designed the Java package naming system so that
ownership flows from the DNS system. Since we own the domain name
registry.google, it seems only appropriate that we should use
google.registry as our package name.

CONTRIBUTORS

@@ -21,5 +21,5 @@ Jared Brothers <brothers@google.com>
 Pablo Mayrgundter <pmy@google.com>
 Daisuke Yabuki <dxy@google.com>
 Tim Boring <tjb@google.com>
-Hans Ridder <hans.ridder@gmail.com>
 Wolfgang Meyers <wolfgang@donuts.co>
+Hans Ridder <hans.ridder@gmail.com>

README.md

@@ -83,14 +83,14 @@ locally. Once that's done, here are some example commands to get you started:
 
 ```sh
 # Run all tests
-bazel test //java{,tests}/com/google/domain/registry/...
+bazel test //java{,tests}/google/registry/...
 
 # Run the registry_tool command
-bazel run //java/com/google/domain/registry/tool:registry_tool -- --help
+bazel run //java/google/registry/tool:registry_tool -- --help
 
 # Run the Registrar Console on a local development server
-bazel run //javatests/com/google/domain/registry/server -- --help
+bazel run //javatests/google/registry/server -- --help
-bazel run //javatests/com/google/domain/registry/server
+bazel run //javatests/google/registry/server
 google-chrome http://localhost:8080/registrar
 ```
 

WORKSPACE

@@ -1,5 +1,5 @@
 workspace(name = "domain_registry")
 
-load("//java/com/google/domain/registry:repositories.bzl", "domain_registry_repositories")
+load("//java/google/registry:repositories.bzl", "domain_registry_repositories")
 
 domain_registry_repositories()

java/google/registry/BUILD

@@ -1,11 +1,13 @@
-package(default_visibility = ["//visibility:public"])
+package(default_visibility = ["//third_party/java_src/gtld:__subpackages__"])
+
+licenses(["notice"])  # Apache 2.0
 
 
 package_group(
     name = "registry_project",
     packages = [
-        "//java/com/google/domain/registry/...",
+        "//java/google/registry/...",
-        "//javatests/com/google/domain/registry/...",
+        "//javatests/google/registry/...",
     ],
 )
 

java/google/registry/backup/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 
 java_library(
     name = "backup",
@@ -13,11 +15,6 @@ java_library(
         "//java/com/google/common/net",
         "//java/com/google/common/primitives",
         "//java/com/google/common/util/concurrent",
-        "//java/com/google/domain/registry/config",
-        "//java/com/google/domain/registry/cron",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/request",
-        "//java/com/google/domain/registry/util",
         "//third_party/java/appengine:appengine-api",
         "//third_party/java/appengine_gcs_client",
         "//third_party/java/dagger",
@@ -27,5 +24,10 @@ java_library(
         "//third_party/java/jsr330_inject",
         "//third_party/java/objectify:objectify-v4_1",
         "//third_party/java/servlet/servlet_api",
+        "//java/google/registry/config",
+        "//java/google/registry/cron",
+        "//java/google/registry/model",
+        "//java/google/registry/request",
+        "//java/google/registry/util",
     ],
 )

java/google/registry/backup/BackupModule.java

@@ -12,26 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.backup;
+package google.registry.backup;
 
 import static com.google.appengine.api.ThreadManager.currentRequestThreadFactory;
 import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
-import static com.google.domain.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM;
+import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM;
-import static com.google.domain.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM;
+import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM;
-import static com.google.domain.registry.backup.RestoreCommitLogsAction.FROM_TIME_PARAM;
+import static google.registry.backup.RestoreCommitLogsAction.FROM_TIME_PARAM;
-import static com.google.domain.registry.request.RequestParameters.extractRequiredDatetimeParameter;
+import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter;
-import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter;
+import static google.registry.request.RequestParameters.extractRequiredParameter;
 import static java.util.concurrent.Executors.newFixedThreadPool;
 
 import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.domain.registry.cron.CommitLogFanoutAction;
-import com.google.domain.registry.request.HttpException.BadRequestException;
-import com.google.domain.registry.request.Parameter;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.cron.CommitLogFanoutAction;
+import google.registry.request.HttpException.BadRequestException;
+import google.registry.request.Parameter;
+
 import org.joda.time.DateTime;
 
 import java.lang.annotation.Documented;
@@ -42,7 +43,7 @@ import javax.servlet.http.HttpServletRequest;
 /**
  * Dagger module for backup package.
  *
- * @see "com.google.domain.registry.module.backend.BackendComponent"
+ * @see "google.registry.module.backend.BackendComponent"
  */
 @Module
 public final class BackupModule {

java/google/registry/backup/BackupUtils.java

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.backup;
+package google.registry.backup;
 
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.google.appengine.api.datastore.EntityTranslator;
 import com.google.common.collect.AbstractIterator;
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.model.ImmutableObject;
 import com.google.storage.onestore.v3.OnestoreEntity.EntityProto;
 
+import google.registry.model.ImmutableObject;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;

java/google/registry/backup/CommitLogCheckpointAction.java

@@ -12,25 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.backup;
+package google.registry.backup;
 
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
-import static com.google.domain.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM;
+import static google.registry.backup.ExportCommitLogDiffAction.LOWER_CHECKPOINT_TIME_PARAM;
-import static com.google.domain.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM;
+import static google.registry.backup.ExportCommitLogDiffAction.UPPER_CHECKPOINT_TIME_PARAM;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt;
+import static google.registry.util.DateTimeUtils.isBeforeOrAt;
-import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass;
+import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
-
-import com.google.domain.registry.model.ofy.CommitLogCheckpoint;
-import com.google.domain.registry.model.ofy.CommitLogCheckpointRoot;
-import com.google.domain.registry.request.Action;
-import com.google.domain.registry.util.Clock;
-import com.google.domain.registry.util.FormattingLogger;
-import com.google.domain.registry.util.TaskEnqueuer;
 
 import com.googlecode.objectify.VoidWork;
 
+import google.registry.model.ofy.CommitLogCheckpoint;
+import google.registry.model.ofy.CommitLogCheckpointRoot;
+import google.registry.request.Action;
+import google.registry.util.Clock;
+import google.registry.util.FormattingLogger;
+import google.registry.util.TaskEnqueuer;
+
 import org.joda.time.DateTime;
 
 import javax.inject.Inject;

java/google/registry/backup/CommitLogCheckpointStrategy.java

@@ -12,26 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.backup;
+package google.registry.backup;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.Maps.transformValues;
-import static com.google.domain.registry.model.ofy.CommitLogBucket.getBucketKey;
+import static google.registry.model.ofy.CommitLogBucket.getBucketKey;
-import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME;
+import static google.registry.util.DateTimeUtils.END_OF_TIME;
-import static com.google.domain.registry.util.DateTimeUtils.earliestOf;
+import static google.registry.util.DateTimeUtils.earliestOf;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableMap;
-import com.google.domain.registry.model.ofy.CommitLogBucket;
-import com.google.domain.registry.model.ofy.CommitLogCheckpoint;
-import com.google.domain.registry.model.ofy.CommitLogManifest;
-import com.google.domain.registry.model.ofy.Ofy;
-import com.google.domain.registry.util.Clock;
 
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Work;
 
+import google.registry.model.ofy.CommitLogBucket;
+import google.registry.model.ofy.CommitLogCheckpoint;
+import google.registry.model.ofy.CommitLogManifest;
+import google.registry.model.ofy.Ofy;
+import google.registry.util.Clock;
+
 import org.joda.time.DateTime;
 
 import java.util.List;

java/google/registry/backup/DeleteOldCommitLogsAction.java

@@ -12,30 +12,31 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.backup;
+package google.registry.backup;
 
 import static com.google.common.collect.ImmutableList.copyOf;
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.transform;
-import static com.google.domain.registry.model.ofy.CommitLogBucket.getBucketKey;
+import static google.registry.model.ofy.CommitLogBucket.getBucketKey;
-import static com.google.domain.registry.request.Action.Method.POST;
+import static google.registry.request.Action.Method.POST;
 
 import com.google.common.base.Function;
-import com.google.domain.registry.config.ConfigModule.Config;
-import com.google.domain.registry.model.ofy.CommitLogBucket;
-import com.google.domain.registry.model.ofy.CommitLogManifest;
-import com.google.domain.registry.model.ofy.CommitLogMutation;
-import com.google.domain.registry.model.ofy.Ofy;
-import com.google.domain.registry.request.Action;
-import com.google.domain.registry.request.Parameter;
-import com.google.domain.registry.util.Clock;
-import com.google.domain.registry.util.FormattingLogger;
 
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Work;
 import com.googlecode.objectify.cmd.Loader;
 import com.googlecode.objectify.cmd.Query;
 
+import google.registry.config.ConfigModule.Config;
+import google.registry.model.ofy.CommitLogBucket;
+import google.registry.model.ofy.CommitLogManifest;
+import google.registry.model.ofy.CommitLogMutation;
+import google.registry.model.ofy.Ofy;
+import google.registry.request.Action;
+import google.registry.request.Parameter;
+import google.registry.util.Clock;
+import google.registry.util.FormattingLogger;
+
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 
@@ -72,7 +73,7 @@ import javax.inject.Inject;
  * there's a 10mB upper bound on transaction size and a four minute time limit, we can only delete
  * so many commit logs at once. So given the above constraints, five hundred would make a safe
  * default value for {@code maxDeletes}. See {@linkplain
- * com.google.domain.registry.config.ConfigModule#provideCommitLogMaxDeletes() commitLogMaxDeletes}
+ * google.registry.config.ConfigModule#provideCommitLogMaxDeletes() commitLogMaxDeletes}
  * for further documentation on this matter.
  *
  * <p>Finally, we need to pick an appropriate cron interval time for this task. Since a bucket

java/google/registry/backup/ExportCommitLogDiffAction.java

@@ -12,21 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.backup;
+package google.registry.backup;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Lists.partition;
-import static com.google.domain.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT;
+import static google.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT;
-import static com.google.domain.registry.backup.BackupUtils.GcsMetadataKeys.NUM_TRANSACTIONS;
+import static google.registry.backup.BackupUtils.GcsMetadataKeys.NUM_TRANSACTIONS;
-import static com.google.domain.registry.backup.BackupUtils.GcsMetadataKeys.UPPER_BOUND_CHECKPOINT;
+import static google.registry.backup.BackupUtils.GcsMetadataKeys.UPPER_BOUND_CHECKPOINT;
-import static com.google.domain.registry.backup.BackupUtils.serializeEntity;
+import static google.registry.backup.BackupUtils.serializeEntity;
-import static com.google.domain.registry.model.ofy.CommitLogBucket.getBucketKey;
+import static google.registry.model.ofy.CommitLogBucket.getBucketKey;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME;
+import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter;
+import static google.registry.util.DateTimeUtils.isAtOrAfter;
-import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass;
+import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static java.nio.channels.Channels.newOutputStream;
 import static java.util.Arrays.asList;
 
@@ -38,18 +38,19 @@ import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.config.ConfigModule.Config;
-import com.google.domain.registry.model.ImmutableObject;
-import com.google.domain.registry.model.ofy.CommitLogBucket;
-import com.google.domain.registry.model.ofy.CommitLogCheckpoint;
-import com.google.domain.registry.model.ofy.CommitLogManifest;
-import com.google.domain.registry.model.ofy.CommitLogMutation;
-import com.google.domain.registry.request.Action;
-import com.google.domain.registry.request.Parameter;
-import com.google.domain.registry.util.FormattingLogger;
 
 import com.googlecode.objectify.Key;
 
+import google.registry.config.ConfigModule.Config;
+import google.registry.model.ImmutableObject;
+import google.registry.model.ofy.CommitLogBucket;
+import google.registry.model.ofy.CommitLogCheckpoint;
+import google.registry.model.ofy.CommitLogManifest;
+import google.registry.model.ofy.CommitLogMutation;
+import google.registry.request.Action;
+import google.registry.request.Parameter;
+import google.registry.util.FormattingLogger;
+
 import org.joda.time.DateTime;
 
 import java.io.IOException;

java/google/registry/backup/GcsDiffFileLister.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.backup;
+package google.registry.backup;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.domain.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT;
+import static google.registry.backup.BackupUtils.GcsMetadataKeys.LOWER_BOUND_CHECKPOINT;
-import static com.google.domain.registry.backup.ExportCommitLogDiffAction.DIFF_FILE_PREFIX;
+import static google.registry.backup.ExportCommitLogDiffAction.DIFF_FILE_PREFIX;
-import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME;
+import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt;
+import static google.registry.util.DateTimeUtils.isBeforeOrAt;
-import static com.google.domain.registry.util.DateTimeUtils.latestOf;
+import static google.registry.util.DateTimeUtils.latestOf;
 
 import com.google.appengine.tools.cloudstorage.GcsFileMetadata;
 import com.google.appengine.tools.cloudstorage.GcsFilename;
@@ -30,9 +30,10 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.domain.registry.backup.BackupModule.Backups;
+
-import com.google.domain.registry.config.ConfigModule.Config;
+import google.registry.backup.BackupModule.Backups;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.config.ConfigModule.Config;
+import google.registry.util.FormattingLogger;
 
 import org.joda.time.DateTime;
 

java/google/registry/backup/RestoreCommitLogsAction.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.backup;
+package google.registry.backup;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.Iterators.peekingIterator;
-import static com.google.domain.registry.backup.BackupUtils.createDeserializingIterator;
+import static google.registry.backup.BackupUtils.createDeserializingIterator;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 import static java.util.Arrays.asList;
 
 import com.google.appengine.api.datastore.DatastoreService;
@@ -29,22 +29,23 @@ import com.google.common.base.Function;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Lists;
 import com.google.common.collect.PeekingIterator;
-import com.google.domain.registry.config.RegistryEnvironment;
-import com.google.domain.registry.model.ImmutableObject;
-import com.google.domain.registry.model.ofy.CommitLogBucket;
-import com.google.domain.registry.model.ofy.CommitLogCheckpoint;
-import com.google.domain.registry.model.ofy.CommitLogCheckpointRoot;
-import com.google.domain.registry.model.ofy.CommitLogManifest;
-import com.google.domain.registry.model.ofy.CommitLogMutation;
-import com.google.domain.registry.request.Action;
-import com.google.domain.registry.request.Parameter;
-import com.google.domain.registry.util.FormattingLogger;
-import com.google.domain.registry.util.Retrier;
 
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Result;
 import com.googlecode.objectify.util.ResultNow;
 
+import google.registry.config.RegistryEnvironment;
+import google.registry.model.ImmutableObject;
+import google.registry.model.ofy.CommitLogBucket;
+import google.registry.model.ofy.CommitLogCheckpoint;
+import google.registry.model.ofy.CommitLogCheckpointRoot;
+import google.registry.model.ofy.CommitLogManifest;
+import google.registry.model.ofy.CommitLogMutation;
+import google.registry.request.Action;
+import google.registry.request.Parameter;
+import google.registry.util.FormattingLogger;
+import google.registry.util.Retrier;
+
 import org.joda.time.DateTime;
 
 import java.io.IOException;

java/google/registry/backup/package-info.java

@@ -13,4 +13,4 @@
 // limitations under the License.
 
 @javax.annotation.ParametersAreNonnullByDefault
-package com.google.domain.registry.backup;
+package google.registry.backup;

java/google/registry/bigquery/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 
 java_library(
     name = "bigquery",
@@ -21,12 +23,12 @@ java_library(
         "//java/com/google/common/collect",
         "//java/com/google/common/io",
         "//java/com/google/common/util/concurrent",
-        "//java/com/google/domain/registry/config",
-        "//java/com/google/domain/registry/request",
-        "//java/com/google/domain/registry/util",
         "//third_party/java/dagger",
         "//third_party/java/joda_time",
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
+        "//java/google/registry/config",
+        "//java/google/registry/request",
+        "//java/google/registry/util",
     ],
 )

java/google/registry/bigquery/BigqueryConnection.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.bigquery;
+package google.registry.bigquery;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.base.Verify.verify;
-import static com.google.domain.registry.bigquery.BigqueryUtils.toJobReferenceString;
+import static google.registry.bigquery.BigqueryUtils.toJobReferenceString;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
@@ -56,16 +56,17 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.google.domain.registry.bigquery.BigqueryUtils.DestinationFormat;
+
-import com.google.domain.registry.bigquery.BigqueryUtils.SourceFormat;
+import google.registry.bigquery.BigqueryUtils.DestinationFormat;
-import com.google.domain.registry.bigquery.BigqueryUtils.TableType;
+import google.registry.bigquery.BigqueryUtils.SourceFormat;
-import com.google.domain.registry.bigquery.BigqueryUtils.WriteDisposition;
+import google.registry.bigquery.BigqueryUtils.TableType;
-import com.google.domain.registry.config.RegistryEnvironment;
+import google.registry.bigquery.BigqueryUtils.WriteDisposition;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.config.RegistryEnvironment;
-import com.google.domain.registry.util.NonFinalForTesting;
+import google.registry.util.FormattingLogger;
-import com.google.domain.registry.util.Sleeper;
+import google.registry.util.NonFinalForTesting;
-import com.google.domain.registry.util.SqlTemplate;
+import google.registry.util.Sleeper;
-import com.google.domain.registry.util.SystemSleeper;
+import google.registry.util.SqlTemplate;
+import google.registry.util.SystemSleeper;
 
 import org.joda.time.DateTime;
 import org.joda.time.Duration;

java/google/registry/bigquery/BigqueryFactory.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.bigquery;
+package google.registry.bigquery;
 
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.Sets.newConcurrentHashSet;
-import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass;
+import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 
 import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
 import com.google.api.client.googleapis.extensions.appengine.auth.oauth2.AppIdentityCredential;
@@ -34,7 +34,8 @@ import com.google.api.services.bigquery.model.TableFieldSchema;
 import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.TableSchema;
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.util.FormattingLogger;
+
+import google.registry.util.FormattingLogger;
 
 import java.io.IOException;
 import java.util.List;

java/google/registry/bigquery/BigqueryJobFailureException.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.bigquery;
+package google.registry.bigquery;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

java/google/registry/bigquery/BigqueryModule.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.bigquery;
+package google.registry.bigquery;
 
 import static dagger.Provides.Type.SET_VALUES;
 
@@ -23,24 +23,25 @@ import com.google.api.services.bigquery.Bigquery;
 import com.google.api.services.bigquery.BigqueryScopes;
 import com.google.api.services.bigquery.model.TableFieldSchema;
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.config.ConfigModule.Config;
-import com.google.domain.registry.request.OAuthScopes;
 
 import dagger.Module;
 import dagger.Multibindings;
 import dagger.Provides;
 
+import google.registry.config.ConfigModule.Config;
+import google.registry.request.OAuthScopes;
+
 import java.util.Map;
 import java.util.Set;
 
 /**
  * Dagger module for Google {@link Bigquery} connection objects.
  *
- * @see com.google.domain.registry.config.ConfigModule
+ * @see google.registry.config.ConfigModule
- * @see com.google.domain.registry.request.Modules.UrlFetchTransportModule
+ * @see google.registry.request.Modules.UrlFetchTransportModule
- * @see com.google.domain.registry.request.Modules.Jackson2Module
+ * @see google.registry.request.Modules.Jackson2Module
- * @see com.google.domain.registry.request.Modules.AppIdentityCredentialModule
+ * @see google.registry.request.Modules.AppIdentityCredentialModule
- * @see com.google.domain.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule
+ * @see google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule
  */
 @Module
 public final class BigqueryModule {

java/google/registry/bigquery/BigqueryUtils.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.bigquery;
+package google.registry.bigquery;
 
 import com.google.api.services.bigquery.model.JobReference;
 

java/google/registry/bigquery/package-info.java

@@ -13,4 +13,4 @@
 // limitations under the License.
 
 @javax.annotation.ParametersAreNonnullByDefault
-package com.google.domain.registry.bigquery;
+package google.registry.bigquery;

java/google/registry/braintree/BUILD

@@ -1,4 +1,6 @@
-package(default_visibility = ["//java/com/google/domain/registry:registry_project"])
+package(default_visibility = ["//java/google/registry:registry_project"])
+
+licenses(["notice"])  # Apache 2.0
 
 
 java_library(
@@ -7,12 +9,12 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/base",
-        "//java/com/google/domain/registry/config",
-        "//java/com/google/domain/registry/keyring/api",
-        "//java/com/google/domain/registry/model",
         "//third_party/java/braintree",
         "//third_party/java/dagger",
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
+        "//java/google/registry/config",
+        "//java/google/registry/keyring/api",
+        "//java/google/registry/model",
     ],
 )

java/google/registry/braintree/BraintreeModule.java

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.braintree;
+package google.registry.braintree;
-
-import com.google.domain.registry.config.ConfigModule.Config;
-import com.google.domain.registry.config.RegistryEnvironment;
-import com.google.domain.registry.keyring.api.KeyModule.Key;
 
 import com.braintreegateway.BraintreeGateway;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.config.ConfigModule.Config;
+import google.registry.config.RegistryEnvironment;
+import google.registry.keyring.api.KeyModule.Key;
+
 import javax.inject.Singleton;
 
 /** Dagger module for Braintree Payments API. */

java/google/registry/braintree/BraintreeRegistrarSyncer.java

@@ -12,15 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.braintree;
+package google.registry.braintree;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
 
 import com.google.common.base.Optional;
 import com.google.common.base.VerifyException;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registrar.RegistrarContact;
 
 import com.braintreegateway.BraintreeGateway;
 import com.braintreegateway.Customer;
@@ -28,6 +26,9 @@ import com.braintreegateway.CustomerRequest;
 import com.braintreegateway.Result;
 import com.braintreegateway.exceptions.NotFoundException;
 
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.RegistrarContact;
+
 import javax.inject.Inject;
 
 /** Helper for creating Braintree customer entries for registrars. */

java/google/registry/braintree/package-info.java

@@ -14,4 +14,4 @@
 
 /** Braintree payment gateway utilities. */
 @javax.annotation.ParametersAreNonnullByDefault
-package com.google.domain.registry.braintree;
+package google.registry.braintree;

java/google/registry/config/BUILD

@@ -1,4 +1,6 @@
-package(default_visibility = ["//java/com/google/domain/registry:registry_project"])
+package(default_visibility = ["//java/google/registry:registry_project"])
+
+licenses(["notice"])  # Apache 2.0
 
 
 java_library(

java/google/registry/config/ConfigModule.java

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.config;
+package google.registry.config;
 
-import static com.google.domain.registry.config.ConfigUtils.makeUrl;
+import static google.registry.config.ConfigUtils.makeUrl;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
@@ -101,7 +101,7 @@ public final class ConfigModule {
    * since each query would have about 500ms to complete, which is an order a magnitude more time
    * than we need. However this does not apply, since the subqueries are performed asynchronously.
    *
-   * @see com.google.domain.registry.backup.DeleteOldCommitLogsAction
+   * @see google.registry.backup.DeleteOldCommitLogsAction
    */
   @Provides
   @Config("commitLogMaxDeletes")
@@ -113,7 +113,7 @@ public final class ConfigModule {
    * Batch size for the number of transactions' worth of commit log data to process at once when
    * exporting a commit log diff.
    *
-   * @see com.google.domain.registry.backup.ExportCommitLogDiffAction
+   * @see google.registry.backup.ExportCommitLogDiffAction
    */
   @Provides
   @Config("commitLogDiffExportBatchSize")
@@ -124,7 +124,7 @@ public final class ConfigModule {
   /**
    * Returns the Google Cloud Storage bucket for staging BRDA escrow deposits.
    *
-   * @see com.google.domain.registry.rde.PendingDepositChecker
+   * @see google.registry.rde.PendingDepositChecker
    */
   @Provides
   @Config("brdaBucket")
@@ -132,7 +132,7 @@ public final class ConfigModule {
     return projectId + "-icann-brda";
   }
 
-  /** @see com.google.domain.registry.rde.BrdaCopyAction */
+  /** @see google.registry.rde.BrdaCopyAction */
   @Provides
   @Config("brdaDayOfWeek")
   public static int provideBrdaDayOfWeek() {
@@ -200,7 +200,7 @@ public final class ConfigModule {
    *
    * <p><b>Warning:</b> This number may increase but never decrease.
    *
-   * @see com.google.domain.registry.model.index.EppResourceIndex
+   * @see google.registry.model.index.EppResourceIndex
    */
   @Provides
   @Config("eppResourceIndexBucketCount")
@@ -211,7 +211,7 @@ public final class ConfigModule {
   /**
    * Returns size of Google Cloud Storage client connection buffer in bytes.
    *
-   * @see com.google.domain.registry.gcs.GcsUtils
+   * @see google.registry.gcs.GcsUtils
    */
   @Provides
   @Config("gcsBufferSize")
@@ -222,7 +222,7 @@ public final class ConfigModule {
   /**
    * Gets the email address of the admin account for the Google App.
    *
-   * @see com.google.domain.registry.groups.DirectoryGroupsConnection
+   * @see google.registry.groups.DirectoryGroupsConnection
    */
   @Provides
   @Config("googleAppsAdminEmailAddress")
@@ -238,8 +238,8 @@ public final class ConfigModule {
   /**
    * Returns the publicly accessible domain name for the running Google Apps instance.
    *
-   * @see com.google.domain.registry.export.SyncGroupMembersAction
+   * @see google.registry.export.SyncGroupMembersAction
-   * @see com.google.domain.registry.tools.server.CreateGroupsAction
+   * @see google.registry.tools.server.CreateGroupsAction
    */
   @Provides
   @Config("publicDomainName")
@@ -264,7 +264,7 @@ public final class ConfigModule {
    * <p>This file needs to be downloaded at least once a day and verified to make sure it was
    * signed by {@code icann-tmch.crt}.
    *
-   * @see com.google.domain.registry.tmch.TmchCrlAction
+   * @see google.registry.tmch.TmchCrlAction
    * @see "http://tools.ietf.org/html/draft-lozano-tmch-func-spec-08#section-5.2.3.2"
    */
   @Provides
@@ -287,7 +287,7 @@ public final class ConfigModule {
   /**
    * Returns the Google Cloud Storage bucket for staging escrow deposits pending upload.
    *
-   * @see com.google.domain.registry.rde.RdeStagingAction
+   * @see google.registry.rde.RdeStagingAction
    */
   @Provides
   @Config("rdeBucket")
@@ -298,7 +298,7 @@ public final class ConfigModule {
   /**
    * Size of Ghostryde buffer in bytes for each layer in the pipeline.
    *
-   * @see com.google.domain.registry.rde.Ghostryde
+   * @see google.registry.rde.Ghostryde
    */
   @Provides
   @Config("rdeGhostrydeBufferSize")
@@ -325,7 +325,7 @@ public final class ConfigModule {
    *
    * <p>You must append {@code "/TLD/ID"} to this URL.
    *
-   * @see com.google.domain.registry.rde.RdeReportAction
+   * @see google.registry.rde.RdeReportAction
    */
   @Provides
   @Config("rdeReportUrlPrefix")
@@ -341,10 +341,10 @@ public final class ConfigModule {
   /**
    * Size of RYDE generator buffer in bytes for each of the five layers.
    *
-   * @see com.google.domain.registry.rde.RydePgpCompressionOutputStream
+   * @see google.registry.rde.RydePgpCompressionOutputStream
-   * @see com.google.domain.registry.rde.RydePgpFileOutputStream
+   * @see google.registry.rde.RydePgpFileOutputStream
-   * @see com.google.domain.registry.rde.RydePgpSigningOutputStream
+   * @see google.registry.rde.RydePgpSigningOutputStream
-   * @see com.google.domain.registry.rde.RydeTarOutputStream
+   * @see google.registry.rde.RydeTarOutputStream
    */
   @Provides
   @Config("rdeRydeBufferSize")
@@ -382,7 +382,7 @@ public final class ConfigModule {
    * which cloud storage files are uploaded. The password should not be included, as it's better to
    * use public key authentication.
    *
-   * @see com.google.domain.registry.rde.RdeUploadAction
+   * @see google.registry.rde.RdeUploadAction
    */
   @Provides
   @Config("rdeUploadUrl")
@@ -413,7 +413,7 @@ public final class ConfigModule {
    *
    * <p>This ID, as you'd expect, comes from the URL of the spreadsheet.
    *
-   * @see com.google.domain.registry.export.sheet.SyncRegistrarsSheetAction
+   * @see google.registry.export.sheet.SyncRegistrarsSheetAction
    */
   @Provides
   @Config("sheetRegistrarId")
@@ -443,7 +443,7 @@ public final class ConfigModule {
   /**
    * Returns SSH client connection and read timeout.
    *
-   * @see com.google.domain.registry.rde.RdeUploadAction
+   * @see google.registry.rde.RdeUploadAction
    */
   @Provides
   @Config("sshTimeout")
@@ -463,7 +463,7 @@ public final class ConfigModule {
    *
    * <p>The number of milliseconds it'll sleep before giving up is {@code 2^n - 2}.
    *
-   * @see com.google.domain.registry.util.TaskEnqueuer
+   * @see google.registry.util.TaskEnqueuer
    */
   @Provides
   @Config("transientFailureRetries")
@@ -474,7 +474,7 @@ public final class ConfigModule {
   /**
    * Amount of time public HTTP proxies are permitted to cache our WHOIS responses.
    *
-   * @see com.google.domain.registry.whois.WhoisHttpServer
+   * @see google.registry.whois.WhoisHttpServer
    */
   @Provides
   @Config("whoisHttpExpires")
@@ -485,7 +485,7 @@ public final class ConfigModule {
   /**
    * Maximum number of results to return for an RDAP search query
    *
-   * @see com.google.domain.registry.rdap.RdapActionBase
+   * @see google.registry.rdap.RdapActionBase
    */
   @Provides
   @Config("rdapResultSetMaxSize")
@@ -496,7 +496,7 @@ public final class ConfigModule {
   /**
    * Base for RDAP link paths.
    *
-   * @see com.google.domain.registry.rdap.RdapActionBase
+   * @see google.registry.rdap.RdapActionBase
    */
   @Provides
   @Config("rdapLinkBase")
@@ -507,7 +507,7 @@ public final class ConfigModule {
   /**
    * WHOIS server displayed in RDAP query responses.
    *
-   * @see com.google.domain.registry.rdap.RdapActionBase
+   * @see google.registry.rdap.RdapActionBase
    */
   @Provides
   @Config("rdapWhoisServer")
@@ -554,7 +554,7 @@ public final class ConfigModule {
    *
    * <p>This is a base32 value copied from the Braintree website.
    *
-   * @see com.google.domain.registry.keyring.api.Keyring#getBraintreePrivateKey()
+   * @see google.registry.keyring.api.Keyring#getBraintreePrivateKey()
    */
   @Provides
   @Config("braintreePublicKey")

java/google/registry/config/ConfigUtils.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.config;
+package google.registry.config;
 
 import java.net.MalformedURLException;
 import java.net.URL;

java/google/registry/config/RegistryConfig.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.config;
+package google.registry.config;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
@@ -40,14 +40,14 @@ public interface RegistryConfig {
   /**
    * Returns the Google Cloud Storage bucket for storing backup snapshots.
    *
-   * @see com.google.domain.registry.export.ExportSnapshotServlet
+   * @see google.registry.export.ExportSnapshotServlet
    */
   public String getSnapshotsBucket();
 
   /**
    * Returns the Google Cloud Storage bucket for storing exported domain lists.
    *
-   * @see com.google.domain.registry.export.ExportDomainListsAction
+   * @see google.registry.export.ExportDomainListsAction
    */
   public String getDomainListsBucket();
 
@@ -62,7 +62,7 @@ public interface RegistryConfig {
    *
    * <p><b>Warning:</b> This can be raised but never lowered.
    *
-   * @see com.google.domain.registry.model.ofy.CommitLogBucket
+   * @see google.registry.model.ofy.CommitLogBucket
    */
   public int getCommitLogBucketCount();
 
@@ -72,29 +72,29 @@ public interface RegistryConfig {
    * <p>The only reason you'll want to retain this commit logs in datastore is for performing
    * point-in-time restoration queries for subsystems like RDE.
    *
-   * @see com.google.domain.registry.backup.DeleteOldCommitLogsAction
+   * @see google.registry.backup.DeleteOldCommitLogsAction
-   * @see com.google.domain.registry.model.translators.CommitLogRevisionsTranslatorFactory
+   * @see google.registry.model.translators.CommitLogRevisionsTranslatorFactory
    */
   public Duration getCommitLogDatastoreRetention();
 
   /**
    * Returns the Google Cloud Storage bucket for storing commit logs.
    *
-   * @see com.google.domain.registry.backup.ExportCommitLogDiffAction
+   * @see google.registry.backup.ExportCommitLogDiffAction
    */
   public String getCommitsBucket();
 
   /**
    * Returns the Google Cloud Storage bucket for storing zone files.
    *
-   * @see com.google.domain.registry.backup.ExportCommitLogDiffAction
+   * @see google.registry.backup.ExportCommitLogDiffAction
    */
   public String getZoneFilesBucket();
 
   /**
    * Returns {@code true} if TMCH certificate authority should be in testing mode.
    *
-   * @see com.google.domain.registry.tmch.TmchCertificateAuthority
+   * @see google.registry.tmch.TmchCertificateAuthority
    */
   public boolean getTmchCaTestingMode();
 
@@ -103,8 +103,8 @@ public interface RegistryConfig {
    *
    * <p>This URL is used for DNL, SMDRL, and LORDN.
    *
-   * @see com.google.domain.registry.tmch.Marksdb
+   * @see google.registry.tmch.Marksdb
-   * @see com.google.domain.registry.tmch.NordnUploadAction
+   * @see google.registry.tmch.NordnUploadAction
    */
   public String getTmchMarksdbUrl();
 
@@ -123,8 +123,8 @@ public interface RegistryConfig {
   /**
    * Returns the amount of time a domain label list should be cached in memory before expiring.
    *
-   * @see com.google.domain.registry.model.registry.label.ReservedList
+   * @see google.registry.model.registry.label.ReservedList
-   * @see com.google.domain.registry.model.registry.label.PremiumList
+   * @see google.registry.model.registry.label.PremiumList
    */
   public Duration getDomainLabelListCacheDuration();
 
@@ -134,21 +134,21 @@ public interface RegistryConfig {
   /**
    * Returns the header text at the top of the reserved terms exported list.
    *
-   * @see com.google.domain.registry.export.ExportUtils#exportReservedTerms
+   * @see google.registry.export.ExportUtils#exportReservedTerms
    */
   public String getReservedTermsExportDisclaimer();
 
   /**
    * Returns a display name that is used on outgoing emails sent by Domain Registry.
    *
-   * @see com.google.domain.registry.util.SendEmailUtils
+   * @see google.registry.util.SendEmailUtils
    */
   public String getGoogleAppsAdminEmailDisplayName();
 
   /**
    * Returns the email address that outgoing emails from the app are sent from.
    *
-   * @see com.google.domain.registry.util.SendEmailUtils
+   * @see google.registry.util.SendEmailUtils
    */
   public String getGoogleAppsSendFromEmailAddress();
 
@@ -165,15 +165,15 @@ public interface RegistryConfig {
    * Returns the email address(es) that notifications of registrar and/or registrar contact updates
    * should be sent to, or the empty list if updates should not be sent.
    *
-   * @see com.google.domain.registry.ui.server.registrar.RegistrarServlet
+   * @see google.registry.ui.server.registrar.RegistrarServlet
    */
   public ImmutableList<String> getRegistrarChangesNotificationEmailAddresses();
 
   /**
    * Returns default WHOIS server to use when {@code Registrar#getWhoisServer()} is {@code null}.
    *
-   * @see "com.google.domain.registry.whois.DomainWhoisResponse"
+   * @see "google.registry.whois.DomainWhoisResponse"
-   * @see "com.google.domain.registry.whois.RegistrarWhoisResponse"
+   * @see "google.registry.whois.RegistrarWhoisResponse"
    */
   public String getRegistrarDefaultWhoisServer();
 

java/google/registry/config/RegistryEnvironment.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.config;
+package google.registry.config;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -86,5 +86,5 @@ public enum RegistryEnvironment {
   private final RegistryConfig config = new TestRegistryConfig();
 
   /** System property for configuring which environment we should use. */
-  public static final String PROPERTY = "com.google.domain.registry.environment";
+  public static final String PROPERTY = "google.registry.environment";
 }

java/google/registry/config/TestRegistryConfig.java

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.config;
+package google.registry.config;
 
-import static com.google.domain.registry.config.ConfigUtils.makeUrl;
+import static google.registry.config.ConfigUtils.makeUrl;
 import static org.joda.time.Duration.standardDays;
 
 import com.google.common.base.Optional;

java/google/registry/config/package-info.java

@@ -13,4 +13,4 @@
 // limitations under the License.
 
 @javax.annotation.ParametersAreNonnullByDefault
-package com.google.domain.registry.config;
+package google.registry.config;

java/google/registry/cron/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 
 java_library(
     name = "cron",
@@ -11,9 +13,6 @@ java_library(
         "//java/com/google/common/base",
         "//java/com/google/common/collect",
         "//java/com/google/common/net",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/request",
-        "//java/com/google/domain/registry/util",
         "//third_party/java/appengine:appengine-api",
         "//third_party/java/dagger",
         "//third_party/java/joda_time",
@@ -21,5 +20,8 @@ java_library(
         "//third_party/java/jsr330_inject",
         "//third_party/java/objectify:objectify-v4_1",
         "//third_party/java/servlet/servlet_api",
+        "//java/google/registry/model",
+        "//java/google/registry/request",
+        "//java/google/registry/util",
     ],
 )

java/google/registry/cron/CommitLogFanoutAction.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.cron;
+package google.registry.cron;
 
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -20,10 +20,11 @@ import static java.util.concurrent.TimeUnit.SECONDS;
 import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.common.base.Optional;
-import com.google.domain.registry.model.ofy.CommitLogBucket;
+
-import com.google.domain.registry.request.Action;
+import google.registry.model.ofy.CommitLogBucket;
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.Action;
-import com.google.domain.registry.util.TaskEnqueuer;
+import google.registry.request.Parameter;
+import google.registry.util.TaskEnqueuer;
 
 import java.util.Random;
 

java/google/registry/cron/CronModule.java

@@ -12,20 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.cron;
+package google.registry.cron;
 
-import static com.google.domain.registry.request.RequestParameters.extractBooleanParameter;
+import static google.registry.request.RequestParameters.extractBooleanParameter;
-import static com.google.domain.registry.request.RequestParameters.extractOptionalIntParameter;
+import static google.registry.request.RequestParameters.extractOptionalIntParameter;
-import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter;
+import static google.registry.request.RequestParameters.extractRequiredParameter;
-import static com.google.domain.registry.request.RequestParameters.extractSetOfParameters;
+import static google.registry.request.RequestParameters.extractSetOfParameters;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.request.Parameter;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.request.Parameter;
+
 import javax.servlet.http.HttpServletRequest;
 
 /** Dagger module for the cron package. */

java/google/registry/cron/TldFanoutAction.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.cron;
+package google.registry.cron;
 
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
@@ -23,9 +23,9 @@ import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.getFirst;
 import static com.google.common.collect.Multimaps.filterKeys;
 import static com.google.common.collect.Sets.difference;
-import static com.google.domain.registry.model.registry.Registries.getTldsOfType;
+import static google.registry.model.registry.Registries.getTldsOfType;
-import static com.google.domain.registry.model.registry.Registry.TldType.REAL;
+import static google.registry.model.registry.Registry.TldType.REAL;
-import static com.google.domain.registry.model.registry.Registry.TldType.TEST;
+import static google.registry.model.registry.Registry.TldType.TEST;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.appengine.api.taskqueue.Queue;
@@ -34,11 +34,12 @@ import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
-import com.google.domain.registry.request.Action;
+
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.Action;
-import com.google.domain.registry.request.ParameterMap;
+import google.registry.request.Parameter;
-import com.google.domain.registry.request.RequestParameters;
+import google.registry.request.ParameterMap;
-import com.google.domain.registry.util.TaskEnqueuer;
+import google.registry.request.RequestParameters;
+import google.registry.util.TaskEnqueuer;
 
 import java.util.Random;
 import java.util.Set;

java/google/registry/cron/package-info.java

@@ -13,4 +13,4 @@
 // limitations under the License.
 
 @javax.annotation.ParametersAreNonnullByDefault
-package com.google.domain.registry.cron;
+package google.registry.cron;

java/google/registry/dns/BUILD

@@ -2,9 +2,11 @@
 #   Routines to publish authoritative DNS.
 
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 
 java_library(
     name = "constants",
@@ -25,11 +27,6 @@ java_library(
         "//java/com/google/common/html",
         "//java/com/google/common/io",
         "//java/com/google/common/net",
-        "//java/com/google/domain/registry/config",
-        "//java/com/google/domain/registry/dns/writer/api",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/request",
-        "//java/com/google/domain/registry/util",
         "//third_party/java/appengine:appengine-api",
         "//third_party/java/dagger",
         "//third_party/java/joda_time",
@@ -37,5 +34,10 @@ java_library(
         "//third_party/java/jsr330_inject",
         "//third_party/java/objectify:objectify-v4_1",
         "//third_party/java/servlet/servlet_api",
+        "//java/google/registry/config",
+        "//java/google/registry/dns/writer/api",
+        "//java/google/registry/model",
+        "//java/google/registry/request",
+        "//java/google/registry/util",
     ],
 )

java/google/registry/dns/DnsConstants.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns;
+package google.registry.dns;
 
 /** Static class for DNS-related constants. */
 public class DnsConstants {

java/google/registry/dns/DnsModule.java

@@ -12,28 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns;
+package google.registry.dns;
 
-import static com.google.domain.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME;
+import static google.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME;
-import static com.google.domain.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME;
+import static google.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME;
-import static com.google.domain.registry.dns.PublishDnsUpdatesAction.DOMAINS_PARAM;
+import static google.registry.dns.PublishDnsUpdatesAction.DOMAINS_PARAM;
-import static com.google.domain.registry.dns.PublishDnsUpdatesAction.HOSTS_PARAM;
+import static google.registry.dns.PublishDnsUpdatesAction.HOSTS_PARAM;
-import static com.google.domain.registry.dns.ReadDnsQueueAction.KEEP_TASKS_PARAM;
+import static google.registry.dns.ReadDnsQueueAction.KEEP_TASKS_PARAM;
-import static com.google.domain.registry.request.RequestParameters.extractBooleanParameter;
+import static google.registry.request.RequestParameters.extractBooleanParameter;
-import static com.google.domain.registry.request.RequestParameters.extractEnumParameter;
+import static google.registry.request.RequestParameters.extractEnumParameter;
-import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter;
+import static google.registry.request.RequestParameters.extractRequiredParameter;
-import static com.google.domain.registry.request.RequestParameters.extractSetOfParameters;
+import static google.registry.request.RequestParameters.extractSetOfParameters;
 
 import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.QueueFactory;
-import com.google.domain.registry.dns.DnsConstants.TargetType;
-import com.google.domain.registry.dns.writer.api.DnsWriterZone;
-import com.google.domain.registry.request.Parameter;
-import com.google.domain.registry.request.RequestParameters;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.dns.DnsConstants.TargetType;
+import google.registry.dns.writer.api.DnsWriterZone;
+import google.registry.request.Parameter;
+import google.registry.request.RequestParameters;
+
 import java.util.Set;
 
 import javax.inject.Named;

java/google/registry/dns/DnsQueue.java

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns;
+package google.registry.dns;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.domain.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME;
+import static google.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME;
-import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM;
+import static google.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM;
-import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM;
+import static google.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
+import static google.registry.model.registry.Registries.assertTldExists;
-import static com.google.domain.registry.request.RequestParameters.PARAM_TLD;
+import static google.registry.request.RequestParameters.PARAM_TLD;
-import static com.google.domain.registry.util.DomainNameUtils.getTldFromDomainName;
+import static google.registry.util.DomainNameUtils.getTldFromDomainName;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 import com.google.appengine.api.taskqueue.Queue;
@@ -35,10 +35,11 @@ import com.google.apphosting.api.DeadlineExceededException;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.config.ConfigModule.Config;
+
-import com.google.domain.registry.dns.DnsConstants.TargetType;
+import google.registry.config.ConfigModule.Config;
-import com.google.domain.registry.model.registry.Registries;
+import google.registry.dns.DnsConstants.TargetType;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.model.registry.Registries;
+import google.registry.util.FormattingLogger;
 
 import org.joda.time.Duration;
 

java/google/registry/dns/PublishDnsUpdatesAction.java

@@ -12,21 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns;
+package google.registry.dns;
 
-import static com.google.domain.registry.model.server.Lock.executeWithLocks;
+import static google.registry.model.server.Lock.executeWithLocks;
-import static com.google.domain.registry.request.Action.Method.POST;
+import static google.registry.request.Action.Method.POST;
-import static com.google.domain.registry.util.CollectionUtils.nullToEmpty;
+import static google.registry.util.CollectionUtils.nullToEmpty;
 
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.config.ConfigModule.Config;
+
-import com.google.domain.registry.dns.writer.api.DnsWriter;
+import google.registry.config.ConfigModule.Config;
-import com.google.domain.registry.request.Action;
+import google.registry.dns.writer.api.DnsWriter;
-import com.google.domain.registry.request.HttpException.ServiceUnavailableException;
+import google.registry.request.Action;
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.HttpException.ServiceUnavailableException;
-import com.google.domain.registry.request.RequestParameters;
+import google.registry.request.Parameter;
-import com.google.domain.registry.util.DomainNameUtils;
+import google.registry.request.RequestParameters;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.util.DomainNameUtils;
+import google.registry.util.FormattingLogger;
 
 import org.joda.time.Duration;
 

java/google/registry/dns/ReadDnsQueueAction.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns;
+package google.registry.dns;
 
 import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
 import static com.google.common.collect.Sets.difference;
-import static com.google.domain.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME;
+import static google.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME;
-import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM;
+import static google.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM;
-import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM;
+import static google.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM;
-import static com.google.domain.registry.model.registry.Registries.getTlds;
+import static google.registry.model.registry.Registries.getTlds;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.appengine.api.taskqueue.Queue;
@@ -32,14 +32,15 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.TreeMultimap;
-import com.google.domain.registry.config.ConfigModule.Config;
+
-import com.google.domain.registry.dns.DnsConstants.TargetType;
+import google.registry.config.ConfigModule.Config;
-import com.google.domain.registry.model.registry.Registry;
+import google.registry.dns.DnsConstants.TargetType;
-import com.google.domain.registry.request.Action;
+import google.registry.model.registry.Registry;
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.Action;
-import com.google.domain.registry.request.RequestParameters;
+import google.registry.request.Parameter;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.request.RequestParameters;
-import com.google.domain.registry.util.TaskEnqueuer;
+import google.registry.util.FormattingLogger;
+import google.registry.util.TaskEnqueuer;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;

java/google/registry/dns/RefreshDnsAction.java

@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns;
+package google.registry.dns;
 
-import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId;
+import static google.registry.model.EppResourceUtils.loadByUniqueId;
 
-import com.google.domain.registry.dns.DnsConstants.TargetType;
+import google.registry.dns.DnsConstants.TargetType;
-import com.google.domain.registry.model.EppResource;
+import google.registry.model.EppResource;
-import com.google.domain.registry.model.domain.DomainResource;
+import google.registry.model.domain.DomainResource;
-import com.google.domain.registry.model.host.HostResource;
+import google.registry.model.host.HostResource;
-import com.google.domain.registry.request.Action;
+import google.registry.request.Action;
-import com.google.domain.registry.request.HttpException.BadRequestException;
+import google.registry.request.HttpException.BadRequestException;
-import com.google.domain.registry.request.HttpException.NotFoundException;
+import google.registry.request.HttpException.NotFoundException;
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.Parameter;
-import com.google.domain.registry.util.Clock;
+import google.registry.util.Clock;
 
 import javax.inject.Inject;
 

java/google/registry/dns/WriteDnsAction.java

@@ -12,29 +12,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns;
+package google.registry.dns;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM;
+import static google.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM;
-import static com.google.domain.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM;
+import static google.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM;
-import static com.google.domain.registry.model.server.Lock.executeWithLocks;
+import static google.registry.model.server.Lock.executeWithLocks;
-import static com.google.domain.registry.request.Action.Method.POST;
+import static google.registry.request.Action.Method.POST;
 
 import com.google.appengine.api.LifecycleManager;
 import com.google.appengine.api.taskqueue.TaskHandle;
 import com.google.common.base.Throwables;
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.config.ConfigModule.Config;
+
-import com.google.domain.registry.dns.DnsConstants.TargetType;
+import google.registry.config.ConfigModule.Config;
-import com.google.domain.registry.dns.writer.api.DnsWriter;
+import google.registry.dns.DnsConstants.TargetType;
-import com.google.domain.registry.model.registry.Registry;
+import google.registry.dns.writer.api.DnsWriter;
-import com.google.domain.registry.request.Action;
+import google.registry.model.registry.Registry;
-import com.google.domain.registry.request.HttpException;
+import google.registry.request.Action;
-import com.google.domain.registry.request.HttpException.BadRequestException;
+import google.registry.request.HttpException;
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.HttpException.BadRequestException;
-import com.google.domain.registry.request.RequestParameters;
+import google.registry.request.Parameter;
-import com.google.domain.registry.util.DomainNameUtils;
+import google.registry.request.RequestParameters;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.util.DomainNameUtils;
+import google.registry.util.FormattingLogger;
 
 import org.joda.time.Duration;
 

java/google/registry/dns/writer/api/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 
 java_library(
     name = "api",

java/google/registry/dns/writer/api/DnsWriter.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns.writer.api;
+package google.registry.dns.writer.api;
 
 /**
  * Transaction object for sending an atomic batch of updates for a single zone to the DNS server.

java/google/registry/dns/writer/api/DnsWriterZone.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns.writer.api;
+package google.registry.dns.writer.api;
 
 import java.lang.annotation.Documented;
 

java/google/registry/dns/writer/api/VoidDnsWriter.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns.writer.api;
+package google.registry.dns.writer.api;
 
 import com.google.common.base.Joiner;
 

java/google/registry/dns/writer/api/VoidDnsWriterModule.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns.writer.api;
+package google.registry.dns.writer.api;
 
 import dagger.Module;
 import dagger.Provides;

java/google/registry/dns/writer/dnsupdate/BUILD

@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
 
@@ -13,13 +13,13 @@ java_library(
         "//java/com/google/common/io",
         "//java/com/google/common/net",
         "//java/com/google/common/primitives",
-        "//java/com/google/domain/registry/config",
+        "//java/google/registry/config",
-        "//java/com/google/domain/registry/dns/writer/api",
+        "//java/google/registry/dns/writer/api",
-        "//java/com/google/domain/registry/model",
+        "//java/google/registry/model",
-        "//java/com/google/domain/registry/util",
+        "//java/google/registry/util",
-        "//third_party/java/joda_time",
         "//third_party/java/dagger",
         "//third_party/java/dnsjava",
+        "//third_party/java/joda_time",
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
     ],

java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java

@@ -12,14 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns.writer.dnsupdate;
+package google.registry.dns.writer.dnsupdate;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.Ints;
-import com.google.domain.registry.config.ConfigModule.Config;
+
+import google.registry.config.ConfigModule.Config;
 
 import org.joda.time.Duration;
 import org.xbill.DNS.Message;

java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns.writer.dnsupdate;
+package google.registry.dns.writer.dnsupdate;
-
-import com.google.domain.registry.config.ConfigModule.Config;
-
-import org.joda.time.Duration;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.config.ConfigModule.Config;
+
+import org.joda.time.Duration;
+
 @Module
 public class DnsUpdateConfigModule {
 

java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java

@@ -12,19 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns.writer.dnsupdate;
+package google.registry.dns.writer.dnsupdate;
 
 import static com.google.common.base.Verify.verify;
-import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId;
+import static google.registry.model.EppResourceUtils.loadByUniqueId;
 
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.config.ConfigModule.Config;
+
-import com.google.domain.registry.dns.writer.api.DnsWriter;
+import google.registry.config.ConfigModule.Config;
-import com.google.domain.registry.model.domain.DomainResource;
+import google.registry.dns.writer.api.DnsWriter;
-import com.google.domain.registry.model.domain.secdns.DelegationSignerData;
+import google.registry.model.domain.DomainResource;
-import com.google.domain.registry.model.host.HostResource;
+import google.registry.model.domain.secdns.DelegationSignerData;
-import com.google.domain.registry.model.registry.Registries;
+import google.registry.model.host.HostResource;
-import com.google.domain.registry.util.Clock;
+import google.registry.model.registry.Registries;
+import google.registry.util.Clock;
 
 import org.joda.time.Duration;
 import org.xbill.DNS.AAAARecord;

java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.dns.writer.dnsupdate;
+package google.registry.dns.writer.dnsupdate;
-
-import com.google.domain.registry.dns.writer.api.DnsWriter;
-
-import javax.net.SocketFactory;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.dns.writer.api.DnsWriter;
+
+import javax.net.SocketFactory;
+
 /** Dagger module that provides a DnsUpdateWriter. */
 @Module
 public final class DnsUpdateWriterModule {

java/google/registry/eclipse/BUILD

@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
 java_binary(
@@ -19,16 +19,16 @@ java_binary(
     create_executable = 0,
     runtime_deps = [
         "//java/com/google/common/testing",
-        "//java/com/google/domain/registry/module/frontend",
+        "//java/google/registry/module/backend",
-        "//java/com/google/domain/registry/module/backend",
+        "//java/google/registry/module/frontend",
-        "//java/com/google/domain/registry/module/tools",  
+        "//java/google/registry/module/tools",
-        "//java/com/google/domain/registry/tools",
+        "//java/google/registry/tools",
+        "//third_party/java/apache_sshd",
         "//third_party/java/appengine:appengine-api-link",
+        "//third_party/java/appengine:appengine-integration-testing",
         "//third_party/java/appengine:appengine-remote-api-link",
         "//third_party/java/appengine:appengine-stubs",
-        "//third_party/java/appengine:appengine-integration-testing",
         "//third_party/java/appengine:appengine-testing",
-        "//third_party/java/apache_sshd",
         "//third_party/java/ftpserver",
         "//third_party/java/hamcrest",
         "//third_party/java/jetty/v6_1_22",
@@ -43,13 +43,8 @@ java_binary(
 # of domain-registry classes on the eclipse build path.
 genrule(
     name = "eclipse_deps",
-    srcs = ["//java/com/google/domain/registry/eclipse:registry_deps_deploy.jar"],
+    srcs = ["//java/google/registry/eclipse:registry_deps_deploy.jar"],
     outs = ["eclipse_deps.jar"],
-    tools = [
-        "@local_jdk//:bin/jar",
-        "@local_jdk//:jdk-lib",
-        "@local_jdk//:jre-default",
-    ],
     cmd = " && ".join([
         "JAR=$$(pwd)/$(location @local_jdk//:bin/jar)",
         "IN=$$(pwd)/$(SRCS)",
@@ -57,9 +52,14 @@ genrule(
         "TMP=$$(mktemp -d $${TMPDIR:-/tmp}/eclipse_deps.XXXXXXXX)",
         "cd $$TMP",
         "$$JAR -xf $$IN",
-        "rm -rf com/google/domain/registry",
+        "rm -rf google/registry",
         "$$JAR -cmf META-INF/MANIFEST.MF eclipse_deps.jar .",
         "mv eclipse_deps.jar $$OUT",
         "rm -rf $$TMP",
     ]),
+    tools = [
+        "@local_jdk//:bin/jar",
+        "@local_jdk//:jdk-lib",
+        "@local_jdk//:jre-default",
+    ],
 )

java/google/registry/env/BUILD

@@ -1,4 +1,6 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+

java/google/registry/env/common/BUILD

@@ -1,5 +1,7 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 

java/google/registry/env/common/backend/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 exports_files(glob(["WEB-INF/*"]))
 
 

java/google/registry/env/common/backend/WEB-INF/web.xml

@@ -9,7 +9,7 @@
   <servlet>
     <display-name>BackendServlet</display-name>
     <servlet-name>backend-servlet</servlet-name>
-    <servlet-class>com.google.domain.registry.module.backend.BackendServlet</servlet-class>
+    <servlet-class>google.registry.module.backend.BackendServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
@@ -124,7 +124,7 @@
     <description>Exports a datastore backup snapshot to GCS.</description>
     <display-name>Export snapshot to GCS</display-name>
     <servlet-name>exportSnapshot</servlet-name>
-    <servlet-class>com.google.domain.registry.export.ExportSnapshotServlet</servlet-class>
+    <servlet-class>google.registry.export.ExportSnapshotServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>exportSnapshot</servlet-name>
@@ -135,7 +135,7 @@
     <description>Checks the completion of a datastore backup snapshot.</description>
     <display-name>Check on snapshot status</display-name>
     <servlet-name>checkSnapshot</servlet-name>
-    <servlet-class>com.google.domain.registry.export.CheckSnapshotServlet</servlet-class>
+    <servlet-class>google.registry.export.CheckSnapshotServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>checkSnapshot</servlet-name>
@@ -345,7 +345,7 @@
   <!-- Register types with Objectify. -->
   <filter>
     <filter-name>OfyFilter</filter-name>
-    <filter-class>com.google.domain.registry.model.ofy.OfyFilter</filter-class>
+    <filter-class>google.registry.model.ofy.OfyFilter</filter-class>
   </filter>
   <filter-mapping>
     <filter-name>OfyFilter</filter-name>

java/google/registry/env/common/default/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 exports_files(glob(["WEB-INF/*"]))
 
 

java/google/registry/env/common/default/WEB-INF/web.xml

@@ -11,7 +11,7 @@
     </description>
     <display-name>EPP</display-name>
     <servlet-name>epp</servlet-name>
-    <servlet-class>com.google.domain.registry.flows.EppTlsServlet</servlet-class>
+    <servlet-class>google.registry.flows.EppTlsServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
@@ -25,7 +25,7 @@
     </description>
     <display-name>Registrar Console XHR</display-name>
     <servlet-name>registrar-xhr</servlet-name>
-    <servlet-class>com.google.domain.registry.flows.EppConsoleServlet</servlet-class>
+    <servlet-class>google.registry.flows.EppConsoleServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
@@ -36,7 +36,7 @@
   <servlet>
     <display-name>Registrar Self-serve Settings</display-name>
     <servlet-name>registrar-settings</servlet-name>
-    <servlet-class>com.google.domain.registry.ui.server.registrar.RegistrarServlet</servlet-class>
+    <servlet-class>google.registry.ui.server.registrar.RegistrarServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
@@ -48,7 +48,7 @@
   <servlet>
     <display-name>FrontendServlet</display-name>
     <servlet-name>frontend-servlet</servlet-name>
-    <servlet-class>com.google.domain.registry.module.frontend.FrontendServlet</servlet-class>
+    <servlet-class>google.registry.module.frontend.FrontendServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
@@ -95,7 +95,7 @@
     </description>
     <display-name>Availability Check</display-name>
     <servlet-name>check</servlet-name>
-    <servlet-class>com.google.domain.registry.ui.server.api.CheckApiServlet</servlet-class>
+    <servlet-class>google.registry.ui.server.api.CheckApiServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
@@ -254,7 +254,7 @@
   <!-- Register types with Objectify. -->
   <filter>
     <filter-name>OfyFilter</filter-name>
-    <filter-class>com.google.domain.registry.model.ofy.OfyFilter</filter-class>
+    <filter-class>google.registry.model.ofy.OfyFilter</filter-class>
   </filter>
   <filter-mapping>
     <filter-name>OfyFilter</filter-name>

java/google/registry/env/common/tools/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 exports_files(glob(["WEB-INF/*"]))
 
 

java/google/registry/env/common/tools/WEB-INF/web.xml

@@ -9,7 +9,7 @@
   <servlet>
     <display-name>ToolsServlet</display-name>
     <servlet-name>tools-servlet</servlet-name>
-    <servlet-class>com.google.domain.registry.module.tools.ToolsServlet</servlet-class>
+    <servlet-class>google.registry.module.tools.ToolsServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
@@ -67,7 +67,7 @@
     </description>
     <display-name>Registry tool EPP endpoint</display-name>
     <servlet-name>epptool</servlet-name>
-    <servlet-class>com.google.domain.registry.flows.EppToolServlet</servlet-class>
+    <servlet-class>google.registry.flows.EppToolServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
@@ -112,12 +112,6 @@
     <url-pattern>/_dr/task/killAllCommitLogs</url-pattern>
   </servlet-mapping>
 
-  <!-- Mapreduce to delete all cross-tld entities. -->
-  <servlet-mapping>
-    <servlet-name>tools-servlet</servlet-name>
-    <url-pattern>/_dr/task/killAllCrossTld</url-pattern>
-  </servlet-mapping>
-
   <!-- This path serves up the App Engine results page for mapreduce runs. -->
   <servlet>
     <servlet-name>mapreduce</servlet-name>
@@ -229,7 +223,7 @@
   <!-- Register types with Objectify. -->
   <filter>
     <filter-name>OfyFilter</filter-name>
-    <filter-class>com.google.domain.registry.model.ofy.OfyFilter</filter-class>
+    <filter-class>google.registry.model.ofy.OfyFilter</filter-class>
   </filter>
   <filter-mapping>
     <filter-name>OfyFilter</filter-name>

java/google/registry/env/production/BUILD

@@ -1,4 +1,6 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+

java/google/registry/env/production/backend/BUILD

@@ -1,5 +1,7 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 

java/google/registry/env/production/backend/WEB-INF/appengine-web.xml

@@ -15,7 +15,7 @@
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
-    <property name="com.google.domain.registry.environment"
+    <property name="google.registry.environment"
               value="production"/>
   </system-properties>
 

java/google/registry/env/production/default/BUILD

@@ -1,5 +1,7 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 

java/google/registry/env/production/default/WEB-INF/appengine-web.xml

@@ -15,7 +15,7 @@
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
-    <property name="com.google.domain.registry.environment"
+    <property name="google.registry.environment"
               value="production"/>
   </system-properties>
 

java/google/registry/env/production/tools/BUILD

@@ -1,5 +1,7 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 

java/google/registry/env/production/tools/WEB-INF/appengine-web.xml

@@ -15,7 +15,7 @@
   <system-properties>
     <property name="java.util.logging.config.file"
               value="WEB-INF/logging.properties"/>
-    <property name="com.google.domain.registry.environment"
+    <property name="google.registry.environment"
               value="production"/>
   </system-properties>
 

java/google/registry/export/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 
 java_library(
     name = "export",
@@ -21,16 +23,6 @@ java_library(
         "//java/com/google/common/html",
         "//java/com/google/common/io",
         "//java/com/google/common/net",
-        "//java/com/google/domain/registry/bigquery",
-        "//java/com/google/domain/registry/config",
-        "//java/com/google/domain/registry/gcs",
-        "//java/com/google/domain/registry/groups",
-        "//java/com/google/domain/registry/mapreduce",
-        "//java/com/google/domain/registry/mapreduce/inputs",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/request",
-        "//java/com/google/domain/registry/storage/drive",
-        "//java/com/google/domain/registry/util",
         "//third_party/java/appengine:appengine-api",
         "//third_party/java/appengine_gcs_client",
         "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
@@ -41,5 +33,15 @@ java_library(
         "//third_party/java/jsr330_inject",
         "//third_party/java/objectify:objectify-v4_1",
         "//third_party/java/servlet/servlet_api",
+        "//java/google/registry/bigquery",
+        "//java/google/registry/config",
+        "//java/google/registry/gcs",
+        "//java/google/registry/groups",
+        "//java/google/registry/mapreduce",
+        "//java/google/registry/mapreduce/inputs",
+        "//java/google/registry/model",
+        "//java/google/registry/request",
+        "//java/google/registry/storage/drive",
+        "//java/google/registry/util",
     ],
 )

java/google/registry/export/BigqueryPollJobAction.java

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
-import static com.google.domain.registry.bigquery.BigqueryUtils.toJobReferenceString;
+import static google.registry.bigquery.BigqueryUtils.toJobReferenceString;
 
 import com.google.api.services.bigquery.Bigquery;
 import com.google.api.services.bigquery.model.Job;
@@ -25,16 +25,17 @@ import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.TaskHandle;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
-import com.google.domain.registry.request.Action;
-import com.google.domain.registry.request.Header;
-import com.google.domain.registry.request.HttpException.BadRequestException;
-import com.google.domain.registry.request.HttpException.NotModifiedException;
-import com.google.domain.registry.request.Payload;
-import com.google.domain.registry.util.FormattingLogger;
-import com.google.domain.registry.util.TaskEnqueuer;
 
 import dagger.Lazy;
 
+import google.registry.request.Action;
+import google.registry.request.Header;
+import google.registry.request.HttpException.BadRequestException;
+import google.registry.request.HttpException.NotModifiedException;
+import google.registry.request.Payload;
+import google.registry.util.FormattingLogger;
+import google.registry.util.TaskEnqueuer;
+
 import org.joda.time.Duration;
 
 import java.io.ByteArrayInputStream;

java/google/registry/export/CheckSnapshotServlet.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.collect.Sets.intersection;
 import static com.google.common.html.HtmlEscapers.htmlEscaper;
-import static com.google.domain.registry.export.LoadSnapshotAction.enqueueLoadSnapshotTask;
+import static google.registry.export.LoadSnapshotAction.enqueueLoadSnapshotTask;
-import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter;
+import static google.registry.request.RequestParameters.extractRequiredParameter;
-import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass;
+import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
@@ -35,10 +35,11 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.common.net.MediaType;
-import com.google.domain.registry.export.DatastoreBackupInfo.BackupStatus;
+
-import com.google.domain.registry.request.HttpException.BadRequestException;
+import google.registry.export.DatastoreBackupInfo.BackupStatus;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.request.HttpException.BadRequestException;
-import com.google.domain.registry.util.NonFinalForTesting;
+import google.registry.util.FormattingLogger;
+import google.registry.util.NonFinalForTesting;
 
 import org.joda.time.Duration;
 import org.joda.time.PeriodType;

java/google/registry/export/DatastoreBackupInfo.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -24,9 +24,10 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.util.Clock;
+
-import com.google.domain.registry.util.NonFinalForTesting;
+import google.registry.util.Clock;
-import com.google.domain.registry.util.SystemClock;
+import google.registry.util.NonFinalForTesting;
+import google.registry.util.SystemClock;
 
 import org.joda.time.DateTime;
 import org.joda.time.Duration;

java/google/registry/export/DatastoreBackupService.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService;
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
@@ -30,7 +30,8 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import com.google.domain.registry.util.NonFinalForTesting;
+
+import google.registry.util.NonFinalForTesting;
 
 import java.util.NoSuchElementException;
 

java/google/registry/export/DriveModule.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static dagger.Provides.Type.SET_VALUES;
 
@@ -21,22 +21,23 @@ import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.services.drive.Drive;
 import com.google.api.services.drive.DriveScopes;
-import com.google.domain.registry.config.ConfigModule.Config;
-import com.google.domain.registry.request.OAuthScopes;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.config.ConfigModule.Config;
+import google.registry.request.OAuthScopes;
+
 import java.util.Set;
 
 /**
  * Dagger module for Google {@link Drive} service connection objects.
  *
- * @see com.google.domain.registry.config.ConfigModule
+ * @see google.registry.config.ConfigModule
- * @see com.google.domain.registry.request.Modules.UrlFetchTransportModule
+ * @see google.registry.request.Modules.UrlFetchTransportModule
- * @see com.google.domain.registry.request.Modules.Jackson2Module
+ * @see google.registry.request.Modules.Jackson2Module
- * @see com.google.domain.registry.request.Modules.AppIdentityCredentialModule
+ * @see google.registry.request.Modules.AppIdentityCredentialModule
- * @see com.google.domain.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule
+ * @see google.registry.request.Modules.UseAppIdentityCredentialForGoogleApisModule
  */
 @Module
 public final class DriveModule {

java/google/registry/export/ExportConstants.java

@@ -12,40 +12,41 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.common.base.Predicates.not;
-import static com.google.domain.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION;
+import static google.registry.model.EntityClasses.CLASS_TO_KIND_FUNCTION;
-import static com.google.domain.registry.util.TypeUtils.hasAnnotation;
+import static google.registry.util.TypeUtils.hasAnnotation;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
-import com.google.domain.registry.model.EntityClasses;
+
-import com.google.domain.registry.model.ImmutableObject;
+import google.registry.model.EntityClasses;
-import com.google.domain.registry.model.annotations.NotBackedUp;
+import google.registry.model.ImmutableObject;
-import com.google.domain.registry.model.annotations.VirtualEntity;
+import google.registry.model.annotations.NotBackedUp;
-import com.google.domain.registry.model.billing.BillingEvent.Cancellation;
+import google.registry.model.annotations.VirtualEntity;
-import com.google.domain.registry.model.billing.BillingEvent.Modification;
+import google.registry.model.billing.BillingEvent.Cancellation;
-import com.google.domain.registry.model.billing.BillingEvent.OneTime;
+import google.registry.model.billing.BillingEvent.Modification;
-import com.google.domain.registry.model.billing.BillingEvent.Recurring;
+import google.registry.model.billing.BillingEvent.OneTime;
-import com.google.domain.registry.model.billing.RegistrarCredit;
+import google.registry.model.billing.BillingEvent.Recurring;
-import com.google.domain.registry.model.billing.RegistrarCreditBalance;
+import google.registry.model.billing.RegistrarCredit;
-import com.google.domain.registry.model.contact.ContactResource;
+import google.registry.model.billing.RegistrarCreditBalance;
-import com.google.domain.registry.model.domain.DomainBase;
+import google.registry.model.contact.ContactResource;
-import com.google.domain.registry.model.host.HostResource;
+import google.registry.model.domain.DomainBase;
-import com.google.domain.registry.model.index.DomainApplicationIndex;
+import google.registry.model.host.HostResource;
-import com.google.domain.registry.model.index.EppResourceIndex;
+import google.registry.model.index.DomainApplicationIndex;
-import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex;
+import google.registry.model.index.EppResourceIndex;
-import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex;
+import google.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex;
-import com.google.domain.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex;
+import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex;
-import com.google.domain.registry.model.registrar.Registrar;
+import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex;
-import com.google.domain.registry.model.registrar.RegistrarContact;
+import google.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registry.Registry;
+import google.registry.model.registrar.RegistrarContact;
-import com.google.domain.registry.model.registry.label.PremiumList;
+import google.registry.model.registry.Registry;
-import com.google.domain.registry.model.registry.label.PremiumList.PremiumListEntry;
+import google.registry.model.registry.label.PremiumList;
-import com.google.domain.registry.model.reporting.HistoryEntry;
+import google.registry.model.registry.label.PremiumList.PremiumListEntry;
+import google.registry.model.reporting.HistoryEntry;
 
 /** Constants related to export code. */
 public final class ExportConstants {

java/google/registry/export/ExportDomainListsAction.java

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.appengine.tools.cloudstorage.GcsServiceFactory.createGcsService;
-import static com.google.domain.registry.mapreduce.inputs.EppResourceInputs.createEntityInput;
+import static google.registry.mapreduce.inputs.EppResourceInputs.createEntityInput;
-import static com.google.domain.registry.model.EppResourceUtils.isActive;
+import static google.registry.model.EppResourceUtils.isActive;
-import static com.google.domain.registry.model.registry.Registries.getTldsOfType;
+import static google.registry.model.registry.Registries.getTldsOfType;
-import static com.google.domain.registry.util.PipelineUtils.createJobPath;
+import static google.registry.util.PipelineUtils.createJobPath;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.joda.time.DateTimeZone.UTC;
 
@@ -29,15 +29,16 @@ import com.google.appengine.tools.mapreduce.Reducer;
 import com.google.appengine.tools.mapreduce.ReducerInput;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.config.ConfigModule.Config;
+
-import com.google.domain.registry.gcs.GcsUtils;
+import google.registry.config.ConfigModule.Config;
-import com.google.domain.registry.mapreduce.MapreduceAction;
+import google.registry.gcs.GcsUtils;
-import com.google.domain.registry.mapreduce.MapreduceRunner;
+import google.registry.mapreduce.MapreduceAction;
-import com.google.domain.registry.model.domain.DomainResource;
+import google.registry.mapreduce.MapreduceRunner;
-import com.google.domain.registry.model.registry.Registry.TldType;
+import google.registry.model.domain.DomainResource;
-import com.google.domain.registry.request.Action;
+import google.registry.model.registry.Registry.TldType;
-import com.google.domain.registry.request.Response;
+import google.registry.request.Action;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.request.Response;
+import google.registry.util.FormattingLogger;
 
 import org.joda.time.DateTime;
 

java/google/registry/export/ExportRequestModule.java

@@ -12,26 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
-import static com.google.domain.registry.export.BigqueryPollJobAction.CHAINED_TASK_QUEUE_HEADER;
+import static google.registry.export.BigqueryPollJobAction.CHAINED_TASK_QUEUE_HEADER;
-import static com.google.domain.registry.export.BigqueryPollJobAction.JOB_ID_HEADER;
+import static google.registry.export.BigqueryPollJobAction.JOB_ID_HEADER;
-import static com.google.domain.registry.export.BigqueryPollJobAction.PROJECT_ID_HEADER;
+import static google.registry.export.BigqueryPollJobAction.PROJECT_ID_HEADER;
-import static com.google.domain.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_FILE_PARAM;
+import static google.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_FILE_PARAM;
-import static com.google.domain.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_ID_PARAM;
+import static google.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_ID_PARAM;
-import static com.google.domain.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_KINDS_PARAM;
+import static google.registry.export.LoadSnapshotAction.LOAD_SNAPSHOT_KINDS_PARAM;
-import static com.google.domain.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_DATASET_ID_PARAM;
+import static google.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_DATASET_ID_PARAM;
-import static com.google.domain.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_KIND_PARAM;
+import static google.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_KIND_PARAM;
-import static com.google.domain.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_TABLE_ID_PARAM;
+import static google.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_TABLE_ID_PARAM;
-import static com.google.domain.registry.request.RequestParameters.extractRequiredHeader;
+import static google.registry.request.RequestParameters.extractRequiredHeader;
-import static com.google.domain.registry.request.RequestParameters.extractRequiredParameter;
+import static google.registry.request.RequestParameters.extractRequiredParameter;
-
-import com.google.domain.registry.request.Header;
-import com.google.domain.registry.request.Parameter;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.request.Header;
+import google.registry.request.Parameter;
+
 import javax.servlet.http.HttpServletRequest;
 
 /** Dagger module for data export tasks. */

java/google/registry/export/ExportReservedTermsAction.java

@@ -12,25 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
-import static com.google.domain.registry.export.ExportUtils.exportReservedTerms;
+import static google.registry.export.ExportUtils.exportReservedTerms;
-import static com.google.domain.registry.request.Action.Method.POST;
+import static google.registry.request.Action.Method.POST;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
 import com.google.common.net.MediaType;
-import com.google.domain.registry.model.registry.Registry;
+
-import com.google.domain.registry.request.Action;
+import google.registry.model.registry.Registry;
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.Action;
-import com.google.domain.registry.request.RequestParameters;
+import google.registry.request.Parameter;
-import com.google.domain.registry.request.Response;
+import google.registry.request.RequestParameters;
-import com.google.domain.registry.storage.drive.DriveConnection;
+import google.registry.request.Response;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.storage.drive.DriveConnection;
+import google.registry.util.FormattingLogger;
 
 import javax.inject.Inject;
 

java/google/registry/export/ExportSnapshotServlet.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.html.HtmlEscapers.htmlEscaper;
@@ -21,11 +21,12 @@ import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
 import com.google.common.net.MediaType;
-import com.google.domain.registry.config.RegistryEnvironment;
+
-import com.google.domain.registry.util.Clock;
+import google.registry.config.RegistryEnvironment;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.util.Clock;
-import com.google.domain.registry.util.NonFinalForTesting;
+import google.registry.util.FormattingLogger;
-import com.google.domain.registry.util.SystemClock;
+import google.registry.util.NonFinalForTesting;
+import google.registry.util.SystemClock;
 
 import java.io.IOException;
 

java/google/registry/export/ExportUtils.java

@@ -12,18 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
-import static com.google.domain.registry.model.registry.label.ReservationType.UNRESERVED;
+import static google.registry.model.registry.label.ReservationType.UNRESERVED;
 
 import com.google.common.base.Joiner;
-import com.google.domain.registry.config.RegistryEnvironment;
-import com.google.domain.registry.model.registry.Registry;
-import com.google.domain.registry.model.registry.label.ReservedList;
-import com.google.domain.registry.model.registry.label.ReservedList.ReservedListEntry;
 
 import com.googlecode.objectify.Key;
 
+import google.registry.config.RegistryEnvironment;
+import google.registry.model.registry.Registry;
+import google.registry.model.registry.label.ReservedList;
+import google.registry.model.registry.label.ReservedList.ReservedListEntry;
+
 import java.util.Set;
 import java.util.TreeSet;
 

java/google/registry/export/LoadSnapshotAction.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.domain.registry.export.UpdateSnapshotViewAction.createViewUpdateTask;
+import static google.registry.export.UpdateSnapshotViewAction.createViewUpdateTask;
-import static com.google.domain.registry.request.Action.Method.POST;
+import static google.registry.request.Action.Method.POST;
-import static com.google.domain.registry.util.FormattingLogger.getLoggerForCallerClass;
+import static google.registry.util.FormattingLogger.getLoggerForCallerClass;
 
 import com.google.api.services.bigquery.Bigquery;
 import com.google.api.services.bigquery.model.Job;
@@ -34,17 +34,18 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.bigquery.BigqueryFactory;
+
-import com.google.domain.registry.bigquery.BigqueryUtils.SourceFormat;
+import google.registry.bigquery.BigqueryFactory;
-import com.google.domain.registry.bigquery.BigqueryUtils.WriteDisposition;
+import google.registry.bigquery.BigqueryUtils.SourceFormat;
-import com.google.domain.registry.config.ConfigModule.Config;
+import google.registry.bigquery.BigqueryUtils.WriteDisposition;
-import com.google.domain.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer;
+import google.registry.config.ConfigModule.Config;
-import com.google.domain.registry.request.Action;
+import google.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer;
-import com.google.domain.registry.request.HttpException.BadRequestException;
+import google.registry.request.Action;
-import com.google.domain.registry.request.HttpException.InternalServerErrorException;
+import google.registry.request.HttpException.BadRequestException;
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.HttpException.InternalServerErrorException;
-import com.google.domain.registry.util.Clock;
+import google.registry.request.Parameter;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.util.Clock;
+import google.registry.util.FormattingLogger;
 
 import org.joda.time.DateTime;
 

java/google/registry/export/PublishDetailReportAction.java

@@ -12,24 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull;
+import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
 import com.google.appengine.tools.cloudstorage.GcsFilename;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.ByteStreams;
 import com.google.common.net.MediaType;
-import com.google.domain.registry.gcs.GcsUtils;
+
-import com.google.domain.registry.model.registrar.Registrar;
+import google.registry.gcs.GcsUtils;
-import com.google.domain.registry.request.Action;
+import google.registry.model.registrar.Registrar;
-import com.google.domain.registry.request.HttpException.BadRequestException;
+import google.registry.request.Action;
-import com.google.domain.registry.request.HttpException.InternalServerErrorException;
+import google.registry.request.HttpException.BadRequestException;
-import com.google.domain.registry.request.JsonActionRunner;
+import google.registry.request.HttpException.InternalServerErrorException;
-import com.google.domain.registry.request.JsonActionRunner.JsonAction;
+import google.registry.request.JsonActionRunner;
-import com.google.domain.registry.storage.drive.DriveConnection;
+import google.registry.request.JsonActionRunner.JsonAction;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.storage.drive.DriveConnection;
+import google.registry.util.FormattingLogger;
 
 import java.io.FileNotFoundException;
 import java.io.InputStream;

java/google/registry/export/SyncGroupMembersAction.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
 
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.request.Action.Method.POST;
+import static google.registry.request.Action.Method.POST;
-import static com.google.domain.registry.util.CollectionUtils.nullToEmpty;
+import static google.registry.util.CollectionUtils.nullToEmpty;
-import static com.google.domain.registry.util.RegistrarUtils.normalizeClientId;
+import static google.registry.util.RegistrarUtils.normalizeClientId;
 import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
@@ -27,18 +27,19 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
-import com.google.domain.registry.config.ConfigModule.Config;
-import com.google.domain.registry.groups.GroupsConnection;
-import com.google.domain.registry.groups.GroupsConnection.Role;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registrar.RegistrarContact;
-import com.google.domain.registry.request.Action;
-import com.google.domain.registry.request.Response;
-import com.google.domain.registry.util.Concurrent;
-import com.google.domain.registry.util.FormattingLogger;
 
 import com.googlecode.objectify.VoidWork;
 
+import google.registry.config.ConfigModule.Config;
+import google.registry.groups.GroupsConnection;
+import google.registry.groups.GroupsConnection.Role;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.RegistrarContact;
+import google.registry.request.Action;
+import google.registry.request.Response;
+import google.registry.util.Concurrent;
+import google.registry.util.FormattingLogger;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

java/google/registry/export/UpdateSnapshotViewAction.java

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export;
+package google.registry.export;
-import static com.google.domain.registry.request.Action.Method.POST;
+import static google.registry.request.Action.Method.POST;
 
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.services.bigquery.Bigquery;
@@ -22,13 +22,14 @@ import com.google.api.services.bigquery.model.TableReference;
 import com.google.api.services.bigquery.model.ViewDefinition;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
-import com.google.domain.registry.bigquery.BigqueryFactory;
+
-import com.google.domain.registry.config.ConfigModule.Config;
+import google.registry.bigquery.BigqueryFactory;
-import com.google.domain.registry.request.Action;
+import google.registry.config.ConfigModule.Config;
-import com.google.domain.registry.request.HttpException.InternalServerErrorException;
+import google.registry.request.Action;
-import com.google.domain.registry.request.Parameter;
+import google.registry.request.HttpException.InternalServerErrorException;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.request.Parameter;
-import com.google.domain.registry.util.SqlTemplate;
+import google.registry.util.FormattingLogger;
+import google.registry.util.SqlTemplate;
 
 import java.io.IOException;
 

java/google/registry/export/package-info.java

@@ -13,4 +13,4 @@
 // limitations under the License.
 
 @javax.annotation.ParametersAreNonnullByDefault
-package com.google.domain.registry.export;
+package google.registry.export;

java/google/registry/export/sheet/BUILD

@@ -1,4 +1,6 @@
-package(default_visibility = ["//java/com/google/domain/registry:registry_project"])
+package(default_visibility = ["//java/google/registry:registry_project"])
+
+licenses(["notice"])  # Apache 2.0
 
 
 java_library(
@@ -10,10 +12,6 @@ java_library(
         "//java/com/google/common/collect",
         "//java/com/google/common/io",
         "//java/com/google/common/net",
-        "//java/com/google/domain/registry/config",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/request",
-        "//java/com/google/domain/registry/util",
         "//java/com/google/gdata",
         "//java/com/google/gdata:spreadsheet",
         "//third_party/java/appengine:appengine-api",
@@ -22,5 +20,9 @@ java_library(
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
         "//third_party/java/servlet/servlet_api",
+        "//java/google/registry/config",
+        "//java/google/registry/model",
+        "//java/google/registry/request",
+        "//java/google/registry/util",
     ],
 )

java/google/registry/export/sheet/SheetModule.java

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export.sheet;
+package google.registry.export.sheet;
 
 import static com.google.common.base.Strings.emptyToNull;
 
 import com.google.common.base.Optional;
-import com.google.domain.registry.request.Parameter;
 
 import dagger.Module;
 import dagger.Provides;
 
+import google.registry.request.Parameter;
+
 import javax.servlet.http.HttpServletRequest;
 
 /** Dagger module for the sheet package. */

java/google/registry/export/sheet/SheetSynchronizer.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export.sheet;
+package google.registry.export.sheet;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

java/google/registry/export/sheet/SpreadsheetServiceModule.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export.sheet;
+package google.registry.export.sheet;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.common.collect.ImmutableList;

java/google/registry/export/sheet/SyncRegistrarsSheet.java

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export.sheet;
+package google.registry.export.sheet;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.domain.registry.model.registrar.RegistrarContact.Type.ABUSE;
+import static google.registry.model.registrar.RegistrarContact.Type.ABUSE;
-import static com.google.domain.registry.model.registrar.RegistrarContact.Type.ADMIN;
+import static google.registry.model.registrar.RegistrarContact.Type.ADMIN;
-import static com.google.domain.registry.model.registrar.RegistrarContact.Type.BILLING;
+import static google.registry.model.registrar.RegistrarContact.Type.BILLING;
-import static com.google.domain.registry.model.registrar.RegistrarContact.Type.LEGAL;
+import static google.registry.model.registrar.RegistrarContact.Type.LEGAL;
-import static com.google.domain.registry.model.registrar.RegistrarContact.Type.MARKETING;
+import static google.registry.model.registrar.RegistrarContact.Type.MARKETING;
-import static com.google.domain.registry.model.registrar.RegistrarContact.Type.TECH;
+import static google.registry.model.registrar.RegistrarContact.Type.TECH;
-import static com.google.domain.registry.model.registrar.RegistrarContact.Type.WHOIS;
+import static google.registry.model.registrar.RegistrarContact.Type.WHOIS;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -31,13 +31,14 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Ordering;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registrar.RegistrarAddress;
-import com.google.domain.registry.model.registrar.RegistrarContact;
-import com.google.domain.registry.util.Clock;
-import com.google.domain.registry.util.DateTimeUtils;
 import com.google.gdata.util.ServiceException;
 
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.RegistrarAddress;
+import google.registry.model.registrar.RegistrarContact;
+import google.registry.util.Clock;
+import google.registry.util.DateTimeUtils;
+
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 

java/google/registry/export/sheet/SyncRegistrarsSheetAction.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.export.sheet;
+package google.registry.export.sheet;
 
 import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static com.google.appengine.api.taskqueue.TaskOptions.Builder.withUrl;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
-import static com.google.domain.registry.request.Action.Method.POST;
+import static google.registry.request.Action.Method.POST;
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
@@ -28,15 +28,16 @@ import com.google.appengine.api.modules.ModulesServiceFactory;
 import com.google.appengine.api.taskqueue.TaskHandle;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
 import com.google.common.base.Optional;
-import com.google.domain.registry.config.ConfigModule.Config;
-import com.google.domain.registry.model.server.Lock;
-import com.google.domain.registry.request.Action;
-import com.google.domain.registry.request.Parameter;
-import com.google.domain.registry.request.Response;
-import com.google.domain.registry.util.FormattingLogger;
-import com.google.domain.registry.util.NonFinalForTesting;
 import com.google.gdata.util.ServiceException;
 
+import google.registry.config.ConfigModule.Config;
+import google.registry.model.server.Lock;
+import google.registry.request.Action;
+import google.registry.request.Parameter;
+import google.registry.request.Response;
+import google.registry.util.FormattingLogger;
+import google.registry.util.NonFinalForTesting;
+
 import org.joda.time.Duration;
 
 import java.io.IOException;

java/google/registry/export/sheet/package-info.java

@@ -13,4 +13,4 @@
 // limitations under the License.
 
 @javax.annotation.ParametersAreNonnullByDefault
-package com.google.domain.registry.export.sheet;
+package google.registry.export.sheet;

java/google/registry/flows/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 
 filegroup(
     name = "flows_files",
@@ -23,18 +25,6 @@ java_library(
         "//java/com/google/common/collect",
         "//java/com/google/common/io",
         "//java/com/google/common/net",
-        "//java/com/google/domain/registry/config",
-        "//java/com/google/domain/registry/dns",
-        "//java/com/google/domain/registry/mapreduce",
-        "//java/com/google/domain/registry/mapreduce/inputs",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/monitoring/whitebox",
-        "//java/com/google/domain/registry/request",
-        "//java/com/google/domain/registry/security:servlets",
-        "//java/com/google/domain/registry/tldconfig/idn",
-        "//java/com/google/domain/registry/tmch",
-        "//java/com/google/domain/registry/util",
-        "//java/com/google/domain/registry/xml",
         "//third_party/java/appengine:appengine-api",
         "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
         "//third_party/java/dagger",
@@ -44,6 +34,18 @@ java_library(
         "//third_party/java/jsr330_inject",
         "//third_party/java/objectify:objectify-v4_1",
         "//third_party/java/servlet/servlet_api",
+        "//java/google/registry/config",
+        "//java/google/registry/dns",
+        "//java/google/registry/mapreduce",
+        "//java/google/registry/mapreduce/inputs",
+        "//java/google/registry/model",
+        "//java/google/registry/monitoring/whitebox",
+        "//java/google/registry/request",
+        "//java/google/registry/security:servlets",
+        "//java/google/registry/tldconfig/idn",
+        "//java/google/registry/tmch",
+        "//java/google/registry/util",
+        "//java/google/registry/xml",
     ],
     visibility = ["//visibility:public"],
 )

java/google/registry/flows/EppConsoleServlet.java

@@ -12,20 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.flows;
+package google.registry.flows;
 
 import static com.google.appengine.api.users.UserServiceFactory.getUserService;
 import static com.google.common.base.Strings.nullToEmpty;
-import static com.google.domain.registry.flows.EppServletUtils.handleEppCommandAndWriteResponse;
+import static google.registry.flows.EppServletUtils.handleEppCommandAndWriteResponse;
 import static java.lang.System.identityHashCode;
 
 import com.google.appengine.api.users.User;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.ByteStreams;
-import com.google.domain.registry.flows.EppException.AuthenticationErrorException;
+
-import com.google.domain.registry.model.registrar.Registrar;
+import google.registry.flows.EppException.AuthenticationErrorException;
-import com.google.domain.registry.model.registrar.RegistrarContact;
+import google.registry.model.registrar.Registrar;
-import com.google.domain.registry.security.XsrfProtectedServlet;
+import google.registry.model.registrar.RegistrarContact;
+import google.registry.security.XsrfProtectedServlet;
 
 import org.joda.time.Duration;
 

java/google/registry/flows/EppController.java

@@ -12,28 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.flows;
+package google.registry.flows;
 
-import static com.google.domain.registry.flows.EppXmlTransformer.marshalWithLenientRetry;
+import static google.registry.flows.EppXmlTransformer.marshalWithLenientRetry;
-import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal;
+import static google.registry.flows.EppXmlTransformer.unmarshal;
-import static com.google.domain.registry.flows.FlowRegistry.getFlowClass;
+import static google.registry.flows.FlowRegistry.getFlowClass;
 
 import com.google.apphosting.api.ApiProxy;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.flows.FlowRunner.CommitMode;
+
-import com.google.domain.registry.flows.FlowRunner.UserPrivileges;
+import google.registry.flows.FlowRunner.CommitMode;
-import com.google.domain.registry.model.eppcommon.Trid;
+import google.registry.flows.FlowRunner.UserPrivileges;
-import com.google.domain.registry.model.eppinput.EppInput;
+import google.registry.model.eppcommon.Trid;
-import com.google.domain.registry.model.eppoutput.EppOutput;
+import google.registry.model.eppinput.EppInput;
-import com.google.domain.registry.model.eppoutput.Response;
+import google.registry.model.eppoutput.EppOutput;
-import com.google.domain.registry.model.eppoutput.Result;
+import google.registry.model.eppoutput.Response;
-import com.google.domain.registry.model.eppoutput.Result.Code;
+import google.registry.model.eppoutput.Result;
-import com.google.domain.registry.monitoring.whitebox.EppMetrics;
+import google.registry.model.eppoutput.Result.Code;
-import com.google.domain.registry.util.Clock;
+import google.registry.monitoring.whitebox.EppMetrics;
-import com.google.domain.registry.util.FormattingLogger;
+import google.registry.util.Clock;
-import com.google.domain.registry.util.SystemClock;
+import google.registry.util.FormattingLogger;
+import google.registry.util.SystemClock;
 
 /**
  * The EppController class, which implements the state machine for the EPP command/response

java/google/registry/flows/EppException.java

@@ -12,17 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.flows;
+package google.registry.flows;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import com.google.common.base.Preconditions;
-import com.google.domain.registry.model.annotations.ExternalMessagingName;
+
-import com.google.domain.registry.model.eppinput.EppInput.InnerCommand;
+import google.registry.model.annotations.ExternalMessagingName;
-import com.google.domain.registry.model.eppinput.ResourceCommand;
+import google.registry.model.eppinput.EppInput.InnerCommand;
-import com.google.domain.registry.model.eppoutput.Result;
+import google.registry.model.eppinput.ResourceCommand;
-import com.google.domain.registry.model.eppoutput.Result.Code;
+import google.registry.model.eppoutput.Result;
+import google.registry.model.eppoutput.Result.Code;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Inherited;

java/google/registry/flows/EppServletUtils.java

@@ -12,15 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.flows;
+package google.registry.flows;
 
-import static com.google.domain.registry.flows.EppController.handleEppCommand;
+import static google.registry.flows.EppController.handleEppCommand;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
 import com.google.common.net.MediaType;
-import com.google.domain.registry.util.FormattingLogger;
+
+import google.registry.util.FormattingLogger;
 
 import java.io.IOException;
 import java.io.OutputStream;