Merge tools/[] package into tools/server

There's no point in having this extra package exclusively for
[]s, especially because we already weren't being consistent and
had multiple []s in the tools/server package.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=118807843
This commit is contained in:
mcilwain 2016-04-01 13:33:46 -07:00 committed by Justine Tunney
parent dcbabd06a6
commit 45a194fd90
10 changed files with 15 additions and 80 deletions

View file

@ -18,7 +18,6 @@ java_library(
"//java/com/google/domain/registry/mapreduce",
"//java/com/google/domain/registry/request",
"//java/com/google/domain/registry/request:modules",
"//java/com/google/domain/registry/tools/mapreduce",
"//java/com/google/domain/registry/tools/server",
"//java/com/google/domain/registry/util",
"//third_party/java/bouncycastle",

View file

@ -20,11 +20,10 @@ import com.google.domain.registry.loadtest.LoadTestModule;
import com.google.domain.registry.mapreduce.MapreduceModule;
import com.google.domain.registry.request.RequestModule;
import com.google.domain.registry.request.RequestScope;
import com.google.domain.registry.tools.mapreduce.DeleteProberDataAction;
import com.google.domain.registry.tools.mapreduce.ResaveAllEppResourcesAction;
import com.google.domain.registry.tools.server.CreateGroupsAction;
import com.google.domain.registry.tools.server.CreatePremiumListAction;
import com.google.domain.registry.tools.server.DeleteEntityAction;
import com.google.domain.registry.tools.server.DeleteProberDataAction;
import com.google.domain.registry.tools.server.GenerateZoneFilesAction;
import com.google.domain.registry.tools.server.KillAllCommitLogsAction;
import com.google.domain.registry.tools.server.KillAllEppResourcesAction;
@ -34,6 +33,7 @@ import com.google.domain.registry.tools.server.ListPremiumListsAction;
import com.google.domain.registry.tools.server.ListRegistrarsAction;
import com.google.domain.registry.tools.server.ListReservedListsAction;
import com.google.domain.registry.tools.server.ListTldsAction;
import com.google.domain.registry.tools.server.ResaveAllEppResourcesAction;
import com.google.domain.registry.tools.server.ToolsServerModule;
import com.google.domain.registry.tools.server.UpdatePremiumListAction;
import com.google.domain.registry.tools.server.VerifyOteAction;

View file

@ -1,30 +0,0 @@
package(
default_visibility = ["//java/com/google/domain/registry:registry_project"],
)
java_library(
name = "mapreduce",
srcs = glob(["*.java"]),
deps = [
"//java/com/google/common/annotations",
"//java/com/google/common/base",
"//java/com/google/common/collect",
"//java/com/google/common/net",
"//java/com/google/common/primitives",
"//java/com/google/common/util/concurrent",
"//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/util",
"//third_party/java/appengine_mapreduce2:appengine_mapreduce",
"//third_party/java/dagger",
"//third_party/java/jcommander",
"//third_party/java/joda_money",
"//third_party/java/joda_time",
"//third_party/java/jsr305_annotations",
"//third_party/java/jsr330_inject",
"//third_party/java/objectify:objectify-v4_1",
],
)

View file

@ -5,11 +5,15 @@ package(
java_library(
name = "server",
srcs = glob(["**/*.java"]),
srcs = glob(["*.java"]),
deps = [
"//java/com/google/common/annotations",
"//java/com/google/common/base",
"//java/com/google/common/collect",
"//java/com/google/common/io",
"//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/export",
"//java/com/google/domain/registry/flows",
@ -24,6 +28,8 @@ java_library(
"//third_party/java/appengine_gcs_client",
"//third_party/java/appengine_mapreduce2:appengine_mapreduce",
"//third_party/java/dagger",
"//third_party/java/jcommander",
"//third_party/java/joda_money",
"//third_party/java/joda_time",
"//third_party/java/jsr305_annotations",
"//third_party/java/jsr330_inject",

View file

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.domain.registry.tools.mapreduce;
package com.google.domain.registry.tools.server;
import static com.google.common.base.Verify.verifyNotNull;
import static com.google.domain.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;

View file

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.domain.registry.tools.mapreduce;
package com.google.domain.registry.tools.server;
import static com.google.domain.registry.mapreduce.inputs.EppResourceInputs.createEntityInput;
import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;