Merge "Disallow creation and deletion of group branches"
diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD
index c6aa2d7..65943fc 100644
--- a/java/com/google/gerrit/httpd/BUILD
+++ b/java/com/google/gerrit/httpd/BUILD
@@ -14,6 +14,7 @@
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/git/receive",
+ "//java/com/google/gerrit/server/ioutil",
"//java/com/google/gerrit/util/cli",
"//java/com/google/gerrit/util/http",
"//java/com/google/gwtexpui/linker:server",
diff --git a/java/com/google/gerrit/server/BUILD b/java/com/google/gerrit/server/BUILD
index 46ba01b..6052a63 100644
--- a/java/com/google/gerrit/server/BUILD
+++ b/java/com/google/gerrit/server/BUILD
@@ -38,6 +38,7 @@
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/prettify:server",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server/ioutil",
"//java/com/google/gerrit/util/cli",
"//java/com/google/gerrit/util/ssl",
"//java/org/apache/commons/net",
diff --git a/java/com/google/gerrit/server/ioutil/BUILD b/java/com/google/gerrit/server/ioutil/BUILD
new file mode 100644
index 0000000..d45cf73
--- /dev/null
+++ b/java/com/google/gerrit/server/ioutil/BUILD
@@ -0,0 +1,10 @@
+java_library(
+ name = "ioutil",
+ srcs = glob(["**/*.java"]),
+ visibility = ["//visibility:public"],
+ deps = [
+ "//java/com/google/gerrit/reviewdb:client",
+ "//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
+ "//lib/jgit/org.eclipse.jgit:jgit",
+ ],
+)
diff --git a/java/com/google/gerrit/server/ioutil/ColumnFormatter.java b/java/com/google/gerrit/server/ioutil/ColumnFormatter.java
index 10ad33b..ae855c7 100644
--- a/java/com/google/gerrit/server/ioutil/ColumnFormatter.java
+++ b/java/com/google/gerrit/server/ioutil/ColumnFormatter.java
@@ -14,7 +14,6 @@
package com.google.gerrit.server.ioutil;
-import com.google.gerrit.server.StringUtil;
import java.io.PrintWriter;
/**
diff --git a/java/com/google/gerrit/server/StringUtil.java b/java/com/google/gerrit/server/ioutil/StringUtil.java
similarity index 97%
rename from java/com/google/gerrit/server/StringUtil.java
rename to java/com/google/gerrit/server/ioutil/StringUtil.java
index 891dec2..0520dbc 100644
--- a/java/com/google/gerrit/server/StringUtil.java
+++ b/java/com/google/gerrit/server/ioutil/StringUtil.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.server;
+package com.google.gerrit.server.ioutil;
public class StringUtil {
/**
diff --git a/java/com/google/gerrit/server/project/ListProjects.java b/java/com/google/gerrit/server/project/ListProjects.java
index afb796e..177141e 100644
--- a/java/com/google/gerrit/server/project/ListProjects.java
+++ b/java/com/google/gerrit/server/project/ListProjects.java
@@ -38,11 +38,11 @@
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.OutputFormat;
-import com.google.gerrit.server.StringUtil;
import com.google.gerrit.server.WebLinks;
import com.google.gerrit.server.account.GroupControl;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.group.GroupsCollection;
+import com.google.gerrit.server.ioutil.StringUtil;
import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.ProjectPermission;
diff --git a/java/com/google/gerrit/sshd/BUILD b/java/com/google/gerrit/sshd/BUILD
index 0de5377..0c71dae 100644
--- a/java/com/google/gerrit/sshd/BUILD
+++ b/java/com/google/gerrit/sshd/BUILD
@@ -13,6 +13,7 @@
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
+ "//java/com/google/gerrit/server/ioutil",
"//java/com/google/gerrit/util/cli",
"//java/org/eclipse/jgit:server",
"//lib:args4j",
diff --git a/javatests/com/google/gerrit/server/ioutil/BUILD b/javatests/com/google/gerrit/server/ioutil/BUILD
new file mode 100644
index 0000000..721c6f9
--- /dev/null
+++ b/javatests/com/google/gerrit/server/ioutil/BUILD
@@ -0,0 +1,14 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+junit_tests(
+ name = "ioutil_tests",
+ size = "small",
+ srcs = glob(
+ ["**/*.java"],
+ ),
+ resource_strip_prefix = "resources",
+ visibility = ["//visibility:public"],
+ deps = [
+ "//java/com/google/gerrit/server/ioutil",
+ ],
+)
diff --git a/javatests/com/google/gerrit/server/StringUtilTest.java b/javatests/com/google/gerrit/server/ioutil/StringUtilTest.java
similarity index 97%
rename from javatests/com/google/gerrit/server/StringUtilTest.java
rename to javatests/com/google/gerrit/server/ioutil/StringUtilTest.java
index acf2577..04f806d 100644
--- a/javatests/com/google/gerrit/server/StringUtilTest.java
+++ b/javatests/com/google/gerrit/server/ioutil/StringUtilTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.server;
+package com.google.gerrit.server.ioutil;
import static org.junit.Assert.assertEquals;
