Rename some build rules to meet expectation in JGit bazel build

This is a preparation to link JGit as a submodule instead of an
external Maven build dependency.

Change-Id: Icd470c32b6b0447b480bc494ea5ebf558c24e34c

Author: msohn

BUILD

@@ -6,7 +6,7 @@ pkg_war(
     libs = [
         "//lib/jetty:server",
         "//lib/jetty:servlet",
-        "//lib/slf4j:slf4j-simple",
+        "//lib:slf4j-simple",
         "//java/com/google/gitiles:servlet",
     ],
     web_xml = "//resources:web_xml",

WORKSPACE

@@ -106,7 +106,7 @@ maven_jar(
 )
 
 maven_jar(
-    name = "servlet-api_3_1",
+    name = "servlet-api",
     artifact = "javax.servlet:javax.servlet-api:3.1.0",
     sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c",
 )
@@ -181,7 +181,7 @@ maven_jar(
 )
 
 maven_jar(
-    name = "ewah",
+    name = "javaewah",
     artifact = "com.googlecode.javaewah:JavaEWAH:1.1.7",
     sha1 = "570dde3cd706ae10c62fe19b150928cfdb415e87",
 )
@@ -218,7 +218,7 @@ maven_jar(
 SL_VERS = "1.7.26"
 
 maven_jar(
-    name = "slf4j-api",
+    name = "log-api",
     artifact = "org.slf4j:slf4j-api:" + SL_VERS,
     sha1 = "77100a62c2e6f04b53977b9f541044d7d722693d",
 )

java/com/google/gitiles/BUILD

@@ -17,7 +17,7 @@ DEPS = [
     "//lib:prettify",
     "//lib/jgit:jgit",
     "//lib/jgit:jgit-servlet",
-    "//lib/slf4j:slf4j-api",
+    "//lib:slf4j-api",
     "//lib/soy:soy",
     "//java/com/google/gitiles/blame/cache",
 ]

java/com/google/gitiles/dev/BUILD

@@ -9,13 +9,13 @@ java_library(
         "//lib:guava",
         "//lib:guava-failureaccess",
         "//lib:html-types",
-        "//lib:servlet-api_3_1",
+        "//lib:servlet-api",
         "//lib/jetty:server",
         "//lib/jetty:servlet",
         "//lib/jgit",
         "//lib/jgit:jgit-servlet",
-        "//lib/slf4j:slf4j-api",
-        "//lib/slf4j:slf4j-simple",
+        "//lib:slf4j-api",
+        "//lib:slf4j-simple",
         "//lib/soy",
     ],
 )

lib/BUILD

@@ -18,7 +18,7 @@ package(
     "html-types",
     "jsr305",
     "servlet-api_2_5",
-    "servlet-api_3_1",
+    "servlet-api",
     "gson",
     "guava",
     "guava-failureaccess",
@@ -29,3 +29,16 @@ package(
     "ow2-asm-tree",
     "ow2-asm-util",
 ]]
+
+java_library(
+    name = "slf4j-api",
+    exports = ["@log-api//jar"],
+)
+
+java_library(
+    name = "slf4j-simple",
+    runtime_deps = [
+        ":slf4j-api",
+        "@slf4j-simple//jar",
+    ],
+)

lib/jetty/BUILD

@@ -8,7 +8,7 @@ java_library(
     name = "servlet",
     exports = [
         ":security",
-        "//lib:servlet-api_3_1",  # Different from the rest of gitiles-server.
+        "//lib:servlet-api",  # Different from the rest of gitiles-server.
         "@servlet//jar",
     ],
 )