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

@ -1,40 +0,0 @@
package(
default_visibility = ["//java/com/google/domain/registry:registry_project"],
)
java_library(
name = "mapreduce",
srcs = glob(["*.java"]),
deps = [
"//java/com/google/common/base",
"//java/com/google/common/collect",
"//java/com/google/common/io",
"//java/com/google/domain/registry/mapreduce",
"//java/com/google/domain/registry/model",
"//java/com/google/domain/registry/tools/mapreduce",
"//java/com/google/domain/registry/util",
"//javatests/com/google/domain/registry/testing",
"//javatests/com/google/domain/registry/testing/mapreduce",
"//third_party/java/appengine:appengine-api",
"//third_party/java/appengine_mapreduce2:appengine_mapreduce",
"//third_party/java/appengine_pipeline",
"//third_party/java/hamcrest",
"//third_party/java/jcommander",
"//third_party/java/joda_money",
"//third_party/java/joda_time",
"//third_party/java/junit",
"//third_party/java/mockito",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/java/servlet/servlet_api",
"//third_party/java/truth",
],
)
load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules")
GenTestRules(
name = "GeneratedTestRules",
test_files = glob(["*Test.java"]),
deps = [":mapreduce"],
)

View file

@ -7,8 +7,8 @@ load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules")
java_library(
name = "server",
srcs = glob(["**/*.java"]),
resources = glob(["**/testdata/*"]),
srcs = glob(["*.java"]),
resources = glob(["testdata/*"]),
deps = [
"//java/com/google/common/base",
"//java/com/google/common/collect",

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.truth.Truth.assertThat;
import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;

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.truth.Truth.assertThat;
import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;