Move utility services under services; they'd been mis refactored (this patch won't build)
git-svn-id: https://svn.apache.org/repos/asf/incubator/slider/trunk@1592519 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java
index bab97be..dd6e012 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java
@@ -20,11 +20,21 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
+import org.apache.slider.common.SliderKeys;
import org.apache.slider.core.exceptions.BadCommandArgumentsException;
import org.apache.slider.core.exceptions.ErrorStrings;
import java.io.File;
+
+/**
+ * Registry actions
+ *
+ * --instance {app name}, if a / is in it, refers underneath?
+ * --dest {destfile}
+ * --list : list instances of slider service
+ * --listfiles
+ */
@Parameters(commandNames = {SliderActions.ACTION_REGISTRY},
commandDescription = SliderActions.DESCRIBE_ACTION_REGISTRY)
@@ -43,27 +53,17 @@
public int getMinParams() {
return 0;
}
-
- //--format
- @Parameter(names = ARG_FORMAT,
- description = "Format for a response: [text|xml|json|properties]")
- public String format = FORMAT_XML;
-
-
- @Parameter(names = {ARG_DEST},
- description = "Output destination")
- public File dest;
-
+
@Parameter(names = {ARG_LIST},
description = "list services")
- public String list;
+ public boolean list;
@Parameter(names = {ARG_LISTCONF},
description = "list configurations")
- public String listConf;
+ public boolean listConf;
@Parameter(names = {ARG_GETCONF},
- description = "get files")
+ description = "get configuration")
public String getConf;
@@ -75,6 +75,38 @@
description = "get files")
public String getFiles;
+
+ //--format
+ @Parameter(names = ARG_FORMAT,
+ description = "Format for a response: [text|xml|json|properties]")
+ public String format;
+
+
+ @Parameter(names = {ARG_DEST},
+ description = "Output destination")
+ public File dest;
+
+ @Parameter(names = {ARG_NAME},
+ description = "name of an instance")
+ public String name;
+
+ @Parameter(names = {ARG_SERVICETYPE},
+ description = "optional service type")
+ public String serviceType = SliderKeys.APP_TYPE;
+
+
+ @Parameter(names = {ARG_VERBOSE},
+ description = "verbose output")
+ public boolean verbose;
+
+ @Parameter(names = {ARG_INTERNAL},
+ description = "fetch internal registry entries")
+ public boolean internal;
+
+ /**
+ * validate health of all the different operations
+ * @throws BadCommandArgumentsException
+ */
@Override
public void validate() throws BadCommandArgumentsException {
super.validate();
@@ -89,12 +121,49 @@
}
if (dest != null && (lists > 0 || set == 0)) {
throw new BadCommandArgumentsException("Argument " + ARG_DEST
- + " is only supported on 'get' operations");
+ + " is only supported on 'get' operations");
+ }
+ if (is(format) && !is(getConf)) {
+ throw new BadCommandArgumentsException("Argument " + ARG_FORMAT
+ + " is only supported by " + ARG_GETCONF);
+
+ }
+ if (!list && !is(name)) {
+ throw new BadCommandArgumentsException("Argument " + ARG_NAME
+ +" missing");
+
}
}
- @SuppressWarnings("VariableNotUsedInsideIf")
private int s(String arg) {
- return arg != null ? 1 : 0;
+ return is(arg) ? 1 : 0;
+ }
+
+ private boolean is(String arg) {
+ return arg != null;
+ }
+
+ private int s(boolean arg) {
+ return arg ? 1 : 0;
+ }
+
+
+ @Override
+ public String toString() {
+ final StringBuilder sb =
+ new StringBuilder("ActionRegistryArgs{");
+ sb.append("list=").append(list);
+ sb.append(", listConf=").append(listConf);
+ sb.append(", getConf='").append(getConf).append('\'');
+ sb.append(", listFiles='").append(listFiles).append('\'');
+ sb.append(", getFiles='").append(getFiles).append('\'');
+ sb.append(", format='").append(format).append('\'');
+ sb.append(", dest=").append(dest);
+ sb.append(", name='").append(name).append('\'');
+ sb.append(", serviceType='").append(serviceType).append('\'');
+ sb.append(", verbose=").append(verbose);
+ sb.append(", internal=").append(internal);
+ sb.append('}');
+ return sb.toString();
}
}
diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java b/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java
index eb8e25b..e7bf25d 100644
--- a/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java
+++ b/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java
@@ -22,7 +22,7 @@
import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.RegisterApplicationMasterResponsePBImpl;
import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
import org.apache.hadoop.yarn.api.records.Container;
-import org.apache.slider.server.services.docstore.utility.SliderServiceUtils;
+import org.apache.slider.server.services.utility.SliderServiceUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
index 59ebe83..a47b51d 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
@@ -44,7 +44,7 @@
public String description;
- public int elements;
+ public int size;
public long updated;
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java b/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
index 74b70f8..b5e2d15 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
@@ -45,7 +45,15 @@
*/
public RegistryView externalView = new RegistryView();
-
+ @Override
+ public String toString() {
+ final StringBuilder sb =
+ new StringBuilder("ServiceInstanceData{");
+ sb.append("name='").append(name).append('\'');
+ sb.append(", id='").append(id).append('\'');
+ sb.append('}');
+ return sb.toString();
+ }
}
diff --git a/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
index ea875ad..146cf64 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
@@ -32,9 +32,9 @@
import org.apache.slider.server.appmaster.state.StateAccessForProviders;
import org.apache.slider.server.appmaster.web.rest.agent.AgentRestOperations;
import org.apache.slider.server.services.curator.RegistryBinderService;
-import org.apache.slider.server.services.docstore.utility.ForkedProcessService;
-import org.apache.slider.server.services.docstore.utility.Parent;
-import org.apache.slider.server.services.docstore.utility.SequenceService;
+import org.apache.slider.server.services.utility.ForkedProcessService;
+import org.apache.slider.server.services.utility.Parent;
+import org.apache.slider.server.services.utility.SequenceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java
index bf771f3..e3cad9b 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java
@@ -34,7 +34,7 @@
import org.apache.slider.server.appmaster.state.StateAccessForProviders;
import org.apache.slider.server.appmaster.web.rest.agent.AgentRestOperations;
import org.apache.slider.server.services.curator.RegistryBinderService;
-import org.apache.slider.server.services.docstore.utility.EventCallback;
+import org.apache.slider.server.services.utility.EventCallback;
import java.io.File;
import java.io.IOException;
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
index d70825a..a3a3309 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
@@ -55,7 +55,7 @@
import org.apache.slider.server.appmaster.web.rest.agent.RegistrationStatus;
import org.apache.slider.server.appmaster.web.rest.agent.StatusCommand;
import org.apache.slider.server.services.curator.CuratorServiceInstance;
-import org.apache.slider.server.services.docstore.utility.EventCallback;
+import org.apache.slider.server.services.utility.EventCallback;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
index 0545a34..65c8090 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
@@ -35,6 +35,9 @@
import javax.ws.rs.core.UriInfo;
import java.io.IOException;
+/**
+ * This publishes configuration sets
+ */
public class PublisherResource {
protected static final Logger log =
LoggerFactory.getLogger(PublisherResource.class);
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java b/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java
index 2fa8ac5..1cade1c 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java
@@ -194,8 +194,6 @@
}
return null;
}
-
-
/**
* List all the instances
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/AbstractSliderLaunchedService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
similarity index 98%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/AbstractSliderLaunchedService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
index a39437e..3e0f687 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/AbstractSliderLaunchedService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/ClosingService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/ClosingService.java
similarity index 96%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/ClosingService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/ClosingService.java
index 7642336..01f27a6 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/ClosingService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/ClosingService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.service.AbstractService;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/CompoundLaunchedService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundLaunchedService.java
similarity index 98%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/CompoundLaunchedService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundLaunchedService.java
index 80d857d..7dd31a0 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/CompoundLaunchedService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundLaunchedService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import com.google.common.base.Preconditions;
import org.apache.hadoop.conf.Configuration;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/CompoundService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundService.java
similarity index 98%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/CompoundService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundService.java
index 00a1988..4e97842 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/CompoundService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.service.CompositeService;
import org.apache.hadoop.service.Service;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/EventCallback.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/EventCallback.java
similarity index 93%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/EventCallback.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/EventCallback.java
index ec4a1e3..7af463d 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/EventCallback.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/EventCallback.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
public interface EventCallback {
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/EventNotifyingService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/EventNotifyingService.java
similarity index 96%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/EventNotifyingService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/EventNotifyingService.java
index 28027fc..d4dba70 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/EventNotifyingService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/EventNotifyingService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.service.AbstractService;
import org.slf4j.Logger;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/ForkedProcessService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/ForkedProcessService.java
similarity index 98%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/ForkedProcessService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/ForkedProcessService.java
index f90bb7b..e6610bb 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/ForkedProcessService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/ForkedProcessService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.AbstractService;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/Parent.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/Parent.java
similarity index 95%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/Parent.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/Parent.java
index 1d83477..ea1769c 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/Parent.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/Parent.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.service.Service;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/RpcService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/RpcService.java
similarity index 96%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/RpcService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/RpcService.java
index bccfba2..72412d4 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/RpcService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/RpcService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.ipc.Server;
import org.apache.hadoop.net.NetUtils;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SecurityCheckerService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/SecurityCheckerService.java
similarity index 95%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SecurityCheckerService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/SecurityCheckerService.java
index 76a5761..0a58499 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SecurityCheckerService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/SecurityCheckerService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.AbstractService;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SequenceService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/SequenceService.java
similarity index 98%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SequenceService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/SequenceService.java
index 0725fe6..e8fe3cf 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SequenceService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/SequenceService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.service.Service;
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SliderServiceUtils.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/SliderServiceUtils.java
similarity index 94%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SliderServiceUtils.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/SliderServiceUtils.java
index 2f080f7..4fc1525 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/SliderServiceUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/SliderServiceUtils.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
public class SliderServiceUtils {
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/WebAppService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
similarity index 96%
rename from slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/WebAppService.java
rename to slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
index b98643b..de183dd 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/WebAppService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility;
+package org.apache.slider.server.services.utility;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.yarn.webapp.WebApp;
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy
index 9f541d5..8f399f0 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy
@@ -38,7 +38,7 @@
import org.apache.slider.server.appmaster.state.StateAccessForProviders
import org.apache.slider.server.appmaster.web.rest.agent.*
import org.apache.slider.server.services.curator.RegistryBinderService
-import org.apache.slider.server.services.docstore.utility.EventCallback
+import org.apache.slider.server.services.utility.EventCallback
class MockProviderService implements ProviderService {
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/MockService.groovy b/slider-core/src/test/groovy/org/apache/slider/server/services/utility/MockService.groovy
similarity index 96%
rename from slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/MockService.groovy
rename to slider-core/src/test/groovy/org/apache/slider/server/services/utility/MockService.groovy
index 50d8560..2906323 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/MockService.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/services/utility/MockService.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility
+package org.apache.slider.server.services.utility
import org.apache.hadoop.service.AbstractService
import org.apache.hadoop.service.ServiceStateException
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestCompoundService.groovy b/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestCompoundService.groovy
similarity index 98%
rename from slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestCompoundService.groovy
rename to slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestCompoundService.groovy
index d9832c2..9e09c91 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestCompoundService.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestCompoundService.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility
+package org.apache.slider.server.services.utility
import groovy.util.logging.Slf4j
import org.apache.hadoop.conf.Configuration
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestMockService.groovy b/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestMockService.groovy
similarity index 97%
rename from slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestMockService.groovy
rename to slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestMockService.groovy
index 99b6e05..537f6b1 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestMockService.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestMockService.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility
+package org.apache.slider.server.services.utility
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.service.Service
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestSequenceService.groovy b/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestSequenceService.groovy
similarity index 98%
rename from slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestSequenceService.groovy
rename to slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestSequenceService.groovy
index 1670dc5..968d57a 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/TestSequenceService.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestSequenceService.groovy
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.slider.server.services.docstore.utility
+package org.apache.slider.server.services.utility
import groovy.util.logging.Slf4j
import org.apache.hadoop.conf.Configuration
diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java b/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java
index 355a6d8..4bf335f 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java
+++ b/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java
@@ -46,9 +46,9 @@
import org.apache.slider.common.tools.SliderUtils;
import org.apache.slider.core.registry.zk.BlockingZKWatcher;
import org.apache.slider.common.tools.ConfigHelper;
-import org.apache.slider.server.services.docstore.utility.EventCallback;
-import org.apache.slider.server.services.docstore.utility.EventNotifyingService;
-import org.apache.slider.server.services.docstore.utility.ForkedProcessService;
+import org.apache.slider.server.services.utility.EventCallback;
+import org.apache.slider.server.services.utility.EventNotifyingService;
+import org.apache.slider.server.services.utility.ForkedProcessService;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
import org.slf4j.Logger;
diff --git a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
index 0322844..5dba25d 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
+++ b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
@@ -47,7 +47,7 @@
import org.apache.slider.server.appmaster.web.rest.agent.Register;
import org.apache.slider.server.appmaster.web.rest.agent.RegistrationResponse;
import org.apache.slider.server.appmaster.web.rest.agent.RegistrationStatus;
-import org.apache.slider.server.services.docstore.utility.EventCallback;
+import org.apache.slider.server.services.utility.EventCallback;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
