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/06/12 22:26:00 UTC
git commit: some IDE initiated comment cleanup
Repository: incubator-slider
Updated Branches:
refs/heads/develop f8b143a0f -> dd1e18bf2
some IDE initiated comment cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/dd1e18bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/dd1e18bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/dd1e18bf
Branch: refs/heads/develop
Commit: dd1e18bf2bf6880eecff8c133172721ce3f34fa3
Parents: f8b143a
Author: Steve Loughran <st...@apache.org>
Authored: Thu Jun 12 13:25:43 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Jun 12 13:25:43 2014 -0700
----------------------------------------------------------------------
.../slider/common/tools/ConfigHelper.java | 1 -
.../slider/core/main/ExitCodeProvider.java | 2 +-
.../org/apache/slider/core/main/IrqHandler.java | 2 +-
.../slider/core/main/LauncherExitCodes.java | 25 ++++++++-------
.../org/apache/slider/core/main/RunService.java | 2 +-
.../core/main/ServiceLaunchException.java | 2 +-
.../slider/core/main/ServiceLauncher.java | 32 ++++++++++----------
.../slider/core/main/ServiceShutdownHook.java | 2 +-
.../server/appmaster/SliderAppMaster.java | 10 +++---
9 files changed, 38 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java b/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java
index ff3fd52..2f0b9ac 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java
@@ -198,7 +198,6 @@ public class ConfigHelper {
} catch (ParserConfigurationException | SAXException e) {
throw new IOException(e);
}
-
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/core/main/ExitCodeProvider.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/ExitCodeProvider.java b/slider-core/src/main/java/org/apache/slider/core/main/ExitCodeProvider.java
index 3059c05..503b9b9 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/ExitCodeProvider.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/ExitCodeProvider.java
@@ -1,5 +1,5 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/core/main/IrqHandler.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/IrqHandler.java b/slider-core/src/main/java/org/apache/slider/core/main/IrqHandler.java
index 9e7a596..42442d1 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/IrqHandler.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/IrqHandler.java
@@ -1,5 +1,5 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/core/main/LauncherExitCodes.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/LauncherExitCodes.java b/slider-core/src/main/java/org/apache/slider/core/main/LauncherExitCodes.java
index 2b19e5f..6fdebcd 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/LauncherExitCodes.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/LauncherExitCodes.java
@@ -30,59 +30,58 @@ public interface LauncherExitCodes {
* 0: success
*/
int EXIT_SUCCESS = 0;
-
+
/**
* -1: generic "false" response. The operation worked but
* the result was not true
*/
int EXIT_FALSE = -1;
-
+
/**
* Exit code when a client requested service termination: {@value}
*/
int EXIT_CLIENT_INITIATED_SHUTDOWN = 1;
-
+
/**
* Exit code when targets could not be launched: {@value}
*/
int EXIT_TASK_LAUNCH_FAILURE = 2;
-
+
/**
* Exit code when an exception was thrown from the service: {@value}
*/
int EXIT_EXCEPTION_THROWN = 32;
-
+
/**
* Exit code when a usage message was printed: {@value}
*/
int EXIT_USAGE = 33;
-
+
/**
* Exit code when something happened but we can't be specific: {@value}
*/
int EXIT_OTHER_FAILURE = 34;
-
+
/**
* Exit code when a control-C, kill -3, signal was picked up: {@value}
*/
-
+
int EXIT_INTERRUPTED = 35;
-
+
/**
* Exit code when the command line doesn't parse: {@value}, or
* when it is otherwise invalid.
*/
int EXIT_COMMAND_ARGUMENT_ERROR = 36;
-
+
/**
* Exit code when the configurations in valid/incomplete: {@value}
*/
int EXIT_BAD_CONFIGURATION = 37;
-
+
/**
* Exit code when the configurations in valid/incomplete: {@value}
*/
int EXIT_CONNECTIVITY_PROBLEM = 38;
-
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/core/main/RunService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/RunService.java b/slider-core/src/main/java/org/apache/slider/core/main/RunService.java
index 9a52b38..c3a1d0e 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/RunService.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/RunService.java
@@ -1,5 +1,5 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/core/main/ServiceLaunchException.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/ServiceLaunchException.java b/slider-core/src/main/java/org/apache/slider/core/main/ServiceLaunchException.java
index d84e7f2..27813b7 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/ServiceLaunchException.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/ServiceLaunchException.java
@@ -1,5 +1,5 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java b/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
index 39ddb31..e22ff54 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
@@ -1,19 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.slider.core.main;
@@ -88,7 +88,7 @@ public class ServiceLauncher<S extends Service>
private Configuration configuration;
private String serviceClassName;
private static AtomicBoolean signalAlreadyReceived = new AtomicBoolean(false);
-
+
/**
* Create an instance of the launcher
@@ -298,7 +298,7 @@ public class ServiceLauncher<S extends Service>
warn(text);
LOG.error(text, thrown);
}
-
+
/**
* Exit the code.
* This is method can be overridden for testing, throwing an
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/core/main/ServiceShutdownHook.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/ServiceShutdownHook.java b/slider-core/src/main/java/org/apache/slider/core/main/ServiceShutdownHook.java
index 9fd9c02..83448ad 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/ServiceShutdownHook.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/ServiceShutdownHook.java
@@ -1,5 +1,5 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dd1e18bf/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index e126261..605c826 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -162,7 +162,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
public static final String SERVICE_CLASSNAME_SHORT =
"SliderAppMaster";
public static final String SERVICE_CLASSNAME =
- "org.apache.slider.server.appmaster."+ SERVICE_CLASSNAME_SHORT;
+ "org.apache.slider.server.appmaster." + SERVICE_CLASSNAME_SHORT;
/**
@@ -179,12 +179,12 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
/** Handle to communicate with the Resource Manager*/
private AMRMClientAsync asyncRMClient;
-
+
private RMOperationHandler rmOperationHandler;
/** Handle to communicate with the Node Manager*/
public NMClientAsync nmClientAsync;
-
+
YarnConfiguration conf;
/**
* token blob
@@ -510,7 +510,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
}
}
allTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
-
+
// set up secret manager
secretManager = new ClientToAMTokenSecretManager(appAttemptID, null);
@@ -1480,7 +1480,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
public AggregateConf getInstanceDefinition() {
return appState.getInstanceDefinition();
}
-
+
/**
* This is the status, the live model
*/