You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/05 15:12:03 UTC
svn commit: r1592519 - in /incubator/slider/trunk:
slider-core/src/main/java/org/apache/slider/common/params/
slider-core/src/main/java/org/apache/slider/core/launch/
slider-core/src/main/java/org/apache/slider/core/registry/docstore/
slider-core/src/m...
Author: stevel
Date: Mon May 5 13:12:02 2014
New Revision: 1592519
URL: http://svn.apache.org/r1592519
Log:
Move utility services under services; they'd been mis refactored (this patch won't build)
Added:
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/
- copied from r1591907, incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/
incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/
- copied from r1591907, incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/
Removed:
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/docstore/utility/
incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/docstore/utility/
Modified:
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ClosingService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundLaunchedService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventCallback.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventNotifyingService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ForkedProcessService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/Parent.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/RpcService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SecurityCheckerService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SequenceService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SliderServiceUtils.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy
incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/MockService.groovy
incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestCompoundService.groovy
incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestMockService.groovy
incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestSequenceService.groovy
incubator/slider/trunk/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java
incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ActionRegistryArgs.java Mon May 5 13:12:02 2014
@@ -20,11 +20,21 @@ package org.apache.slider.common.params;
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 class ActionRegistryArgs extends
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 @@ public class ActionRegistryArgs extends
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 @@ public class ActionRegistryArgs extends
}
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();
}
}
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/launch/AMRestartSupport.java Mon May 5 13:12:02 2014
@@ -22,7 +22,7 @@ import org.apache.hadoop.yarn.api.protoc
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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java Mon May 5 13:12:02 2014
@@ -44,7 +44,7 @@ public class PublishedConfiguration {
public String description;
- public int elements;
+ public int size;
public long updated;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java Mon May 5 13:12:02 2014
@@ -45,7 +45,15 @@ public class ServiceInstanceData impleme
*/
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();
+ }
}
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java Mon May 5 13:12:02 2014
@@ -32,9 +32,9 @@ import org.apache.slider.core.registry.i
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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/ProviderService.java Mon May 5 13:12:02 2014
@@ -34,7 +34,7 @@ import org.apache.slider.core.registry.i
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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java Mon May 5 13:12:02 2014
@@ -55,7 +55,7 @@ import org.apache.slider.server.appmaste
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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java Mon May 5 13:12:02 2014
@@ -35,6 +35,9 @@ import javax.ws.rs.core.MediaType;
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);
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java Mon May 5 13:12:02 2014
@@ -194,8 +194,6 @@ public class RegistryBinderService<Paylo
}
return null;
}
-
-
/**
* List all the instances
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ClosingService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ClosingService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ClosingService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ClosingService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundLaunchedService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundLaunchedService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundLaunchedService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundLaunchedService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/CompoundService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventCallback.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventCallback.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventCallback.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventCallback.java Mon May 5 13:12:02 2014
@@ -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 {
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventNotifyingService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventNotifyingService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventNotifyingService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/EventNotifyingService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ForkedProcessService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ForkedProcessService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ForkedProcessService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/ForkedProcessService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/Parent.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/Parent.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/Parent.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/Parent.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/RpcService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/RpcService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/RpcService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/RpcService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SecurityCheckerService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SecurityCheckerService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SecurityCheckerService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SecurityCheckerService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SequenceService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SequenceService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SequenceService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SequenceService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SliderServiceUtils.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SliderServiceUtils.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SliderServiceUtils.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/SliderServiceUtils.java Mon May 5 13:12:02 2014
@@ -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 {
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java Mon May 5 13:12:02 2014
@@ -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;
Modified: incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy (original)
+++ incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockProviderService.groovy Mon May 5 13:12:02 2014
@@ -38,7 +38,7 @@ import org.apache.slider.providers.Provi
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 {
Modified: incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/MockService.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/MockService.groovy?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/MockService.groovy (original)
+++ incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/MockService.groovy Mon May 5 13:12:02 2014
@@ -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
Modified: incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestCompoundService.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestCompoundService.groovy?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestCompoundService.groovy (original)
+++ incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestCompoundService.groovy Mon May 5 13:12:02 2014
@@ -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
Modified: incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestMockService.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestMockService.groovy?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestMockService.groovy (original)
+++ incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestMockService.groovy Mon May 5 13:12:02 2014
@@ -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
Modified: incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestSequenceService.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestSequenceService.groovy?rev=1592519&r1=1591907&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestSequenceService.groovy (original)
+++ incubator/slider/trunk/slider-core/src/test/groovy/org/apache/slider/server/services/utility/TestSequenceService.groovy Mon May 5 13:12:02 2014
@@ -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
Modified: incubator/slider/trunk/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java (original)
+++ incubator/slider/trunk/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java Mon May 5 13:12:02 2014
@@ -46,9 +46,9 @@ import org.apache.slider.common.tools.Sl
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;
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java?rev=1592519&r1=1592518&r2=1592519&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java Mon May 5 13:12:02 2014
@@ -47,7 +47,7 @@ import org.apache.slider.server.appmaste
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;