git commit: SLIDER-254 added ASF snapshots repository to pull in snapshot versions of accumulo and hadoop

2014-08-22 Thread billie
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-254_use_credential_provider 31784988d -> c89b264e9


SLIDER-254 added ASF snapshots repository to pull in snapshot versions of 
accumulo and hadoop


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c89b264e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c89b264e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c89b264e

Branch: refs/heads/feature/SLIDER-254_use_credential_provider
Commit: c89b264e9cd38698eb6a9dec7d979c873e90baa2
Parents: 3178498
Author: Billie Rinaldi 
Authored: Fri Aug 22 18:57:15 2014 -0700
Committer: Billie Rinaldi 
Committed: Fri Aug 22 18:57:15 2014 -0700

--
 app-packages/accumulo/pom.xml | 18 ++
 pom.xml   | 10 ++
 2 files changed, 28 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c89b264e/app-packages/accumulo/pom.xml
--
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index d3f83a7..c2cbe1a 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -146,6 +146,24 @@
   ${accumulo.version}
   bin
   tar.gz
+  
+
+  org.apache.accumulo
+  accumulo-fate
+
+
+  org.apache.accumulo
+  accumulo-gc
+
+
+  org.apache.accumulo
+  accumulo-master
+
+
+  org.apache.accumulo
+  accumulo-minicluster
+
+  
 
 
   org.apache.accumulo

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c89b264e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ab6e9a6..dffa493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,6 +207,16 @@
   ASF Staging
   https://repository.apache.org/content/groups/staging/
 
+
+  ASF Snapshots
+  https://repository.apache.org/content/repositories/snapshots/
+  
+true
+  
+  
+false
+  
+
   
 
 



git commit: SLIDER-354. Add support for zip packages containing application bits.

2014-08-22 Thread smohanty
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/hbase_win_package 644dd38d7 -> fc534ca7b


SLIDER-354. Add support for zip packages containing application bits.


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fc534ca7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fc534ca7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fc534ca7

Branch: refs/heads/feature/hbase_win_package
Commit: fc534ca7b0ecf607e9278bd352847a7e62db1ca6
Parents: 644dd38
Author: Sumit Mohanty 
Authored: Fri Aug 22 17:39:37 2014 -0700
Committer: Sumit Mohanty 
Committed: Fri Aug 22 17:39:37 2014 -0700

--
 app-packages/app-pkg-template/metainfo.xml  |  8 ++--
 app-packages/memcached-win/appConfig.json   |  7 +--
 app-packages/memcached-win/metainfo.xml | 12 ++---
 app-packages/memcached/metainfo.xml |  8 ++--
 .../core/providers/__init__.py  | 13 +++---
 .../core/providers/windows/tarball.py   | 46 
 .../libraries/script/script.py  |  2 +-
 7 files changed, 70 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fc534ca7/app-packages/app-pkg-template/metainfo.xml
--
diff --git a/app-packages/app-pkg-template/metainfo.xml 
b/app-packages/app-pkg-template/metainfo.xml
index c6e1485..50c0fbd 100644
--- a/app-packages/app-pkg-template/metainfo.xml
+++ b/app-packages/app-pkg-template/metainfo.xml
@@ -28,12 +28,12 @@
   
 MYAPP_COMPONENT
 MASTER
-
-  
+
+  
 host_port
 ${THIS_HOST}:${site.global.listen_port}
-  
-
+  
+
 
   scripts/myapp_component.py
   PYTHON

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fc534ca7/app-packages/memcached-win/appConfig.json
--
diff --git a/app-packages/memcached-win/appConfig.json 
b/app-packages/memcached-win/appConfig.json
index b76ecde..e39feb0 100644
--- a/app-packages/memcached-win/appConfig.json
+++ b/app-packages/memcached-win/appConfig.json
@@ -3,12 +3,11 @@
   "metadata": {
   },
   "global": {
-"application.def": "/slider/jmemcached-1.0.0.zip",
+"application.def": "package/jmemcached-1.0.0.zip",
 "java_home": "C:\\java",
 
 "site.global.app_user": "hadoop",
-"site.global.app_root": "${AGENT_WORK_ROOT}\\app\\install",
-"site.global.pid_file": "${AGENT_WORK_ROOT}\\app\\run\\component.pid",
+"site.global.pid_file": "${AGENT_WORK_ROOT}/app/run/component.pid",
 "site.global.additional_cp": 
"C:\\hdp\\hadoop-2.4.0.2.1.3.0-1990\\share\\hadoop\\common\\lib\\*",
 "site.global.xmx_val": "256m",
 "site.global.xms_val": "128m",
@@ -19,8 +18,6 @@
   "components": {
 "slider-appmaster": {
   "jvm.heapsize": "256M"
-},
-"MEMCACHED": {
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fc534ca7/app-packages/memcached-win/metainfo.xml
--
diff --git a/app-packages/memcached-win/metainfo.xml 
b/app-packages/memcached-win/metainfo.xml
index d056c0a..27a8be6 100644
--- a/app-packages/memcached-win/metainfo.xml
+++ b/app-packages/memcached-win/metainfo.xml
@@ -28,12 +28,12 @@
   
 MEMCACHED
 MASTER
-
-  
+
+  
 host_port
 ${THIS_HOST}:${site.global.listen_port}
-  
-
+  
+
 
   scripts/memcached.py
   PYTHON
@@ -46,8 +46,8 @@
 any
 
   
-folder
-files\\jmemcached-1.0.0
+zip
+files/jmemcached-1.0.0.zip
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fc534ca7/app-packages/memcached/metainfo.xml
--
diff --git a/app-packages/memcached/metainfo.xml 
b/app-packages/memcached/metainfo.xml
index 525816e..5801ad2 100644
--- a/app-packages/memcached/metainfo.xml
+++ b/app-packages/memcached/metainfo.xml
@@ -28,12 +28,12 @@
   
 MEMCACHED
 MASTER
-
-  
+
+  
 host_port
 ${THIS_HOST}:${site.global.listen_port}
-  
-
+  
+
 
   scripts/memcached.py
   PYTHON

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fc534ca7/slider-agent/src/main/python/resource_management/core/providers/__init__.py
-

git commit: SLIDER-352 making one of the tests skipped if !Windows

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/develop aa21ad64d -> 31d70a348


SLIDER-352 making one of the tests skipped if !Windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/31d70a34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/31d70a34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/31d70a34

Branch: refs/heads/develop
Commit: 31d70a348c5c96aee92f26ea767f19ddc56fc710
Parents: aa21ad6
Author: Steve Loughran 
Authored: Fri Aug 22 21:37:39 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 21:37:39 2014 +0100

--
 .../org/apache/slider/common/tools/TestWindowsSupport.groovy   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/31d70a34/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index e6d2225..d11aa55 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -93,6 +93,8 @@ class TestWindowsSupport extends SliderTestUtils {
 
   @Test
   public void testSliderFS() throws Throwable {
+assume(Shell.WINDOWS, "not windows")
+
 SliderFileSystem sfs = new SliderFileSystem(new Configuration())
 try {
   def metainfo = AgentUtils.getApplicationMetainfo(sfs, windowsFile)



[04/11] git commit: SLIDER-352 some tests

2014-08-22 Thread stevel
SLIDER-352 some tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/83665f61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/83665f61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/83665f61

Branch: refs/heads/develop
Commit: 83665f617025fea9f8f7e5462e30d66caab025d0
Parents: b3a835d
Author: Steve Loughran 
Authored: Fri Aug 22 16:08:24 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:08:24 2014 +0100

--
 .../common/tools/TestWindowsSupport.groovy  | 78 
 1 file changed, 78 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/83665f61/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
new file mode 100644
index 000..4da42f2
--- /dev/null
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+package org.apache.slider.common.tools
+
+import groovy.transform.CompileStatic
+import groovy.util.logging.Slf4j
+import org.apache.hadoop.conf.Configuration
+import org.apache.hadoop.fs.ChecksumFileSystem
+import org.apache.hadoop.fs.Path
+import org.apache.hadoop.fs.FileSystem as HadoopFS
+import org.junit.Test
+
+import java.util.regex.Pattern
+
+@CompileStatic
+@Slf4j
+class TestWindowsSupport {
+
+  private static final Pattern hasDriveLetterSpecifier =
+  Pattern.compile("^/?[a-zA-Z]:");
+  public static
+  final String windowsFile = 
"C:\\Users\\Administrator\\AppData\\Local\\Temp\\junit3180177850133852404\\testpkg\\appdef_1.zip"
+
+
+  private static boolean hasWindowsDrive(String path) {
+return hasDriveLetterSpecifier.matcher(path).find();
+  }
+
+  private static int startPositionWithoutWindowsDrive(String path) {
+if (hasWindowsDrive(path)) {
+  return path.charAt(0) == '/' ? 3 : 2;
+} else {
+  return 0;
+}
+  }
+
+  @Test
+  public void testHasWindowsDrive() throws Throwable {
+assert hasWindowsDrive(windowsFile)
+  }
+
+  @Test
+  public void testStartPosition() throws Throwable {
+assert 2 == startPositionWithoutWindowsDrive(windowsFile)
+  }
+  
+  @Test
+  public void testPathHandling() throws Throwable {
+System.setProperty("os.name", "Windows/286")
+Path path = new Path(windowsFile);
+def uri = path.toUri()
+//assert "file" == uri.scheme 
+assert uri.authority == null;
+
+
+
+Configuration conf = new Configuration()
+
+def localfs = HadoopFS.get(uri, conf)
+assert localfs instanceof ChecksumFileSystem
+  }
+}



[11/11] git commit: Merge branch 'feature/SLIDER-350-slider-core_tests_failing_on_windows' into develop

2014-08-22 Thread stevel
Merge branch 'feature/SLIDER-350-slider-core_tests_failing_on_windows' into 
develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/aa21ad64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/aa21ad64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/aa21ad64

Branch: refs/heads/develop
Commit: aa21ad64d201651c154114e6fd187ca156807552
Parents: 4e8c6ff 87ff4d8
Author: Steve Loughran 
Authored: Fri Aug 22 18:54:42 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 18:54:42 2014 +0100

--
 .../slider/providers/agent/AgentUtils.java  |  11 +-
 .../server/appmaster/SliderAppMaster.java   |   2 +-
 .../server/appmaster/web/AgentService.java  |  28 ++---
 .../appmaster/web/rest/agent/AgentWebApp.java   |  16 ++-
 .../LaunchedWorkflowCompositeService.java   |   4 +
 .../services/workflow/ClosingService.java   |   3 +
 .../agent/AgentMiniClusterTestBase.groovy   |   9 +-
 .../common/tools/TestWindowsSupport.groovy  | 104 +++
 .../publisher/TestPublisherRestResources.groovy |  11 +-
 .../slider/test/YarnMiniClusterTestBase.groovy  |   4 +-
 .../web/rest/agent/TestAMAgentWebServices.java  |   3 +-
 .../workflow/TestWorkflowClosingService.java|   4 +-
 .../providers/accumulo/AccumuloTestBase.groovy  |   7 +-
 .../minicluster/HBaseMiniClusterTestBase.groovy |   9 +-
 14 files changed, 173 insertions(+), 42 deletions(-)
--




[01/11] git commit: SLIDER-350: AM not coming up on Windows

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/develop 4e8c6ffbb -> aa21ad64d


SLIDER-350: AM not coming up on Windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a5df3975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a5df3975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a5df3975

Branch: refs/heads/develop
Commit: a5df39755bfd044f1d2ee4cc49e8d96f80a855d2
Parents: 4e8c6ff
Author: Steve Loughran 
Authored: Fri Aug 22 14:32:39 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 14:32:39 2014 +0100

--
 .../server/appmaster/SliderAppMaster.java   |  2 +-
 .../server/appmaster/web/AgentService.java  | 28 +---
 .../appmaster/web/rest/agent/AgentWebApp.java   | 16 ---
 .../LaunchedWorkflowCompositeService.java   |  4 +++
 .../services/workflow/ClosingService.java   |  3 +++
 .../web/rest/agent/TestAMAgentWebServices.java  |  2 +-
 .../workflow/TestWorkflowClosingService.java|  4 +--
 7 files changed, 29 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a5df3975/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 c006d0d..b4515f1 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
@@ -813,7 +813,7 @@ public class SliderAppMaster extends 
AbstractSliderLaunchedService
   }
 
   private void startAgentWebApp(MapOperations appInformation,
-Configuration serviceConf) {
+Configuration serviceConf) throws IOException {
 URL[] urls = ((URLClassLoader) AgentWebApp.class.getClassLoader() 
).getURLs();
 StringBuilder sb = new StringBuilder("AM classpath:");
 for (URL url : urls) {

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a5df3975/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
--
diff --git 
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
 
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
index 08338e8..f840035 100644
--- 
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
+++ 
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
@@ -16,38 +16,22 @@
  */
 package org.apache.slider.server.appmaster.web;
 
-import org.apache.hadoop.service.AbstractService;
 import org.apache.slider.server.appmaster.web.rest.agent.AgentWebApp;
+import org.apache.slider.server.services.workflow.ClosingService;
+import org.apache.slider.server.services.workflow.WorkflowCompositeService;
 
 /**
- *
+ * agent service gives the agent webapp lifecycle integration
  */
-public class AgentService extends AbstractService {
-  private volatile AgentWebApp webApp;
+public class AgentService extends ClosingService {
+
 
   public AgentService(String name) {
 super(name);
   }
 
   public AgentService(String name, AgentWebApp app) {
-super(name);
-webApp = app;
+super(name, app);
   }
 
-  @Override
-  protected void serviceStart() throws Exception {
-
-  }
-
-  /**
-   * Stop operation stops the webapp; sets the reference to null
-   * @throws Exception
-   */
-  @Override
-  protected void serviceStop() throws Exception {
-if (webApp != null) {
-  webApp.stop();
-  webApp = null;
-}
-  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a5df3975/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
--
diff --git 
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
 
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
index 54d2b1f..8aac490 100644
--- 
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
+++ 
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
@@ -36,13 +36,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.ext.Provider;
+import java.io.Closeable;
 import java.io.File;
+import java.io.IOException;
 import java.util.Set;
 
 /**
  *
  */
-public class Agent

[06/11] git commit: SLIDER-352 more testing of windows

2014-08-22 Thread stevel
SLIDER-352 more testing of windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/53457d98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/53457d98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/53457d98

Branch: refs/heads/develop
Commit: 53457d98d480e3b4134175c09b4927d0c1dfb4ef
Parents: db2d298
Author: Steve Loughran 
Authored: Fri Aug 22 16:20:26 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:20:26 2014 +0100

--
 .../apache/slider/providers/agent/AgentUtils.java|  9 +++--
 .../slider/common/tools/TestWindowsSupport.groovy| 15 +--
 2 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/53457d98/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
--
diff --git 
a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java 
b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
index f296a95..f329756 100644
--- 
a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
+++ 
b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
@@ -16,6 +16,7 @@
  */
 package org.apache.slider.providers.agent;
 
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.slider.common.tools.SliderFileSystem;
 import org.apache.slider.common.tools.SliderUtils;
@@ -24,6 +25,7 @@ import 
org.apache.slider.providers.agent.application.metadata.MetainfoParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -36,11 +38,14 @@ public class AgentUtils {
   static Metainfo getApplicationMetainfo(SliderFileSystem fileSystem,
 String appDef) throws IOException {
 log.info("Reading metainfo at {}", appDef);
+FileSystem fs = fileSystem.getFileSystem();
+Path appPath = new Path(appDef);
 InputStream metainfoStream = SliderUtils.getApplicationResourceInputStream(
-fileSystem.getFileSystem(), new Path(appDef), "metainfo.xml");
+fs, appPath, "metainfo.xml");
 if (metainfoStream == null) {
   log.error("metainfo.xml is unavailable at {}.", appDef);
-  throw new IOException("metainfo.xml is required in app package.");
+  throw new FileNotFoundException("metainfo.xml is required in app 
package. " +
+appPath);
 }
 
 Metainfo metainfo = new MetainfoParser().parse(metainfoStream);

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/53457d98/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 8387237..2d74760 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -22,6 +22,7 @@ import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.ChecksumFileSystem
+import org.apache.hadoop.fs.FSDataInputStream
 import org.apache.hadoop.fs.Path
 import org.apache.hadoop.fs.FileSystem as HadoopFS
 import org.apache.hadoop.util.Shell
@@ -75,7 +76,17 @@ class TestWindowsSupport extends SliderTestUtils {
 
 def localfs = HadoopFS.get(uri, conf)
 assert localfs instanceof ChecksumFileSystem
-def stat = localfs.getFileStatus(path)
-
+try {
+  def stat = localfs.getFileStatus(path)
+  fail("expected an exception, got $stat")
+} catch (FileNotFoundException fnfe) {
+  // expected
+}
+
+try {
+  FSDataInputStream appStream = localfs.open(path);
+} catch (FileNotFoundException fnfe) {
+  // expected
+}
   }
 }



[07/11] git commit: SLIDER-352 more testing of windows

2014-08-22 Thread stevel
SLIDER-352 more testing of windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/475507b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/475507b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/475507b5

Branch: refs/heads/develop
Commit: 475507b598b6b23815d5b6f983206fb9cbb20412
Parents: 53457d9
Author: Steve Loughran 
Authored: Fri Aug 22 16:25:46 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:26:06 2014 +0100

--
 .../org/apache/slider/providers/agent/AgentUtils.java   |  2 +-
 .../slider/common/tools/TestWindowsSupport.groovy   | 12 
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/475507b5/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
--
diff --git 
a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java 
b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
index f329756..6bb6132 100644
--- 
a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
+++ 
b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
@@ -35,7 +35,7 @@ import java.io.InputStream;
 public class AgentUtils {
   private static final Logger log = LoggerFactory.getLogger(AgentUtils.class);
 
-  static Metainfo getApplicationMetainfo(SliderFileSystem fileSystem,
+  public static Metainfo getApplicationMetainfo(SliderFileSystem fileSystem,
 String appDef) throws IOException {
 log.info("Reading metainfo at {}", appDef);
 FileSystem fs = fileSystem.getFileSystem();

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/475507b5/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 2d74760..e6d2225 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -26,6 +26,7 @@ import org.apache.hadoop.fs.FSDataInputStream
 import org.apache.hadoop.fs.Path
 import org.apache.hadoop.fs.FileSystem as HadoopFS
 import org.apache.hadoop.util.Shell
+import org.apache.slider.providers.agent.AgentUtils
 import org.apache.slider.test.SliderTestUtils
 import org.junit.Test
 
@@ -89,4 +90,15 @@ class TestWindowsSupport extends SliderTestUtils {
   // expected
 }
   }
+
+  @Test
+  public void testSliderFS() throws Throwable {
+SliderFileSystem sfs = new SliderFileSystem(new Configuration())
+try {
+  def metainfo = AgentUtils.getApplicationMetainfo(sfs, windowsFile)
+} catch (FileNotFoundException fnfe) {
+  // expected
+}
+
+  }
 }



[08/11] git commit: SLIDER-352 TestPublisherRestResources failing on windows

2014-08-22 Thread stevel
SLIDER-352 TestPublisherRestResources failing on windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4ca25b2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4ca25b2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4ca25b2c

Branch: refs/heads/develop
Commit: 4ca25b2c535bd8ebbb8d92b318436dffe778754f
Parents: 475507b
Author: Steve Loughran 
Authored: Fri Aug 22 16:33:07 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:33:07 2014 +0100

--
 .../web/rest/publisher/TestPublisherRestResources.groovy | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4ca25b2c/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
index c1732e6..7dbd3e2 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
@@ -65,14 +65,15 @@ class TestPublisherRestResources extends AgentTestBase {
 assert app_def_path.exists()
 assert agt_ver_path.exists()
 assert agt_conf_path.exists()
+
 ServiceLauncher launcher = buildAgentCluster(clustername,
 roles,
 [
 ARG_PROVIDER, 
"org.apache.slider.server.appmaster.web.rest.publisher.TestSliderProviderFactory",
 ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, "file://" + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, "file://" + agt_conf_path.absolutePath,
-ARG_OPTION, AGENT_VERSION, "file://" + agt_ver_path.absolutePath
+ARG_OPTION, APP_DEF, toFileURI(app_def_path),
+ARG_OPTION, AGENT_CONF, toFileURI(agt_conf_path),
+ARG_OPTION, AGENT_VERSION, toFileURI(agt_ver_path)
 ],
 true, true,
 true)
@@ -142,4 +143,8 @@ class TestPublisherRestResources extends AgentTestBase {
 assert !uris.any {it =~ /foo-bar/}
   }
 
+  public String toFileURI(File filename) {
+"file://" + filename.absolutePath
+  }
+
 }



[09/11] git commit: SLIDER-352 TestPublisherRestResources failing on windows

2014-08-22 Thread stevel
SLIDER-352 TestPublisherRestResources failing on windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8b43def0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8b43def0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8b43def0

Branch: refs/heads/develop
Commit: 8b43def08bfdb223cfc5d584acdc02bf3492f41c
Parents: 4ca25b2
Author: Steve Loughran 
Authored: Fri Aug 22 16:41:14 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:41:14 2014 +0100

--
 .../appmaster/web/rest/publisher/TestPublisherRestResources.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b43def0/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
index 7dbd3e2..21881be 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
@@ -144,7 +144,7 @@ class TestPublisherRestResources extends AgentTestBase {
   }
 
   public String toFileURI(File filename) {
-"file://" + filename.absolutePath
+filename.toURI().toString()
   }
 
 }



[03/11] git commit: SLIDER-350 error in test cleanup when file in use on windows

2014-08-22 Thread stevel
SLIDER-350 error in test cleanup when file in use on windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b3a835dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b3a835dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b3a835dd

Branch: refs/heads/develop
Commit: b3a835ddc5182d2c82c8355ad5deba86f6063174
Parents: 4ff287b
Author: Steve Loughran 
Authored: Fri Aug 22 15:14:56 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 15:14:56 2014 +0100

--
 .../org/apache/slider/agent/AgentMiniClusterTestBase.groovy | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b3a835dd/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
index 74f7a3f..a957481 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
@@ -80,8 +80,13 @@ extends YarnZKMiniClusterTestBase {
 
   @AfterClass
   public static void cleanSubConfFiles() {
-if (tempFolder.getRoot().exists()) {
-  FileUtils.deleteDirectory(tempFolder.getRoot());
+def tempRoot = tempFolder.root
+if (tempRoot.exists()) {
+  try {
+FileUtils.deleteDirectory(tempRoot);
+  } catch (IOException e) {
+log.warn("Failed to delete $tempRoot :$e", e)
+  }
 }
   }
 



[05/11] git commit: SLIDER-352 more testing of windows

2014-08-22 Thread stevel
SLIDER-352 more testing of windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/db2d2985
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/db2d2985
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/db2d2985

Branch: refs/heads/develop
Commit: db2d29857faf53da2e8fce0c107209883980b266
Parents: 83665f6
Author: Steve Loughran 
Authored: Fri Aug 22 16:15:02 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:15:02 2014 +0100

--
 .../apache/slider/common/tools/TestWindowsSupport.groovy | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/db2d2985/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 4da42f2..8387237 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -24,13 +24,15 @@ import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.ChecksumFileSystem
 import org.apache.hadoop.fs.Path
 import org.apache.hadoop.fs.FileSystem as HadoopFS
+import org.apache.hadoop.util.Shell
+import org.apache.slider.test.SliderTestUtils
 import org.junit.Test
 
 import java.util.regex.Pattern
 
 @CompileStatic
 @Slf4j
-class TestWindowsSupport {
+class TestWindowsSupport extends SliderTestUtils {
 
   private static final Pattern hasDriveLetterSpecifier =
   Pattern.compile("^/?[a-zA-Z]:");
@@ -62,17 +64,18 @@ class TestWindowsSupport {
   
   @Test
   public void testPathHandling() throws Throwable {
-System.setProperty("os.name", "Windows/286")
+assume(Shell.WINDOWS, "not windows")
+
 Path path = new Path(windowsFile);
 def uri = path.toUri()
 //assert "file" == uri.scheme 
 assert uri.authority == null;
 
-
-
 Configuration conf = new Configuration()
 
 def localfs = HadoopFS.get(uri, conf)
 assert localfs instanceof ChecksumFileSystem
+def stat = localfs.getFileStatus(path)
+
   }
 }



[02/11] git commit: SLIDER-350 making teardown of failing tests more robust

2014-08-22 Thread stevel
SLIDER-350 making teardown of failing tests more robust


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4ff287be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4ff287be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4ff287be

Branch: refs/heads/develop
Commit: 4ff287bee75e09dd6c4b119540f8bb26b6760ef5
Parents: a5df397
Author: Steve Loughran 
Authored: Fri Aug 22 14:58:37 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 14:58:37 2014 +0100

--
 .../server/appmaster/web/rest/agent/TestAMAgentWebServices.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4ff287be/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
--
diff --git 
a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
 
b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
index 8590cbc..827b47a 100644
--- 
a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
+++ 
b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
@@ -27,6 +27,7 @@ import com.sun.jersey.api.json.JSONConfiguration;
 import junit.framework.Assert;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.slider.common.SliderKeys;
 import org.apache.slider.common.tools.SliderUtils;
@@ -152,7 +153,7 @@ public class TestAMAgentWebServices {
 
   @After
   public void tearDown () throws Exception {
-webApp.close();
+IOUtils.closeStream(webApp);
 webApp = null;
   }
 



[10/11] git commit: SLIDER-353 killJavaProcesses doesn't work on windows ... skip when reached, and swallowed on teardown

2014-08-22 Thread stevel
SLIDER-353 killJavaProcesses doesn't work on windows ... skip when reached, and 
swallowed on teardown


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/87ff4d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/87ff4d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/87ff4d80

Branch: refs/heads/develop
Commit: 87ff4d80cad1e7b1badaad6e0a5c04961e633430
Parents: 8b43def
Author: Steve Loughran 
Authored: Fri Aug 22 17:05:09 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 17:05:09 2014 +0100

--
 .../org/apache/slider/test/YarnMiniClusterTestBase.groovy   | 4 +++-
 .../slider/providers/accumulo/AccumuloTestBase.groovy   | 7 ++-
 .../hbase/minicluster/HBaseMiniClusterTestBase.groovy   | 9 +++--
 3 files changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index b6f863b..09c56a5 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -64,7 +64,7 @@ import static 
org.apache.slider.common.SliderXMLConfKeysForTesting.*;
  * Base class for mini cluster tests -creates a field for the
  * mini yarn cluster
  */
-@CompileStatic
+//@CompileStatic
 @Slf4j
 public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
   /**
@@ -327,6 +327,8 @@ public abstract class YarnMiniClusterTestBase extends 
ServiceLauncherBaseTest {
*/
   public void killJavaProcesses(String grepString, int signal) {
 
+assume(!Shell.WINDOWS, "failed to kill -$signal $grepString - no windows 
support ")
+
 GString bashCommand = "jps -l| grep ${grepString} | awk '{print \$1}' | 
xargs kill $signal"
 log.info("Bash command = $bashCommand" )
 Process bash = ["bash", "-c", bashCommand].execute()

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
--
diff --git 
a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
 
b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
index bf35207..93b2798 100644
--- 
a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
+++ 
b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
@@ -27,6 +27,7 @@ import org.apache.slider.api.ClusterDescription
 import org.apache.slider.api.ResourceKeys
 import org.apache.slider.client.SliderClient
 import org.apache.slider.test.YarnZKMiniClusterTestBase
+import org.junit.internal.AssumptionViolatedException
 
 import static org.apache.slider.common.SliderXMLConfKeysForTesting.*
 import static org.apache.slider.providers.accumulo.AccumuloKeys.*
@@ -71,7 +72,11 @@ public abstract class AccumuloTestBase extends 
YarnZKMiniClusterTestBase {
   void teardown() {
 super.teardown();
 if (teardownKillall) {
-  killAllAccumuloProcesses();
+  try {
+killAllAccumuloProcesses();
+  } catch (AssumptionViolatedException e) {
+log.info e.toString();
+  }
 }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
--
diff --git 
a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
 
b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
index 6a69e17..10de9ac 100644
--- 
a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
+++ 
b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
@@ -30,6 +30,7 @@ import org.apache.slider.client

[2/2] git commit: SLIDER-254 fix some issues with accumulo process startup

2014-08-22 Thread billie
SLIDER-254 fix some issues with accumulo process startup


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/31784988
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/31784988
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/31784988

Branch: refs/heads/feature/SLIDER-254_use_credential_provider
Commit: 31784988d67dfd5a9ea02e0d3faf15e82a0d152d
Parents: 5510e13
Author: Billie Rinaldi 
Authored: Fri Aug 22 10:39:43 2014 -0700
Committer: Billie Rinaldi 
Committed: Fri Aug 22 10:39:43 2014 -0700

--
 app-packages/accumulo/package/scripts/accumulo_service.py  | 2 +-
 app-packages/accumulo/package/scripts/params.py| 2 +-
 app-packages/accumulo/package/templates/accumulo-env.sh.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/31784988/app-packages/accumulo/package/scripts/accumulo_service.py
--
diff --git a/app-packages/accumulo/package/scripts/accumulo_service.py 
b/app-packages/accumulo/package/scripts/accumulo_service.py
index 562ef5d..ca21cc8 100644
--- a/app-packages/accumulo/package/scripts/accumulo_service.py
+++ b/app-packages/accumulo/package/scripts/accumulo_service.py
@@ -30,7 +30,7 @@ def accumulo_service( name,
 pid_exists = format("ls {pid_file} >/dev/null 2>&1 && ps `cat {pid_file}` 
>/dev/null 2>&1")
 
 if action == 'start':
-  daemon_cmd = format("{daemon_script} {role} > 
{log_dir}/accumulo-{accumulo_user}-{role}.out 
2>{log_dir}/accumulo-{accumulo_user}-{role}.err & echo $! > {pid_file}")
+  daemon_cmd = format("{daemon_script} {role} --address {params.hostname} 
> {log_dir}/accumulo-{accumulo_user}-{role}.out 
2>{log_dir}/accumulo-{accumulo_user}-{role}.err & echo $! > {pid_file}")
   Execute ( daemon_cmd,
 not_if=pid_exists,
 user=params.accumulo_user

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/31784988/app-packages/accumulo/package/scripts/params.py
--
diff --git a/app-packages/accumulo/package/scripts/params.py 
b/app-packages/accumulo/package/scripts/params.py
index 5cef7eb..7d0e52d 100644
--- a/app-packages/accumulo/package/scripts/params.py
+++ b/app-packages/accumulo/package/scripts/params.py
@@ -23,7 +23,7 @@ import status_params
 
 # server configurations
 config = Script.get_config()
-hostname = config["hostname"]
+hostname = config["public_hostname"]
 
 # user and status
 accumulo_user = status_params.accumulo_user

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/31784988/app-packages/accumulo/package/templates/accumulo-env.sh.j2
--
diff --git a/app-packages/accumulo/package/templates/accumulo-env.sh.j2 
b/app-packages/accumulo/package/templates/accumulo-env.sh.j2
index 7ffec53..9e365af 100755
--- a/app-packages/accumulo/package/templates/accumulo-env.sh.j2
+++ b/app-packages/accumulo/package/templates/accumulo-env.sh.j2
@@ -36,7 +36,7 @@ export ACCUMULO_TSERVER_OPTS="-Xmx{{tserver_heapsize}} 
-Xms{{tserver_heapsize}}"
 export ACCUMULO_MASTER_OPTS="-Xmx{{master_heapsize}} -Xms{{master_heapsize}}"
 export ACCUMULO_MONITOR_OPTS="-Xmx{{monitor_heapsize}} 
-Xms{{monitor_heapsize}}"
 export ACCUMULO_GC_OPTS="-Xmx{{gc_heapsize}} -Xms{{gc_heapsize}}"
-export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75"
+export ACCUMULO_GENERAL_OPTS="-XX:+UseConcMarkSweepGC 
-XX:CMSInitiatingOccupancyFraction=75 -Djava.net.preferIPv4Stack=true"
 export ACCUMULO_OTHER_OPTS="-Xmx{{other_heapsize}} -Xms{{other_heapsize}}"
 # what do when the JVM runs out of heap memory
 export ACCUMULO_KILL_CMD='kill -9 %p'



[1/2] git commit: SLIDER-254, SLIDER-146 added ability to enable ssl for accumulo using a credential provider

2014-08-22 Thread billie
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-254_use_credential_provider 6e0e72613 -> 31784988d


SLIDER-254, SLIDER-146 added ability to enable ssl for accumulo using a 
credential provider


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5510e137
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5510e137
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5510e137

Branch: refs/heads/feature/SLIDER-254_use_credential_provider
Commit: 5510e1375de63f4a318280938a6ec9be2fcc1436
Parents: 6e0e726
Author: Billie Rinaldi 
Authored: Thu Aug 21 07:17:15 2014 -0700
Committer: Billie Rinaldi 
Committed: Thu Aug 21 07:17:15 2014 -0700

--
 README.md   |  28 +++
 app-packages/accumulo/README.txt|  31 +++
 app-packages/accumulo/appConfig.json|   3 +-
 app-packages/accumulo/metainfo.xml  |   8 +
 .../accumulo/package/scripts/accumulo_client.py |   2 +-
 .../package/scripts/accumulo_configuration.py   |  69 --
 .../accumulo/package/scripts/accumulo_script.py |  45 +---
 app-packages/accumulo/package/scripts/params.py |  28 ++-
 .../accumulo/package/templates/client.conf.j2   |  18 ++
 app-packages/accumulo/src/assembly/accumulo.xml |   2 +-
 .../slider/accumulo/CustomAuthenticator.java|  37 +--
 .../apache/slider/accumulo/ProviderUtil.java|  57 +
 .../AccumuloAgentCommandTestBase.groovy |   5 +-
 .../funtest/accumulo/AccumuloBasicIT.groovy |  46 +++-
 .../accumulo/AccumuloMonitorSSLIT.groovy|   2 +-
 .../funtest/accumulo/AccumuloReadWriteIT.groovy |   4 +-
 .../accumulo/AccumuloReadWriteSSLIT.groovy  |  73 ++
 .../funtest/accumulo/AccumuloSSLTestBase.groovy |  99 
 .../slider/funtest/accumulo/CertUtil.java   | 235 +++
 .../test/resources/appConfig_monitor_ssl.json   |  17 +-
 .../src/test/resources/appConfig_ssl.json   |  67 ++
 .../accumulo/src/test/resources/resources.json  |   4 +-
 .../test/resources/resources_with_client.json   |  41 
 .../org/apache/slider/client/SliderClient.java  |   2 +-
 .../common/SliderXMLConfKeysForTesting.java |   6 +-
 25 files changed, 796 insertions(+), 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5510e137/README.md
--
diff --git a/README.md b/README.md
index 480502d..b91e477 100644
--- a/README.md
+++ b/README.md
@@ -91,3 +91,31 @@ Read-write (for committers):
 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. See accompanying LICENSE file.
+
+# Export Control
+
+This distribution includes cryptographic software. The country in which you
+currently reside may have restrictions on the import, possession, use, and/or
+re-export to another country, of encryption software. BEFORE using any
+encryption software, please check your country's laws, regulations and
+policies concerning the import, possession, or use, and re-export of encryption
+software, to see if this is permitted. See  for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and Security
+(BIS), has classified this software as Export Commodity Control Number (ECCN)
+5D002.C.1, which includes information security software using or performing
+cryptographic functions with asymmetric algorithms. The form and manner of this
+Apache Software Foundation distribution makes it eligible for export under the
+License Exception ENC Technology Software Unrestricted (TSU) exception (see the
+BIS Export Administration Regulations, Section 740.13) for both object code and
+source code.
+
+The following provides more details on the included cryptographic software:
+
+Apache Slider uses the built-in java cryptography libraries. See Oracle's
+information regarding Java cryptographic export regulations for more details:
+http://www.oracle.com/us/products/export/export-regulations-345813.html
+
+Apache Slider uses the SSL libraries from the Jetty project distributed by the
+Eclipse Foundation (http://eclipse.org/jetty).

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5510e137/app-packages/accumulo/README.txt
--
diff --git a/app-packages/accumulo/README.txt b/app-packages/accumulo/README.txt
index 8e8fac2..f49e389 100644
--- a/app-packages/accumulo/README.txt
+++ b/app-packages/accumulo/README.txt
@@ -45,3 +45,34 @@ which is an HDFS URI).
 
 A less descriptive file name can be specified with
 -Dapp.package.name=accumulo_160

git commit: SLIDER-353 killJavaProcesses doesn't work on windows ... skip when reached, and swallowed on teardown

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows 8b43def08 
-> 87ff4d80c


SLIDER-353 killJavaProcesses doesn't work on windows ... skip when reached, and 
swallowed on teardown


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/87ff4d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/87ff4d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/87ff4d80

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: 87ff4d80cad1e7b1badaad6e0a5c04961e633430
Parents: 8b43def
Author: Steve Loughran 
Authored: Fri Aug 22 17:05:09 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 17:05:09 2014 +0100

--
 .../org/apache/slider/test/YarnMiniClusterTestBase.groovy   | 4 +++-
 .../slider/providers/accumulo/AccumuloTestBase.groovy   | 7 ++-
 .../hbase/minicluster/HBaseMiniClusterTestBase.groovy   | 9 +++--
 3 files changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
index b6f863b..09c56a5 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
@@ -64,7 +64,7 @@ import static 
org.apache.slider.common.SliderXMLConfKeysForTesting.*;
  * Base class for mini cluster tests -creates a field for the
  * mini yarn cluster
  */
-@CompileStatic
+//@CompileStatic
 @Slf4j
 public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest {
   /**
@@ -327,6 +327,8 @@ public abstract class YarnMiniClusterTestBase extends 
ServiceLauncherBaseTest {
*/
   public void killJavaProcesses(String grepString, int signal) {
 
+assume(!Shell.WINDOWS, "failed to kill -$signal $grepString - no windows 
support ")
+
 GString bashCommand = "jps -l| grep ${grepString} | awk '{print \$1}' | 
xargs kill $signal"
 log.info("Bash command = $bashCommand" )
 Process bash = ["bash", "-c", bashCommand].execute()

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
--
diff --git 
a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
 
b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
index bf35207..93b2798 100644
--- 
a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
+++ 
b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy
@@ -27,6 +27,7 @@ import org.apache.slider.api.ClusterDescription
 import org.apache.slider.api.ResourceKeys
 import org.apache.slider.client.SliderClient
 import org.apache.slider.test.YarnZKMiniClusterTestBase
+import org.junit.internal.AssumptionViolatedException
 
 import static org.apache.slider.common.SliderXMLConfKeysForTesting.*
 import static org.apache.slider.providers.accumulo.AccumuloKeys.*
@@ -71,7 +72,11 @@ public abstract class AccumuloTestBase extends 
YarnZKMiniClusterTestBase {
   void teardown() {
 super.teardown();
 if (teardownKillall) {
-  killAllAccumuloProcesses();
+  try {
+killAllAccumuloProcesses();
+  } catch (AssumptionViolatedException e) {
+log.info e.toString();
+  }
 }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/87ff4d80/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
--
diff --git 
a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
 
b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
index 6a69e17..10de9ac 100644
--- 
a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
+++ 

git commit: SLIDER-352 TestPublisherRestResources failing on windows

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows 4ca25b2c5 
-> 8b43def08


SLIDER-352 TestPublisherRestResources failing on windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8b43def0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8b43def0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8b43def0

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: 8b43def08bfdb223cfc5d584acdc02bf3492f41c
Parents: 4ca25b2
Author: Steve Loughran 
Authored: Fri Aug 22 16:41:14 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:41:14 2014 +0100

--
 .../appmaster/web/rest/publisher/TestPublisherRestResources.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b43def0/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
index 7dbd3e2..21881be 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
@@ -144,7 +144,7 @@ class TestPublisherRestResources extends AgentTestBase {
   }
 
   public String toFileURI(File filename) {
-"file://" + filename.absolutePath
+filename.toURI().toString()
   }
 
 }



git commit: SLIDER-352 TestPublisherRestResources failing on windows

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows 475507b59 
-> 4ca25b2c5


SLIDER-352 TestPublisherRestResources failing on windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4ca25b2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4ca25b2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4ca25b2c

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: 4ca25b2c535bd8ebbb8d92b318436dffe778754f
Parents: 475507b
Author: Steve Loughran 
Authored: Fri Aug 22 16:33:07 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:33:07 2014 +0100

--
 .../web/rest/publisher/TestPublisherRestResources.groovy | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4ca25b2c/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
index c1732e6..7dbd3e2 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy
@@ -65,14 +65,15 @@ class TestPublisherRestResources extends AgentTestBase {
 assert app_def_path.exists()
 assert agt_ver_path.exists()
 assert agt_conf_path.exists()
+
 ServiceLauncher launcher = buildAgentCluster(clustername,
 roles,
 [
 ARG_PROVIDER, 
"org.apache.slider.server.appmaster.web.rest.publisher.TestSliderProviderFactory",
 ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath,
-ARG_OPTION, APP_DEF, "file://" + app_def_path.absolutePath,
-ARG_OPTION, AGENT_CONF, "file://" + agt_conf_path.absolutePath,
-ARG_OPTION, AGENT_VERSION, "file://" + agt_ver_path.absolutePath
+ARG_OPTION, APP_DEF, toFileURI(app_def_path),
+ARG_OPTION, AGENT_CONF, toFileURI(agt_conf_path),
+ARG_OPTION, AGENT_VERSION, toFileURI(agt_ver_path)
 ],
 true, true,
 true)
@@ -142,4 +143,8 @@ class TestPublisherRestResources extends AgentTestBase {
 assert !uris.any {it =~ /foo-bar/}
   }
 
+  public String toFileURI(File filename) {
+"file://" + filename.absolutePath
+  }
+
 }



git commit: SLIDER-352 more testing of windows

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows 53457d98d 
-> 475507b59


SLIDER-352 more testing of windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/475507b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/475507b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/475507b5

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: 475507b598b6b23815d5b6f983206fb9cbb20412
Parents: 53457d9
Author: Steve Loughran 
Authored: Fri Aug 22 16:25:46 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:26:06 2014 +0100

--
 .../org/apache/slider/providers/agent/AgentUtils.java   |  2 +-
 .../slider/common/tools/TestWindowsSupport.groovy   | 12 
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/475507b5/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
--
diff --git 
a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java 
b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
index f329756..6bb6132 100644
--- 
a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
+++ 
b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
@@ -35,7 +35,7 @@ import java.io.InputStream;
 public class AgentUtils {
   private static final Logger log = LoggerFactory.getLogger(AgentUtils.class);
 
-  static Metainfo getApplicationMetainfo(SliderFileSystem fileSystem,
+  public static Metainfo getApplicationMetainfo(SliderFileSystem fileSystem,
 String appDef) throws IOException {
 log.info("Reading metainfo at {}", appDef);
 FileSystem fs = fileSystem.getFileSystem();

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/475507b5/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 2d74760..e6d2225 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -26,6 +26,7 @@ import org.apache.hadoop.fs.FSDataInputStream
 import org.apache.hadoop.fs.Path
 import org.apache.hadoop.fs.FileSystem as HadoopFS
 import org.apache.hadoop.util.Shell
+import org.apache.slider.providers.agent.AgentUtils
 import org.apache.slider.test.SliderTestUtils
 import org.junit.Test
 
@@ -89,4 +90,15 @@ class TestWindowsSupport extends SliderTestUtils {
   // expected
 }
   }
+
+  @Test
+  public void testSliderFS() throws Throwable {
+SliderFileSystem sfs = new SliderFileSystem(new Configuration())
+try {
+  def metainfo = AgentUtils.getApplicationMetainfo(sfs, windowsFile)
+} catch (FileNotFoundException fnfe) {
+  // expected
+}
+
+  }
 }



git commit: SLIDER-352 more testing of windows

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows db2d29857 
-> 53457d98d


SLIDER-352 more testing of windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/53457d98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/53457d98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/53457d98

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: 53457d98d480e3b4134175c09b4927d0c1dfb4ef
Parents: db2d298
Author: Steve Loughran 
Authored: Fri Aug 22 16:20:26 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:20:26 2014 +0100

--
 .../apache/slider/providers/agent/AgentUtils.java|  9 +++--
 .../slider/common/tools/TestWindowsSupport.groovy| 15 +--
 2 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/53457d98/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
--
diff --git 
a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java 
b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
index f296a95..f329756 100644
--- 
a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
+++ 
b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentUtils.java
@@ -16,6 +16,7 @@
  */
 package org.apache.slider.providers.agent;
 
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.slider.common.tools.SliderFileSystem;
 import org.apache.slider.common.tools.SliderUtils;
@@ -24,6 +25,7 @@ import 
org.apache.slider.providers.agent.application.metadata.MetainfoParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -36,11 +38,14 @@ public class AgentUtils {
   static Metainfo getApplicationMetainfo(SliderFileSystem fileSystem,
 String appDef) throws IOException {
 log.info("Reading metainfo at {}", appDef);
+FileSystem fs = fileSystem.getFileSystem();
+Path appPath = new Path(appDef);
 InputStream metainfoStream = SliderUtils.getApplicationResourceInputStream(
-fileSystem.getFileSystem(), new Path(appDef), "metainfo.xml");
+fs, appPath, "metainfo.xml");
 if (metainfoStream == null) {
   log.error("metainfo.xml is unavailable at {}.", appDef);
-  throw new IOException("metainfo.xml is required in app package.");
+  throw new FileNotFoundException("metainfo.xml is required in app 
package. " +
+appPath);
 }
 
 Metainfo metainfo = new MetainfoParser().parse(metainfoStream);

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/53457d98/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 8387237..2d74760 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -22,6 +22,7 @@ import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.ChecksumFileSystem
+import org.apache.hadoop.fs.FSDataInputStream
 import org.apache.hadoop.fs.Path
 import org.apache.hadoop.fs.FileSystem as HadoopFS
 import org.apache.hadoop.util.Shell
@@ -75,7 +76,17 @@ class TestWindowsSupport extends SliderTestUtils {
 
 def localfs = HadoopFS.get(uri, conf)
 assert localfs instanceof ChecksumFileSystem
-def stat = localfs.getFileStatus(path)
-
+try {
+  def stat = localfs.getFileStatus(path)
+  fail("expected an exception, got $stat")
+} catch (FileNotFoundException fnfe) {
+  // expected
+}
+
+try {
+  FSDataInputStream appStream = localfs.open(path);
+} catch (FileNotFoundException fnfe) {
+  // expected
+}
   }
 }



git commit: SLIDER-352 more testing of windows

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows 83665f617 
-> db2d29857


SLIDER-352 more testing of windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/db2d2985
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/db2d2985
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/db2d2985

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: db2d29857faf53da2e8fce0c107209883980b266
Parents: 83665f6
Author: Steve Loughran 
Authored: Fri Aug 22 16:15:02 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:15:02 2014 +0100

--
 .../apache/slider/common/tools/TestWindowsSupport.groovy | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/db2d2985/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 4da42f2..8387237 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -24,13 +24,15 @@ import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.ChecksumFileSystem
 import org.apache.hadoop.fs.Path
 import org.apache.hadoop.fs.FileSystem as HadoopFS
+import org.apache.hadoop.util.Shell
+import org.apache.slider.test.SliderTestUtils
 import org.junit.Test
 
 import java.util.regex.Pattern
 
 @CompileStatic
 @Slf4j
-class TestWindowsSupport {
+class TestWindowsSupport extends SliderTestUtils {
 
   private static final Pattern hasDriveLetterSpecifier =
   Pattern.compile("^/?[a-zA-Z]:");
@@ -62,17 +64,18 @@ class TestWindowsSupport {
   
   @Test
   public void testPathHandling() throws Throwable {
-System.setProperty("os.name", "Windows/286")
+assume(Shell.WINDOWS, "not windows")
+
 Path path = new Path(windowsFile);
 def uri = path.toUri()
 //assert "file" == uri.scheme 
 assert uri.authority == null;
 
-
-
 Configuration conf = new Configuration()
 
 def localfs = HadoopFS.get(uri, conf)
 assert localfs instanceof ChecksumFileSystem
+def stat = localfs.getFileStatus(path)
+
   }
 }



git commit: SLIDER-352 some tests

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows b3a835ddc 
-> 83665f617


SLIDER-352 some tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/83665f61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/83665f61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/83665f61

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: 83665f617025fea9f8f7e5462e30d66caab025d0
Parents: b3a835d
Author: Steve Loughran 
Authored: Fri Aug 22 16:08:24 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 16:08:24 2014 +0100

--
 .../common/tools/TestWindowsSupport.groovy  | 78 
 1 file changed, 78 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/83665f61/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
new file mode 100644
index 000..4da42f2
--- /dev/null
+++ 
b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+package org.apache.slider.common.tools
+
+import groovy.transform.CompileStatic
+import groovy.util.logging.Slf4j
+import org.apache.hadoop.conf.Configuration
+import org.apache.hadoop.fs.ChecksumFileSystem
+import org.apache.hadoop.fs.Path
+import org.apache.hadoop.fs.FileSystem as HadoopFS
+import org.junit.Test
+
+import java.util.regex.Pattern
+
+@CompileStatic
+@Slf4j
+class TestWindowsSupport {
+
+  private static final Pattern hasDriveLetterSpecifier =
+  Pattern.compile("^/?[a-zA-Z]:");
+  public static
+  final String windowsFile = 
"C:\\Users\\Administrator\\AppData\\Local\\Temp\\junit3180177850133852404\\testpkg\\appdef_1.zip"
+
+
+  private static boolean hasWindowsDrive(String path) {
+return hasDriveLetterSpecifier.matcher(path).find();
+  }
+
+  private static int startPositionWithoutWindowsDrive(String path) {
+if (hasWindowsDrive(path)) {
+  return path.charAt(0) == '/' ? 3 : 2;
+} else {
+  return 0;
+}
+  }
+
+  @Test
+  public void testHasWindowsDrive() throws Throwable {
+assert hasWindowsDrive(windowsFile)
+  }
+
+  @Test
+  public void testStartPosition() throws Throwable {
+assert 2 == startPositionWithoutWindowsDrive(windowsFile)
+  }
+  
+  @Test
+  public void testPathHandling() throws Throwable {
+System.setProperty("os.name", "Windows/286")
+Path path = new Path(windowsFile);
+def uri = path.toUri()
+//assert "file" == uri.scheme 
+assert uri.authority == null;
+
+
+
+Configuration conf = new Configuration()
+
+def localfs = HadoopFS.get(uri, conf)
+assert localfs instanceof ChecksumFileSystem
+  }
+}



[2/2] git commit: SLIDER-350 error in test cleanup when file in use on windows

2014-08-22 Thread stevel
SLIDER-350 error in test cleanup when file in use on windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b3a835dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b3a835dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b3a835dd

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: b3a835ddc5182d2c82c8355ad5deba86f6063174
Parents: 4ff287b
Author: Steve Loughran 
Authored: Fri Aug 22 15:14:56 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 15:14:56 2014 +0100

--
 .../org/apache/slider/agent/AgentMiniClusterTestBase.groovy | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b3a835dd/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
--
diff --git 
a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
 
b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
index 74f7a3f..a957481 100644
--- 
a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
+++ 
b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
@@ -80,8 +80,13 @@ extends YarnZKMiniClusterTestBase {
 
   @AfterClass
   public static void cleanSubConfFiles() {
-if (tempFolder.getRoot().exists()) {
-  FileUtils.deleteDirectory(tempFolder.getRoot());
+def tempRoot = tempFolder.root
+if (tempRoot.exists()) {
+  try {
+FileUtils.deleteDirectory(tempRoot);
+  } catch (IOException e) {
+log.warn("Failed to delete $tempRoot :$e", e)
+  }
 }
   }
 



[1/2] git commit: SLIDER-350 making teardown of failing tests more robust

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows a5df39755 
-> b3a835ddc


SLIDER-350 making teardown of failing tests more robust


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4ff287be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4ff287be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4ff287be

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: 4ff287bee75e09dd6c4b119540f8bb26b6760ef5
Parents: a5df397
Author: Steve Loughran 
Authored: Fri Aug 22 14:58:37 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 14:58:37 2014 +0100

--
 .../server/appmaster/web/rest/agent/TestAMAgentWebServices.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4ff287be/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
--
diff --git 
a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
 
b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
index 8590cbc..827b47a 100644
--- 
a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
+++ 
b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java
@@ -27,6 +27,7 @@ import com.sun.jersey.api.json.JSONConfiguration;
 import junit.framework.Assert;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.slider.common.SliderKeys;
 import org.apache.slider.common.tools.SliderUtils;
@@ -152,7 +153,7 @@ public class TestAMAgentWebServices {
 
   @After
   public void tearDown () throws Exception {
-webApp.close();
+IOUtils.closeStream(webApp);
 webApp = null;
   }
 



git commit: SLIDER-350: AM not coming up on Windows

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows [created] 
a5df39755


SLIDER-350: AM not coming up on Windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a5df3975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a5df3975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a5df3975

Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows
Commit: a5df39755bfd044f1d2ee4cc49e8d96f80a855d2
Parents: 4e8c6ff
Author: Steve Loughran 
Authored: Fri Aug 22 14:32:39 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 14:32:39 2014 +0100

--
 .../server/appmaster/SliderAppMaster.java   |  2 +-
 .../server/appmaster/web/AgentService.java  | 28 +---
 .../appmaster/web/rest/agent/AgentWebApp.java   | 16 ---
 .../LaunchedWorkflowCompositeService.java   |  4 +++
 .../services/workflow/ClosingService.java   |  3 +++
 .../web/rest/agent/TestAMAgentWebServices.java  |  2 +-
 .../workflow/TestWorkflowClosingService.java|  4 +--
 7 files changed, 29 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a5df3975/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 c006d0d..b4515f1 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
@@ -813,7 +813,7 @@ public class SliderAppMaster extends 
AbstractSliderLaunchedService
   }
 
   private void startAgentWebApp(MapOperations appInformation,
-Configuration serviceConf) {
+Configuration serviceConf) throws IOException {
 URL[] urls = ((URLClassLoader) AgentWebApp.class.getClassLoader() 
).getURLs();
 StringBuilder sb = new StringBuilder("AM classpath:");
 for (URL url : urls) {

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a5df3975/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
--
diff --git 
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
 
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
index 08338e8..f840035 100644
--- 
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
+++ 
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/AgentService.java
@@ -16,38 +16,22 @@
  */
 package org.apache.slider.server.appmaster.web;
 
-import org.apache.hadoop.service.AbstractService;
 import org.apache.slider.server.appmaster.web.rest.agent.AgentWebApp;
+import org.apache.slider.server.services.workflow.ClosingService;
+import org.apache.slider.server.services.workflow.WorkflowCompositeService;
 
 /**
- *
+ * agent service gives the agent webapp lifecycle integration
  */
-public class AgentService extends AbstractService {
-  private volatile AgentWebApp webApp;
+public class AgentService extends ClosingService {
+
 
   public AgentService(String name) {
 super(name);
   }
 
   public AgentService(String name, AgentWebApp app) {
-super(name);
-webApp = app;
+super(name, app);
   }
 
-  @Override
-  protected void serviceStart() throws Exception {
-
-  }
-
-  /**
-   * Stop operation stops the webapp; sets the reference to null
-   * @throws Exception
-   */
-  @Override
-  protected void serviceStop() throws Exception {
-if (webApp != null) {
-  webApp.stop();
-  webApp = null;
-}
-  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a5df3975/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
--
diff --git 
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
 
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
index 54d2b1f..8aac490 100644
--- 
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
+++ 
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentWebApp.java
@@ -36,13 +36,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.ext.Provider;
+import java.io.Closeable;
 import java.io

svn commit: r920135 - in /websites/staging/slider/trunk/content: ./ developing/releasing.html release_notes/release-0.50.0.html release_notes/release-0.50.2.html

2014-08-22 Thread buildbot
Author: buildbot
Date: Fri Aug 22 12:33:45 2014
New Revision: 920135

Log:
Staging update by buildbot for slider

Added:
websites/staging/slider/trunk/content/release_notes/release-0.50.2.html
Removed:
websites/staging/slider/trunk/content/release_notes/release-0.50.0.html
Modified:
websites/staging/slider/trunk/content/   (props changed)
websites/staging/slider/trunk/content/developing/releasing.html

Propchange: websites/staging/slider/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Aug 22 12:33:45 2014
@@ -1 +1 @@
-1619059
+1619779

Modified: websites/staging/slider/trunk/content/developing/releasing.html
==
--- websites/staging/slider/trunk/content/developing/releasing.html (original)
+++ websites/staging/slider/trunk/content/developing/releasing.html Fri Aug 22 
12:33:45 2014
@@ -179,6 +179,16 @@ Latest release: 0.40-incubating<
 Phase I: Merge develop branch with 
master so that you can release from master
 Phase II: Perform Apache release from 
master
 
+Tooling
+As well as everything needed to build slider, there are some extra 
requirements
+for releasing:
+
+Shell: (Currently: Bash)
+http://danielkummer.github.io/git-flow-cheatsheet/";>git 
flow
+OS/X and windows: http://www.sourcetreeapp.com/";>Atlassian 
SourceTree.
+This can perform the git flow operations, as well as show the state of your
+git graph.
+
 Before you begin
 1. Check out the latest version of the develop branch,
 run the tests. This should be done on a checked out
@@ -194,7 +204,7 @@ create HBase and Accumulo clusters in th
 Make sure that the integration tests are passing (and not being 
skipped) before
 starting to make a release
 2.  Check out the latest version of origin/master.
-Phase - I
+Phase - I
 Step #1: Create a JIRA for the release, estimate 3h
 (so you don't try to skip the tests)
 export SLIDER_RELEASE_JIRA=SLIDER-13927
@@ -290,9 +300,9 @@ paste in.
 Step #11: update mvn versions
 Switch back to develop and update its version number past
 the release number
-export SLIDER_RELEASE=0.51.0-incubating-SNAPSHOT
-mvn versions:set -DnewVersion=$SLIDER_RELEASE
-git commit -a -m "$SLIDER_RELEASE_JIRA updating development POMs to $SLIDER_RELEASE"
+export SLIDER_DEV=0.51.0-incubating-SNAPSHOT
+mvn versions:set -DnewVersion=$SLIDER_DEV
+git commit -a -m "$SLIDER_RELEASE_JIRA updating development POMs to $SLIDER_DEV"
 
 
 
@@ -303,7 +313,7 @@ the release number
 
 (assuming that origin maps to 
https://git-wip-us.apache.org/repos/asf/incubator-slider.git;
  you can check this with git remote -v
-The git-flow program automatically pushes up the 
release/slider-X.Y branch,
+The git-flow program automatically pushes up the 
release/slider-$SLIDER_RELEASE branch,
 before deleting it locally.
 If you are planning on any release work of more than a single test run,
 consider having your local release branch track the master.
@@ -319,13 +329,13 @@ sprint -so wrap that up too.
 
 
 At this point you are ready for Apache release from master.
-Phase - II
+Phase - II
 Step 1
 Get a clean enlistment.
 mkdir release
 cd release
-git clone https://git-wip-us.apache.org/repos/asf/incubator-slider.git slider-x.y.z
-cd slider-x.y.z
+git clone https://git-wip-us.apache.org/repos/asf/incubator-slider.git slider-$SLIDER_RELEASE
+cd slider-$SLIDER_RELEASE
 
 
 
@@ -344,7 +354,7 @@ sprint -so wrap that up too.
 
 Step 4
 Tag for the release. Start with RC0 and move to RC1, RC2 if you need to 
restart the release process for this version.
-git tag -a release-x.y.z-rc0 -m 'Slider 
x.y.z-incubating-RC0'
+git tag -a release-$SLIDER_RELEASE-rc0 -m 'Slider $SLIDER_RELEASE-RC0'
 git push --tags origin
 
 
@@ -355,60 +365,90 @@ sprint -so wrap that up too.
 
 
 
-You should find a .tar.gz at target folder (e.g. 
./target/apache-slider-x.y.z-source-release.tar.gz)
+You should find a .tar.gz at target folder (e.g. 
./target/apache-slider-$SLIDER_RELEASE-source-release.tar.gz and .zip)
 Rename it with incubator* in the name.
 cd target
-mv apache-slider-x.y.z-source-release.tar.gz apache-slider-x.y.z-incubating-source-release.tar.gz
+rm rat.txt
+rm -rf 
archive-tmp
+
+#mv apache-slider-$SLIDER_RELEASE-source-release.tar.gz apache-slider-$SLIDER_RELEASE-source-release.tar.gz
 
 
 
 Step 6
 Sign the tarball
-gpg2  --armor --output apache-slider-{release number}-incubating-source-release.tar.gz.asc --detach-sig apache-slider-{release number}-incubating-source-release.tar.gz
+export ASF_USER=stevel
+
+gpg2  --armor  --default-key 
$ASF_USER@apache.org -v --output apache-slider-$SLIDER_RELEASE-source-release.tar.gz.asc --detach-sig apache-slider-$SLIDER_RELEASE-source-release.tar.gz
+gpg2  --armor  --default-key 
$ASF_USER@apache.org -v  --output apache-slider-$SLIDER_RELEASE-source-release.zip.asc --detach-sig apache-slider-$SLIDER_RELEASE-source-release.zip
 
 

svn commit: r1619779 - in /incubator/slider/site/trunk/content: developing/releasing.md release_notes/release-0.50.0.md release_notes/release-0.50.2.md

2014-08-22 Thread stevel
Author: stevel
Date: Fri Aug 22 12:33:35 2014
New Revision: 1619779

URL: http://svn.apache.org/r1619779
Log:
SLIDER-349 release 0.50.2 with update of release notes to cover hotfixes; more 
env var driven automation of ASF release

Added:
incubator/slider/site/trunk/content/release_notes/release-0.50.2.md
  - copied, changed from r1619049, 
incubator/slider/site/trunk/content/release_notes/release-0.50.0.md
Removed:
incubator/slider/site/trunk/content/release_notes/release-0.50.0.md
Modified:
incubator/slider/site/trunk/content/developing/releasing.md

Modified: incubator/slider/site/trunk/content/developing/releasing.md
URL: 
http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/developing/releasing.md?rev=1619779&r1=1619778&r2=1619779&view=diff
==
--- incubator/slider/site/trunk/content/developing/releasing.md (original)
+++ incubator/slider/site/trunk/content/developing/releasing.md Fri Aug 22 
12:33:35 2014
@@ -26,9 +26,22 @@ The process has two phases.
 * [Phase I](#phase1): Merge `develop` branch with `master` so that you can 
release from `master`
 * [Phase II](#phase2): Perform Apache release from `master`
 
+
+### Tooling
+
+As well as everything needed to build slider, there are some extra requirements
+for releasing:
+
+1. Shell: (Currently: Bash)
+1. [git flow](http://danielkummer.github.io/git-flow-cheatsheet/)
+1. OS/X and windows: [Atlassian SourceTree](http://www.sourcetreeapp.com/).
+This can perform the git flow operations, as well as show the state of your
+git graph.
+
  
 ### Before you begin
 
+
 *1.* Check out the latest version of the develop branch,
 run the tests. This should be done on a checked out
 version of the code that is not the one you are developing on
@@ -160,9 +173,9 @@ Switch back to `develop` and update its 
 the release number
 
 
-export SLIDER_RELEASE=0.51.0-incubating-SNAPSHOT
-mvn versions:set -DnewVersion=$SLIDER_RELEASE
-git commit -a -m "$SLIDER_RELEASE_JIRA updating development POMs to 
$SLIDER_RELEASE"
+export SLIDER_DEV=0.51.0-incubating-SNAPSHOT
+mvn versions:set -DnewVersion=$SLIDER_DEV
+git commit -a -m "$SLIDER_RELEASE_JIRA updating development POMs to 
$SLIDER_DEV"
 
 **Step #12:** Push the release and develop branches to github 
 
@@ -172,7 +185,7 @@ the release number
  you can check this with `git remote -v`
 
 
-The `git-flow` program automatically pushes up the `release/slider-X.Y` branch,
+The `git-flow` program automatically pushes up the 
`release/slider-$SLIDER_RELEASE` branch,
 before deleting it locally.
 
 If you are planning on any release work of more than a single test run,
@@ -202,8 +215,8 @@ Get a clean enlistment.
 
 mkdir release
 cd release
-git clone https://git-wip-us.apache.org/repos/asf/incubator-slider.git 
slider-x.y.z
-cd slider-x.y.z
+git clone https://git-wip-us.apache.org/repos/asf/incubator-slider.git 
slider-$SLIDER_RELEASE
+cd slider-$SLIDER_RELEASE
 
 **Step 2**
 
@@ -222,7 +235,7 @@ Ensure the rat check is clean.
 
 Tag for the release. Start with RC0 and move to RC1, RC2 if you need to 
restart the release process for this version.
 
-git tag -a release-x.y.z-rc0 -m 'Slider x.y.z-incubating-RC0'
+git tag -a release-$SLIDER_RELEASE-rc0 -m 'Slider $SLIDER_RELEASE-RC0'
 git push --tags origin

 **Step 5**
@@ -231,64 +244,98 @@ Create the release source tarball.
 
 mvn clean install -DskipTests -Papache-release
 
-You should find a *.tar.gz at target folder (e.g. 
./target/apache-slider-x.y.z-source-release.tar.gz)
+You should find a *.tar.gz at target folder (e.g. 
./target/apache-slider-$SLIDER_RELEASE-source-release.tar.gz and .zip)
 Rename it with *incubator* in the name.
 
 cd target
-mv apache-slider-x.y.z-source-release.tar.gz 
apache-slider-x.y.z-incubating-source-release.tar.gz
+rm rat.txt
+rm -rf archive-tmp
+
+#mv apache-slider-$SLIDER_RELEASE-source-release.tar.gz 
apache-slider-$SLIDER_RELEASE-source-release.tar.gz
 
 **Step 6**
 
 Sign the tarball
 
-gpg2  --armor --output apache-slider-{release 
number}-incubating-source-release.tar.gz.asc --detach-sig 
apache-slider-{release number}-incubating-source-release.tar.gz
+export ASF_USER=stevel
+
+gpg2  --armor  --default-key $asf_u...@apache.org -v --output 
apache-slider-$SLIDER_RELEASE-source-release.tar.gz.asc --detach-sig 
apache-slider-$SLIDER_RELEASE-source-release.tar.gz
+gpg2  --armor  --default-key $asf_u...@apache.org -v  --output 
apache-slider-$SLIDER_RELEASE-source-release.zip.asc --detach-sig 
apache-slider-$SLIDER_RELEASE-source-release.zip
 
 **Step 7**
 
 Generate MD5 checksums. *md5sum* and *sha1sum* or *gpg* are also both capable 
of creating checksum files.
 
-openssl md5 apache-slider-{release 
number}-incubating-source-release.tar.gz > apache-slider-{release 
number}-incubating-source-release.tar.gz.md5
-op

svn commit: r6246 - /release/incubator/slider/KEYS

2014-08-22 Thread stevel
Author: stevel
Date: Fri Aug 22 12:26:04 2014
New Revision: 6246

Log:
SLIDER-329 ste...@apache.org adds PGP signatures

Modified:
release/incubator/slider/KEYS

Modified: release/incubator/slider/KEYS
==
--- release/incubator/slider/KEYS (original)
+++ release/incubator/slider/KEYS Fri Aug 22 12:26:04 2014
@@ -68,3 +68,231 @@ Vb/N8Us6ojvPd8AFHYyY+ZSVzfR94BuJ4WLKnkOF
 d5ok/rBH9l8bS2Mq0ymed4iDv9I=
 =8vou
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - https://gpgtools.org
+
+mQINBFN89asBEADB8I4YNMB4se8v6e7uwvBppLlwC+z4r3SVJZP10oTT2wBS0UNJ
+FuGohVY2gJNaFav8Czm4gNJH73FNBmx+7iZ/JkwJLDU+tyOf66uCNRKVc9woj/Ji
+m3G19YTiJyQ4emeFdeMX56jweDdOZwqduNXVMKkY/WwuRajNyje/3TfZ78Sbjunu
+B+wlE3LRag3IroeBA/8ZCS7pG91/KCOLXcyD07pKF0I5gXB6Vxx8GK5NxtFPl5th
+LFc2MoJs7HWsILHWy/9AGGTg6YGnbUVrjOaD+3jHkGCleUXW0SwAEoJXjOxOowPQ
+bb3QLPX16aL+RtZ6SXEK6OdUVCFZw1/B1TqwJSR9m141aMVMiP5RVDNzrAfjnq3x
+m1dW1IUpVBVDnsbyMhwyfIPkuguXuJSRPfxl+d0VP+ZF3rBsq1uQO8Q14ua1t09a
+/lYzzbQLF4vOJ+CLdQkh7o6DK5W9AZsvEEkraDRG0M4BbxKtYQ/XK0d6UhRyor//
+HPnVYUYBWgxGj/DOII1XYZZZMQYzz7ATsnHHkCjKkrSCrAG3BTlVCr8Hjs1R3pgy
+ESs9z8MSUJlfyT+kLuu7/TXPhVn/5cBeeeK+7cM2Qa81E3SlKkMbh1zvyX0id9uR
+HEJeEfUB+iJkzZtOoBkWVBUVW6H3Q+kzVYNa1Sn/95nte7Dkv2AKhMZzEwARAQAB
+tCJTdGV2ZSBMb3VnaHJhbiA8c3RldmVsQGFwYWNoZS5vcmc+iQJABBMBCgAqAhsD
+BQkHhh+ABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheABQJT9yzVAhkBAAoJEKkkVPkX
+R4a0rYQP/01K/om7x2moAj/1ya84Tq0pF0ASQ3hAMNSzPct2clzCMZrHMPQpRlBE
+be7T7ZFiAcEn2QhPt6TYsq+/8xnYRHMy+vvaBiGCvfX63Ea/CuVyN78+6Dy+GlCr
+U1J7WXLZQNo7xrL2YYkY2n0h/5pRU45qylffz18AI9kqlgFLtcstwgfKS569eNru
+ISHOdBsDU4DVchloBJeA3hta1tzCmwi/+YTE7g4AxIXzsyaU0Gch7st3SchMCOYn
+lmkHA0+BiC5OkfB37vl4E/AJc4L4jit0JtXIpiDTtinxUqPs1xjj9KLQl7PFGQdE
+CVKxYx4heOvyOHBg6pfJHB2OYfn+8OfwjHZkmtAO6xuf8pC/BxKwRc4zOA+1IPX8
+RbDrO3vrZAfvEpvUxAvo/1y/RlhHrcHNQub4hGRZKD/ty3PEE8moUIMuFcQgdqdx
+Z5278kW8NT6xZrtmDt03AAF19qSOenGBFOhDVMWmjv3F5z0zm1uzOYQFoDcwWgfJ
+fHBQbMhOCsYXRaot6464z43bxcWgig4MqCLyFBjxoX9cc2pItwiJS7Op4THQWiYH
+vMRNyyK3xalZZC9rzNSILK5/Kgkve8ikqd1Or/1LkQPSlaXvJXpwY88WmdgU1Z99
+LtxrUHNlzpoEGceADGzOmsudRmO9cuqVNWTPBCPyjciSqvutCzTZtFBTdGV2ZSBM
+b3VnaHJhbiAoc3RldmVsIDIwOTYgYml0IGtleSBmb3IgY29kZSBzaWduaW5nKSA8
+c3RldmUubG91Z2hyYW5AZ21haWwuY29tPokCPQQTAQoAJwUCU3z1qwIbAwUJB4Yf
+gAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRCpJFT5F0eGtF9OD/0X4Lk5PCCx
+knptUnlcrmuI70jkaa/Vr/UDqlT8kF5Is6bEHbqq51vuMzyVWBlHzd+wVq8AiiJo
+RJvGv9m2AmqULOQlUxycPIzXK4NSs8OqmcO8l7Kmc91wDF7p0DqlGMpb2gWToSma
+7go8xEt6LYzdQMBCGJlKH5ZzgAcDd2/y3WpiYklJM75OsM2wY467+eXizS9Tw/AI
+k7zlNZ9o7kXAcTfg/LUJB2jfjrI7ZlbSuOLYc3Npfu7Ky1Cnse7NBi1BZrwANu8P
+6IBgiGBIcVR0bIy687fHIRkRRpAemhCKATZvTgFcs1W4Ms9eJTxafKb/+smLvhyx
+zMppnx3pXq1PAflPi0WpT5m67WhGQU41HF+Uyu4gAwPjJlY+UGjAW7elsMA7OivB
+khI4ljmUk1q8qxDNVnBuBxatXa+lHezHaIptdk744Q1bF+ahyxbp38lQS4feahqp
+DB14ZFujewgZ0XN/BHXXG/S0fIZ1Fvrm63j+0KiMrZkorwQrlwd9WpPMRSsdHlgE
+yDELO1J1XhNz0rg6EVt3kCJ4oUNTgftVQci2NZDjVr7pG61UHfbcWBsAuXk0MoCc
+XIbW4K4rRrFF6S3UqDum3oWyqzyMFFnisf9O7v7PDKJUi/+ZmxQDlZhSrdtKHLTG
+13rROTHEvS94QIAPiCj62qFfB1ZfQFBGE9HaG9oZARAAAQEAAAD/
+2P/gABBKRklGAAEBAQBIAEgAAP/hALBFeGlmAABJSSoACAUAGgEFAAEAAABK
+GwEFAAEAAABSKAEDAAECMQECAAsAAABaaYcEAAEAAABm
+AEgBSAEAAABHSU1QIDIuOC40AAAFAACQBwAEMDIy
+MACgBwAEMDEwMAGgAwAB//8AAAKgBAABYAOgBAABYAAA
+AAD/4QL+aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQg
+YmVnaW49J++7vycgaWQ9J1c1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCc/Pgo8eDp4
+bXBtZXRhIHhtbG5zOng9J2Fkb2JlOm5zOm1ldGEvJz4KPHJkZjpSREYgeG1sbnM6
+cmRmPSdodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMj
+Jz4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOmV4aWY9J2h0dHA6Ly9ucy5hZG9i
+ZS5jb20vZXhpZi8xLjAvJz4KICA8ZXhpZjpYUmVzb2x1dGlvbj43MjwvZXhpZjpY
+UmVzb2x1dGlvbj4KICA8ZXhpZjpZUmVzb2x1dGlvbj43MjwvZXhpZjpZUmVzb2x1
+dGlvbj4KICA8ZXhpZjpSZXNvbHV0aW9uVW5pdD5JbmNoPC9leGlmOlJlc29sdXRp
+b25Vbml0PgogIDxleGlmOlNvZnR3YXJlPlBpY2FzYTwvZXhpZjpTb2Z0d2FyZT4K
+ICA8ZXhpZjpFeGlmVmVyc2lvbj5FeGlmIFZlcnNpb24gMi4yPC9leGlmOkV4aWZW
+ZXJzaW9uPgogIDxleGlmOkZsYXNoUGl4VmVyc2lvbj5GbGFzaFBpeCBWZXJzaW9u
+IDEuMDwvZXhpZjpGbGFzaFBpeFZlcnNpb24+CiAgPGV4aWY6Q29sb3JTcGFjZT5V
+bmNhbGlicmF0ZWQ8L2V4aWY6Q29sb3JTcGFjZT4KICA8ZXhpZjpQaXhlbFhEaW1l
+bnNpb24+MjUwPC9leGlmOlBpeGVsWERpbWVuc2lvbj4KICA8ZXhpZjpQaXhlbFlE
+aW1lbnNpb24+MjUwPC9leGlmOlBpeGVsWURpbWVuc2lvbj4KIDwvcmRmOkRlc2Ny
+aXB0aW9uPgoKPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KPD94cGFja2V0IGVuZD0n
+cic/Pgr/2wBDAAMCAgsLCwoKCAsLCgoKCgoLCgsLDQsLCwoLCgoKCgoKCgoLCgsK
+CwsKCgoKCgoKCgsKCgoNCgoLDQoKDQoICwr/2wBDAQMEBAYFBgoGBgoPDQwNDw8P
+Dw8PDw8NDw8PDw8PDQ0NDw8PDw0NDw0PDQ0NDQ8PDQ0NDQ0NDQ0NDQ0NDQ0MDQz/
+wgARCABgAGADAREAAhEBAxEB/8QAHgIDAQEABQYEBwIDCAEA
+/8QAGgEAAgMBAQECAwQFBv/aAAwDAQACEAMQAAABqGispXHV
+ssxkbh/B8Bh6YxlzEBHFFoi+pWyyM0Zgtz1k4UKMtD7HHMlES1yQMzGXTSI6ZAXw
+L8b1nidEKrd2zLY/qfJTabeT8XT2Ql0uj1OZNTGl3DoQeb0oknmmV9P5dg7HCorz
+3p4sbOiUS80vOXYc7FNc5tYHLqjqY+2tg73n2C/LRWHqaYy6ORu5VnvG0Tu1mi

Git Push Summary

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Tags:  refs/tags/release-0.50.2-incubating-rc0 [created] e4ef13666


[3/5] git commit: Merge branch 'release/slider-0.50.2'

2014-08-22 Thread stevel
Merge branch 'release/slider-0.50.2'


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/923ee653
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/923ee653
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/923ee653

Branch: refs/heads/master
Commit: 923ee6535c5b63cffac191a1b9a16f1d42ae5ea1
Parents: 610d59e bc6c710
Author: Steve Loughran 
Authored: Fri Aug 22 12:17:26 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 12:17:26 2014 +0100

--
 app-packages/accumulo/pom.xml  | 2 +-
 app-packages/command-logger/application-pkg/pom.xml| 2 +-
 app-packages/command-logger/slider-pkg/pom.xml | 2 +-
 pom.xml| 2 +-
 slider-agent/pom.xml   | 2 +-
 slider-assembly/pom.xml| 2 +-
 slider-core/pom.xml| 2 +-
 slider-funtest/pom.xml | 2 +-
 slider-providers/accumulo/accumulo-funtests/pom.xml| 2 +-
 slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
 slider-providers/hbase/hbase-funtests/pom.xml  | 2 +-
 slider-providers/hbase/slider-hbase-provider/pom.xml   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
--




[4/5] git commit: Merge branch 'release/slider-0.50.2' into develop

2014-08-22 Thread stevel
Merge branch 'release/slider-0.50.2' into develop

Conflicts:
app-packages/accumulo/pom.xml
app-packages/command-logger/application-pkg/pom.xml
app-packages/command-logger/slider-pkg/pom.xml
pom.xml
slider-agent/pom.xml
slider-assembly/pom.xml
slider-core/pom.xml
slider-funtest/pom.xml
slider-providers/accumulo/accumulo-funtests/pom.xml
slider-providers/accumulo/slider-accumulo-provider/pom.xml
slider-providers/hbase/hbase-funtests/pom.xml
slider-providers/hbase/slider-hbase-provider/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1e0d1e80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1e0d1e80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1e0d1e80

Branch: refs/heads/develop
Commit: 1e0d1e80f19d3e6a1a6e08c7936ff858965f6fae
Parents: afaa8e4 bc6c710
Author: Steve Loughran 
Authored: Fri Aug 22 12:23:58 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 12:23:58 2014 +0100

--
 app-packages/accumulo/pom.xml  | 2 +-
 app-packages/command-logger/application-pkg/pom.xml| 2 +-
 app-packages/command-logger/slider-pkg/pom.xml | 2 +-
 pom.xml| 2 +-
 slider-agent/pom.xml   | 2 +-
 slider-assembly/pom.xml| 2 +-
 slider-core/pom.xml| 2 +-
 slider-funtest/pom.xml | 2 +-
 slider-providers/accumulo/accumulo-funtests/pom.xml| 2 +-
 slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
 slider-providers/hbase/hbase-funtests/pom.xml  | 2 +-
 slider-providers/hbase/slider-hbase-provider/pom.xml   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
--




[2/5] git commit: SLIDER-349 updating release POMs for 0.50.2-incubating

2014-08-22 Thread stevel
SLIDER-349 updating release POMs for 0.50.2-incubating


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bc6c7103
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bc6c7103
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bc6c7103

Branch: refs/heads/master
Commit: bc6c7103353aea9c96656443c5dd3a292806a1b7
Parents: d8a1114
Author: Steve Loughran 
Authored: Fri Aug 22 11:56:18 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 11:56:18 2014 +0100

--
 app-packages/accumulo/pom.xml  | 2 +-
 app-packages/command-logger/application-pkg/pom.xml| 2 +-
 app-packages/command-logger/slider-pkg/pom.xml | 2 +-
 pom.xml| 2 +-
 slider-agent/pom.xml   | 2 +-
 slider-assembly/pom.xml| 2 +-
 slider-core/pom.xml| 2 +-
 slider-funtest/pom.xml | 2 +-
 slider-providers/accumulo/accumulo-funtests/pom.xml| 2 +-
 slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
 slider-providers/hbase/hbase-funtests/pom.xml  | 2 +-
 slider-providers/hbase/slider-hbase-provider/pom.xml   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/app-packages/accumulo/pom.xml
--
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 88ea222..fe71c70 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/app-packages/command-logger/application-pkg/pom.xml
--
diff --git a/app-packages/command-logger/application-pkg/pom.xml 
b/app-packages/command-logger/application-pkg/pom.xml
index 1b572b3..71e4d82 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
 ../../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/app-packages/command-logger/slider-pkg/pom.xml
--
diff --git a/app-packages/command-logger/slider-pkg/pom.xml 
b/app-packages/command-logger/slider-pkg/pom.xml
index fe485ee..bd46cbb 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
 ../../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bbc94b9..fb27aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   org.apache.slider
   slider
   Slider
-  0.50.1-incubating
+  0.50.2-incubating
   pom
 
   

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/slider-agent/pom.xml
--
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 9e4b71f..09f2dae 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
   
   4.0.0
   slider-agent

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/slider-assembly/pom.xml
--
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 6e69310..928713e 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
   
 
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/slider-core/pom.xml
--
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 4507480..b228874 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/slider-funtest/pom.xml

[1/5] git commit: SLIDER-349 updating release POMs for 0.50.2-incubating

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/develop afaa8e4da -> 4e8c6ffbb
  refs/heads/master 610d59efa -> 923ee6535


SLIDER-349 updating release POMs for 0.50.2-incubating


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bc6c7103
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bc6c7103
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bc6c7103

Branch: refs/heads/develop
Commit: bc6c7103353aea9c96656443c5dd3a292806a1b7
Parents: d8a1114
Author: Steve Loughran 
Authored: Fri Aug 22 11:56:18 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 11:56:18 2014 +0100

--
 app-packages/accumulo/pom.xml  | 2 +-
 app-packages/command-logger/application-pkg/pom.xml| 2 +-
 app-packages/command-logger/slider-pkg/pom.xml | 2 +-
 pom.xml| 2 +-
 slider-agent/pom.xml   | 2 +-
 slider-assembly/pom.xml| 2 +-
 slider-core/pom.xml| 2 +-
 slider-funtest/pom.xml | 2 +-
 slider-providers/accumulo/accumulo-funtests/pom.xml| 2 +-
 slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
 slider-providers/hbase/hbase-funtests/pom.xml  | 2 +-
 slider-providers/hbase/slider-hbase-provider/pom.xml   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/app-packages/accumulo/pom.xml
--
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 88ea222..fe71c70 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/app-packages/command-logger/application-pkg/pom.xml
--
diff --git a/app-packages/command-logger/application-pkg/pom.xml 
b/app-packages/command-logger/application-pkg/pom.xml
index 1b572b3..71e4d82 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
 ../../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/app-packages/command-logger/slider-pkg/pom.xml
--
diff --git a/app-packages/command-logger/slider-pkg/pom.xml 
b/app-packages/command-logger/slider-pkg/pom.xml
index fe485ee..bd46cbb 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
 ../../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bbc94b9..fb27aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   org.apache.slider
   slider
   Slider
-  0.50.1-incubating
+  0.50.2-incubating
   pom
 
   

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/slider-agent/pom.xml
--
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 9e4b71f..09f2dae 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
   
   4.0.0
   slider-agent

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/slider-assembly/pom.xml
--
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 6e69310..928713e 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating
   
 
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bc6c7103/slider-core/pom.xml
--
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 4507480..b228874 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.slider
 slider
-0.50.1-incubating
+0.50.2-incubating

[5/5] git commit: SLIDER-349 reverting development POMs to 0.51.0-incubating-SNAPSHOT

2014-08-22 Thread stevel
SLIDER-349 reverting development POMs to 0.51.0-incubating-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4e8c6ffb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4e8c6ffb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4e8c6ffb

Branch: refs/heads/develop
Commit: 4e8c6ffbb5a759c27b962485cb63592cfc2d87bf
Parents: 1e0d1e8
Author: Steve Loughran 
Authored: Fri Aug 22 12:27:49 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 12:30:21 2014 +0100

--
 app-packages/accumulo/pom.xml  | 2 +-
 app-packages/command-logger/application-pkg/pom.xml| 2 +-
 app-packages/command-logger/slider-pkg/pom.xml | 2 +-
 pom.xml| 2 +-
 slider-agent/pom.xml   | 2 +-
 slider-assembly/pom.xml| 2 +-
 slider-core/pom.xml| 2 +-
 slider-funtest/pom.xml | 2 +-
 slider-providers/accumulo/accumulo-funtests/pom.xml| 2 +-
 slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
 slider-providers/hbase/hbase-funtests/pom.xml  | 2 +-
 slider-providers/hbase/slider-hbase-provider/pom.xml   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4e8c6ffb/app-packages/accumulo/pom.xml
--
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index fe71c70..84be933 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.2-incubating
+0.51.0-incubating-SNAPSHOT
 ../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4e8c6ffb/app-packages/command-logger/application-pkg/pom.xml
--
diff --git a/app-packages/command-logger/application-pkg/pom.xml 
b/app-packages/command-logger/application-pkg/pom.xml
index 71e4d82..77f0fc9 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.2-incubating
+0.51.0-incubating-SNAPSHOT
 ../../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4e8c6ffb/app-packages/command-logger/slider-pkg/pom.xml
--
diff --git a/app-packages/command-logger/slider-pkg/pom.xml 
b/app-packages/command-logger/slider-pkg/pom.xml
index bd46cbb..b9bbf06 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.slider
 slider
-0.50.2-incubating
+0.51.0-incubating-SNAPSHOT
 ../../../pom.xml
   
   4.0.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4e8c6ffb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fb27aba..29c3c16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   org.apache.slider
   slider
   Slider
-  0.50.2-incubating
+  0.51.0-incubating-SNAPSHOT
   pom
 
   

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4e8c6ffb/slider-agent/pom.xml
--
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 09f2dae..f26cb11 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.slider
 slider
-0.50.2-incubating
+0.51.0-incubating-SNAPSHOT
   
   4.0.0
   slider-agent

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4e8c6ffb/slider-assembly/pom.xml
--
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 928713e..6c047e7 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.slider
 slider
-0.50.2-incubating
+0.51.0-incubating-SNAPSHOT
   
 
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4e8c6ffb/slider-core/pom.xml
--
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index b228874..cdcea38 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.slider
 slider
-0.50.2-incubating
+0.51.0-incubating-SNAPSHOT
   
 
   

http://git-wip-us.apache.org/repos/asf/incubator

[05/12] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-slider

2014-08-22 Thread stevel
Merge branch 'master' of 
https://git-wip-us.apache.org/repos/asf/incubator-slider


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/02bfb7e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/02bfb7e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/02bfb7e2

Branch: refs/heads/develop
Commit: 02bfb7e286fd1dea67e8a730929b997cbf4b1738
Parents: f76d235 035ebbd
Author: Steve Loughran 
Authored: Wed Aug 20 09:53:57 2014 +0100
Committer: Steve Loughran 
Committed: Wed Aug 20 09:53:57 2014 +0100

--

--




[06/12] git commit: Merge branch 'release/slider-0.50.1-incubating'

2014-08-22 Thread stevel
Merge branch 'release/slider-0.50.1-incubating'


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/87ad650b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/87ad650b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/87ad650b

Branch: refs/heads/develop
Commit: 87ad650bb33719a8a16903dbcd22c0d4e782dfa1
Parents: 02bfb7e 8e92a7e
Author: Steve Loughran 
Authored: Wed Aug 20 10:25:33 2014 +0100
Committer: Steve Loughran 
Committed: Wed Aug 20 10:25:33 2014 +0100

--
 app-packages/accumulo/pom.xml  | 2 +-
 app-packages/command-logger/application-pkg/pom.xml| 2 +-
 app-packages/command-logger/slider-pkg/pom.xml | 2 +-
 pom.xml| 2 +-
 slider-agent/pom.xml   | 2 +-
 slider-assembly/pom.xml| 2 +-
 slider-core/pom.xml| 2 +-
 slider-funtest/pom.xml | 2 +-
 slider-providers/accumulo/accumulo-funtests/pom.xml| 2 +-
 slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
 slider-providers/hbase/hbase-funtests/pom.xml  | 2 +-
 slider-providers/hbase/slider-hbase-provider/pom.xml   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
--




[11/12] git commit: Merge branch 'hotfix/SLIDER-349-headers'

2014-08-22 Thread stevel
Merge branch 'hotfix/SLIDER-349-headers'


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/610d59ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/610d59ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/610d59ef

Branch: refs/heads/master
Commit: 610d59efa80be32cea7dcd773364a5edf3ac8713
Parents: 87ad650 d8a1114
Author: Steve Loughran 
Authored: Fri Aug 22 11:39:09 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 11:39:09 2014 +0100

--
 app-packages/hbase/get-hbase-site.sh | 15 +++
 pom.xml  |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
--




[12/12] git commit: Merge branch 'hotfix/SLIDER-349-headers' into develop

2014-08-22 Thread stevel
Merge branch 'hotfix/SLIDER-349-headers' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/afaa8e4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/afaa8e4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/afaa8e4d

Branch: refs/heads/develop
Commit: afaa8e4da1375599b7cb41bf70fdd3bdb495647c
Parents: 644dd38 d8a1114
Author: Steve Loughran 
Authored: Fri Aug 22 11:39:09 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 11:39:09 2014 +0100

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/afaa8e4d/pom.xml
--



[09/12] git commit: SLIDER-349 ignore target/* from RAT; stops it complaining about signature and checksum files

2014-08-22 Thread stevel
SLIDER-349 ignore target/* from RAT; stops it complaining about signature and 
checksum files


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d8a11149
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d8a11149
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d8a11149

Branch: refs/heads/master
Commit: d8a11149d3e9557c1a845ef1a78e1d9f24ddebae
Parents: 305e0cb
Author: Steve Loughran 
Authored: Fri Aug 22 11:36:16 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 11:36:16 2014 +0100

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d8a11149/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 632022c..bbc94b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -345,6 +345,7 @@
 **/rat.txt
 DISCLAIMER
 app-packages/hbase/target/**
+target/*
   
 
   



[01/12] git commit: Release is built against the Apache Hadoop 2.4.0, HBase-0.98.1 and Accumulo 1.5.1 artifacts

2014-08-22 Thread stevel
Repository: incubator-slider
Updated Branches:
  refs/heads/develop 644dd38d7 -> afaa8e4da
  refs/heads/master 87ad650bb -> 610d59efa


Release is built against the Apache Hadoop 2.4.0, HBase-0.98.1 and Accumulo 
1.5.1 artifacts


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d595362e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d595362e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d595362e

Branch: refs/heads/develop
Commit: d595362e001d25f4e0ac6492280248b3f0bc26c3
Parents: a94d371 059cf03
Author: Sumit Mohanty 
Authored: Tue May 27 19:18:27 2014 -0700
Committer: Sumit Mohanty 
Committed: Tue May 27 19:18:27 2014 -0700

--
 DISCLAIMER  |  10 +
 LICENSE.TXT | 305 -
 LICENSE.txt | 423 +++
 NOTICE.txt  |   5 +
 README.md   |  62 ++-
 app-packages/accumulo-v1_5/README.txt   |  17 +
 app-packages/accumulo-v1_5/jmx_metrics.json |  41 ++
 app-packages/accumulo-v1_5/metainfo.xml |  19 +-
 app-packages/hbase-v0_96/README.txt |  23 +-
 app-packages/hbase-v0_96/appConfig.json |   3 +-
 app-packages/hbase-v0_96/ganglia_metrics.json   |  38 ++
 app-packages/hbase-v0_96/jmx_metrics.json   |  56 +++
 app-packages/hbase-v0_96/metainfo.xml   |  14 +-
 app-packages/storm-v0_91/README.txt |  33 ++
 app-packages/storm-v0_91/appConfig.json |  20 +-
 app-packages/storm-v0_91/ganglia_metrics.json   |  31 ++
 app-packages/storm-v0_91/jmx_metrics.json   |  31 ++
 app-packages/storm-v0_91/metainfo.xml   |  25 ++
 .../storm-v0_91/package/scripts/params.py   |  14 +-
 .../package/templates/config.yaml.j2|   3 +-
 pom.xml |   9 +-
 slider-agent/pom.xml|   4 +-
 .../src/main/python/agent/ActionQueue.py|   2 +
 slider-agent/src/main/python/agent/Constants.py |   3 +
 .../python/agent/CustomServiceOrchestrator.py   |   7 +
 slider-agent/src/main/python/agent/Heartbeat.py |   4 +-
 .../src/test/python/agent/TestActionQueue.py|   3 +-
 .../src/test/python/agent/TestHeartbeat.py  |   5 +-
 slider-assembly/pom.xml |   4 +-
 slider-core/pom.xml |  22 +-
 .../org/apache/slider/client/SliderClient.java  |   7 +-
 .../apache/slider/common/params/CommonArgs.java |   2 +-
 .../slider/common/tools/CoreFileSystem.java |   6 +
 .../apache/slider/common/tools/SliderUtils.java |  22 +
 .../slider/core/build/InstanceBuilder.java  |   4 +-
 .../conf/AbstractInputPropertiesValidator.java  |   4 +-
 .../core/launch/JavaCommandLineBuilder.java |  10 +
 .../slider/core/main/ServiceLauncher.java   |   2 +-
 .../core/registry/info/ServiceInstanceData.java |  51 ++-
 .../core/registry/zk/BlockingZKWatcher.java |  63 ---
 .../slider/core/registry/zk/ZKCallback.java |  31 --
 .../slider/core/registry/zk/ZKIntegration.java  | 280 
 .../slider/core/registry/zk/ZKPathBuilder.java  |  82 
 .../slider/core/registry/zk/ZookeeperUtils.java | 136 --
 .../slider/core/zk/BlockingZKWatcher.java   |  63 +++
 .../slider/core/zk/MiniZooKeeperCluster.java| 423 +++
 .../org/apache/slider/core/zk/ZKCallback.java   |  31 ++
 .../apache/slider/core/zk/ZKIntegration.java| 280 
 .../apache/slider/core/zk/ZKPathBuilder.java|  82 
 .../apache/slider/core/zk/ZookeeperUtils.java   | 134 ++
 .../providers/AbstractClientProvider.java   |   1 -
 .../providers/AbstractProviderService.java  |   4 +-
 .../apache/slider/providers/ProviderRole.java   |   5 +-
 .../slider/providers/ProviderService.java   |   1 -
 .../apache/slider/providers/ProviderUtils.java  |   6 +-
 .../slider/providers/SliderProviderFactory.java |   4 -
 .../providers/agent/AgentClientProvider.java|   2 +-
 .../providers/agent/AgentProviderService.java   |  73 +++-
 .../providers/agent/ComponentCommandOrder.java  |  21 +-
 .../agent/application/metadata/Component.java   |  28 ++
 .../application/metadata/MetainfoParser.java|   3 +
 .../slideram/SliderAMClientProvider.java|  23 +-
 .../server/appmaster/SliderAppMaster.java   |  13 +-
 .../appmaster/web/rest/agent/CommandReport.java |  17 +-
 .../appmaster/web/rest/agent/HeartBeat.java |  17 +-
 .../web/rest/publisher/PublisherResource.java   |   2 +-
 .../services/curator/RegistryBinderService.java |  29 +-
 .../registry/RegistryViewForProviders.java  |   9 +-
 .../registry/SliderRegistryService.java |  21 +-
 .../utility/AbstractSliderLaunchedService.java  |   2 +-
 .../standalone/TestStandalon

[08/12] git commit: SLIDER-331 add license to get-hbase-site.xml

2014-08-22 Thread stevel
SLIDER-331 add license to get-hbase-site.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/305e0cb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/305e0cb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/305e0cb6

Branch: refs/heads/develop
Commit: 305e0cb612c69109a4622ab35b5e2ed49d2028c9
Parents: 87ad650
Author: Billie Rinaldi 
Authored: Thu Aug 21 06:15:40 2014 -0700
Committer: Steve Loughran 
Committed: Fri Aug 22 11:32:37 2014 +0100

--
 app-packages/hbase/get-hbase-site.sh | 15 +++
 pom.xml  |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/305e0cb6/app-packages/hbase/get-hbase-site.sh
--
diff --git a/app-packages/hbase/get-hbase-site.sh 
b/app-packages/hbase/get-hbase-site.sh
index 5211d83..0ece42a 100755
--- a/app-packages/hbase/get-hbase-site.sh
+++ b/app-packages/hbase/get-hbase-site.sh
@@ -1,3 +1,18 @@
+# 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.
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 #
 tuple=`slider status $1 | grep "info.am.web.url"`

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/305e0cb6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cdb8766..632022c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,7 +343,6 @@
 **/dfs.exclude
 **/*.iml
 **/rat.txt
-**/get-hbase-site.sh
 DISCLAIMER
 app-packages/hbase/target/**
   



[10/12] git commit: SLIDER-349 ignore target/* from RAT; stops it complaining about signature and checksum files

2014-08-22 Thread stevel
SLIDER-349 ignore target/* from RAT; stops it complaining about signature and 
checksum files


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d8a11149
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d8a11149
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d8a11149

Branch: refs/heads/develop
Commit: d8a11149d3e9557c1a845ef1a78e1d9f24ddebae
Parents: 305e0cb
Author: Steve Loughran 
Authored: Fri Aug 22 11:36:16 2014 +0100
Committer: Steve Loughran 
Committed: Fri Aug 22 11:36:16 2014 +0100

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d8a11149/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 632022c..bbc94b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -345,6 +345,7 @@
 **/rat.txt
 DISCLAIMER
 app-packages/hbase/target/**
+target/*
   
 
   



[02/12] git commit: Merge branch 'release/slider-0.40'

2014-08-22 Thread stevel
Merge branch 'release/slider-0.40'


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ddf73387
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ddf73387
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ddf73387

Branch: refs/heads/develop
Commit: ddf7338759480fd29bae5fb72d1105c0a3e8647d
Parents: d595362 e09a6a8
Author: Sumit Mohanty 
Authored: Thu Jul 10 21:14:14 2014 -0700
Committer: Sumit Mohanty 
Committed: Thu Jul 10 21:14:14 2014 -0700

--
 .gitignore  |10 +-
 LICENSE |   423 +
 LICENSE.txt |   423 -
 NOTICE  | 5 +
 NOTICE.txt  | 5 -
 app-packages/accumulo-v1_5/README.txt   |33 -
 app-packages/accumulo-v1_5/appConfig.json   |61 -
 .../configuration/accumulo-site.xml |   111 -
 .../accumulo-v1_5/configuration/global.xml  |94 -
 app-packages/accumulo-v1_5/jmx_metrics.json |41 -
 app-packages/accumulo-v1_5/metainfo.xml |   145 -
 .../files/accumulo-1.5.1-bin.tar.gz.REPLACE |14 -
 .../package/files/accumulo-metrics.xml  |60 -
 .../accumulo-v1_5/package/files/auditLog.xml|41 -
 app-packages/accumulo-v1_5/package/files/gc |16 -
 .../package/files/generic_logger.xml|83 -
 .../package/files/log4j.properties  |41 -
 .../accumulo-v1_5/package/files/masters |16 -
 .../accumulo-v1_5/package/files/monitor |16 -
 .../package/files/monitor_logger.xml|64 -
 app-packages/accumulo-v1_5/package/files/slaves |16 -
 .../accumulo-v1_5/package/files/tracers |16 -
 .../accumulo-v1_5/package/scripts/__init__.py   |19 -
 .../package/scripts/accumulo_client.py  |43 -
 .../package/scripts/accumulo_configuration.py   |   126 -
 .../package/scripts/accumulo_gc.py  |24 -
 .../package/scripts/accumulo_master.py  |24 -
 .../package/scripts/accumulo_monitor.py |24 -
 .../package/scripts/accumulo_script.py  |68 -
 .../package/scripts/accumulo_service.py |52 -
 .../package/scripts/accumulo_tracer.py  |24 -
 .../package/scripts/accumulo_tserver.py |24 -
 .../accumulo-v1_5/package/scripts/params.py |62 -
 .../package/scripts/status_params.py|26 -
 .../package/templates/accumulo-env.sh.j2|42 -
 app-packages/accumulo-v1_5/resources.json   |31 -
 app-packages/accumulo/LICENSE.txt   |   261 +
 app-packages/accumulo/NOTICE.txt| 8 +
 app-packages/accumulo/README.txt|47 +
 app-packages/accumulo/appConfig.json|61 +
 .../accumulo/configuration/accumulo-site.xml|   111 +
 app-packages/accumulo/configuration/global.xml  |94 +
 app-packages/accumulo/jmx_metrics.json  |41 +
 app-packages/accumulo/metainfo.xml  |   147 +
 .../accumulo/package/files/accumulo-metrics.xml |60 +
 .../accumulo/package/files/auditLog.xml |41 +
 app-packages/accumulo/package/files/gc  |16 +
 .../accumulo/package/files/generic_logger.xml   |83 +
 .../accumulo/package/files/log4j.properties |41 +
 app-packages/accumulo/package/files/masters |16 +
 app-packages/accumulo/package/files/monitor |16 +
 .../accumulo/package/files/monitor_logger.xml   |64 +
 app-packages/accumulo/package/files/slaves  |16 +
 app-packages/accumulo/package/files/tracers |16 +
 .../accumulo/package/scripts/__init__.py|19 +
 .../accumulo/package/scripts/accumulo_client.py |43 +
 .../package/scripts/accumulo_configuration.py   |   135 +
 .../accumulo/package/scripts/accumulo_gc.py |24 +
 .../accumulo/package/scripts/accumulo_master.py |24 +
 .../package/scripts/accumulo_monitor.py |24 +
 .../accumulo/package/scripts/accumulo_script.py |   110 +
 .../package/scripts/accumulo_service.py |52 +
 .../accumulo/package/scripts/accumulo_tracer.py |24 +
 .../package/scripts/accumulo_tserver.py |24 +
 app-packages/accumulo/package/scripts/params.py |76 +
 .../accumulo/package/scripts/status_params.py   |26 +
 .../package/templates/accumulo-env.sh.j2|42 +
 app-packages/accumulo/pom.xml   |   198 +
 app-packages/accumulo/resources.json|36 +
 app-packages/accumulo/src/assembly/accumulo.xml |72 +
 .../AccumuloAgentCommandTestBase.groovy |52 +
 .../funtest/accumulo/AccumuloBasicIT.groovy |   117 +
 .../accumulo/AccumuloMonitorSSLIT.groovy|73 +
 .../funtest/accumulo/AccumuloReadWriteIT.groo

[07/12] git commit: SLIDER-331 add license to get-hbase-site.xml

2014-08-22 Thread stevel
SLIDER-331 add license to get-hbase-site.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/305e0cb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/305e0cb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/305e0cb6

Branch: refs/heads/master
Commit: 305e0cb612c69109a4622ab35b5e2ed49d2028c9
Parents: 87ad650
Author: Billie Rinaldi 
Authored: Thu Aug 21 06:15:40 2014 -0700
Committer: Steve Loughran 
Committed: Fri Aug 22 11:32:37 2014 +0100

--
 app-packages/hbase/get-hbase-site.sh | 15 +++
 pom.xml  |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/305e0cb6/app-packages/hbase/get-hbase-site.sh
--
diff --git a/app-packages/hbase/get-hbase-site.sh 
b/app-packages/hbase/get-hbase-site.sh
index 5211d83..0ece42a 100755
--- a/app-packages/hbase/get-hbase-site.sh
+++ b/app-packages/hbase/get-hbase-site.sh
@@ -1,3 +1,18 @@
+# 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.
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 #
 tuple=`slider status $1 | grep "info.am.web.url"`

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/305e0cb6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cdb8766..632022c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,7 +343,6 @@
 **/dfs.exclude
 **/*.iml
 **/rat.txt
-**/get-hbase-site.sh
 DISCLAIMER
 app-packages/hbase/target/**
   



[03/12] git commit: SLIDER-251 Upgrade hbase dependency to 0.98.4

2014-08-22 Thread stevel
SLIDER-251 Upgrade hbase dependency to 0.98.4


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/035ebbd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/035ebbd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/035ebbd0

Branch: refs/heads/develop
Commit: 035ebbd01f6aec33f8360983158b83a04b473c14
Parents: ddf7338
Author: tedyu 
Authored: Tue Jul 22 14:59:28 2014 -0800
Committer: tedyu 
Committed: Tue Jul 22 14:59:28 2014 -0800

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/035ebbd0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a9a90ab..496951a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
 -->
 2.4.0
 
-0.98.3-hadoop2
+0.98.4-hadoop2
 1.6.0
 
 

[04/12] git commit: SLIDER-329: release slider-0.5.0

2014-08-22 Thread stevel
SLIDER-329: release slider-0.5.0


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f76d2350
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f76d2350
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f76d2350

Branch: refs/heads/develop
Commit: f76d2350f828d933a996f6c31328dada008b5af6
Parents: a94d371 444f83d
Author: Steve Loughran 
Authored: Wed Aug 20 09:47:37 2014 +0100
Committer: Steve Loughran 
Committed: Wed Aug 20 09:47:37 2014 +0100

--
 .gitignore  |10 +-
 DISCLAIMER  |10 +
 LICENSE |   423 +
 LICENSE.TXT |   305 -
 NOTICE  | 5 +
 README.md   |62 +-
 app-packages/accumulo-v1_5/README.txt   |16 -
 app-packages/accumulo-v1_5/appConfig.json   |61 -
 .../configuration/accumulo-site.xml |   111 -
 .../accumulo-v1_5/configuration/global.xml  |94 -
 app-packages/accumulo-v1_5/metainfo.xml |   130 -
 .../files/accumulo-1.5.1-bin.tar.gz.REPLACE |14 -
 .../package/files/accumulo-metrics.xml  |60 -
 .../accumulo-v1_5/package/files/auditLog.xml|41 -
 app-packages/accumulo-v1_5/package/files/gc |16 -
 .../package/files/generic_logger.xml|83 -
 .../package/files/log4j.properties  |41 -
 .../accumulo-v1_5/package/files/masters |16 -
 .../accumulo-v1_5/package/files/monitor |16 -
 .../package/files/monitor_logger.xml|64 -
 app-packages/accumulo-v1_5/package/files/slaves |16 -
 .../accumulo-v1_5/package/files/tracers |16 -
 .../accumulo-v1_5/package/scripts/__init__.py   |19 -
 .../package/scripts/accumulo_client.py  |43 -
 .../package/scripts/accumulo_configuration.py   |   126 -
 .../package/scripts/accumulo_gc.py  |24 -
 .../package/scripts/accumulo_master.py  |24 -
 .../package/scripts/accumulo_monitor.py |24 -
 .../package/scripts/accumulo_script.py  |68 -
 .../package/scripts/accumulo_service.py |52 -
 .../package/scripts/accumulo_tracer.py  |24 -
 .../package/scripts/accumulo_tserver.py |24 -
 .../accumulo-v1_5/package/scripts/params.py |62 -
 .../package/scripts/status_params.py|26 -
 .../package/templates/accumulo-env.sh.j2|42 -
 app-packages/accumulo-v1_5/resources.json   |31 -
 app-packages/accumulo/LICENSE.txt   |   261 +
 app-packages/accumulo/NOTICE.txt| 8 +
 app-packages/accumulo/README.txt|47 +
 app-packages/accumulo/appConfig.json|61 +
 .../accumulo/configuration/accumulo-site.xml|   111 +
 app-packages/accumulo/configuration/global.xml  |94 +
 app-packages/accumulo/jmx_metrics.json  |41 +
 app-packages/accumulo/metainfo.xml  |   148 +
 .../accumulo/package/files/accumulo-metrics.xml |60 +
 .../accumulo/package/files/auditLog.xml |41 +
 app-packages/accumulo/package/files/gc  |16 +
 .../accumulo/package/files/generic_logger.xml   |83 +
 .../accumulo/package/files/log4j.properties |41 +
 app-packages/accumulo/package/files/masters |16 +
 app-packages/accumulo/package/files/monitor |16 +
 .../accumulo/package/files/monitor_logger.xml   |64 +
 app-packages/accumulo/package/files/slaves  |16 +
 app-packages/accumulo/package/files/tracers |16 +
 .../accumulo/package/scripts/__init__.py|19 +
 .../accumulo/package/scripts/accumulo_client.py |43 +
 .../package/scripts/accumulo_configuration.py   |   135 +
 .../accumulo/package/scripts/accumulo_gc.py |24 +
 .../accumulo/package/scripts/accumulo_master.py |24 +
 .../package/scripts/accumulo_monitor.py |24 +
 .../accumulo/package/scripts/accumulo_script.py |   110 +
 .../package/scripts/accumulo_service.py |52 +
 .../accumulo/package/scripts/accumulo_tracer.py |24 +
 .../package/scripts/accumulo_tserver.py |24 +
 app-packages/accumulo/package/scripts/params.py |76 +
 .../accumulo/package/scripts/status_params.py   |26 +
 .../package/templates/accumulo-env.sh.j2|42 +
 app-packages/accumulo/pom.xml   |   193 +
 app-packages/accumulo/resources.json|36 +
 app-packages/accumulo/src/assembly/accumulo.xml |72 +
 .../AccumuloAgentCommandTestBase.groovy |52 +
 .../funtest/accumulo/AccumuloBasicIT.groovy |   117 +
 .../accumulo/AccumuloMonitorSSLIT.groovy|73 +
 .../funtest/accumulo/AccumuloReadWriteIT.gro