AMBARI-6960. Update Slider client JAR embedded in Slider Apps View (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/20519ec8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/20519ec8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/20519ec8 Branch: refs/heads/branch-alerts-dev Commit: 20519ec8578a816c7c395432299f17b2caab922f Parents: 664d53c Author: Srimanth Gunturi <[email protected]> Authored: Wed Aug 20 13:32:35 2014 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Wed Aug 20 15:56:19 2014 -0700 ---------------------------------------------------------------------- .../slider/slider/0.30.0/slider-0.30.0.jar | Bin 1036988 -> 1125710 bytes .../slider/slider/maven-metadata-local.xml | 2 +- .../slider/SliderAppsViewControllerImpl.java | 62 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/20519ec8/contrib/views/slider/lib/org/apache/slider/slider/0.30.0/slider-0.30.0.jar ---------------------------------------------------------------------- diff --git a/contrib/views/slider/lib/org/apache/slider/slider/0.30.0/slider-0.30.0.jar b/contrib/views/slider/lib/org/apache/slider/slider/0.30.0/slider-0.30.0.jar index 4bd5833..a6e9063 100644 Binary files a/contrib/views/slider/lib/org/apache/slider/slider/0.30.0/slider-0.30.0.jar and b/contrib/views/slider/lib/org/apache/slider/slider/0.30.0/slider-0.30.0.jar differ http://git-wip-us.apache.org/repos/asf/ambari/blob/20519ec8/contrib/views/slider/lib/org/apache/slider/slider/maven-metadata-local.xml ---------------------------------------------------------------------- diff --git a/contrib/views/slider/lib/org/apache/slider/slider/maven-metadata-local.xml b/contrib/views/slider/lib/org/apache/slider/slider/maven-metadata-local.xml index faf7bb8..1deb601 100644 --- a/contrib/views/slider/lib/org/apache/slider/slider/maven-metadata-local.xml +++ b/contrib/views/slider/lib/org/apache/slider/slider/maven-metadata-local.xml @@ -23,6 +23,6 @@ <versions> <version>0.30.0</version> </versions> - <lastUpdated>20140515192533</lastUpdated> + <lastUpdated>20140820192533</lastUpdated> </versioning> </metadata> http://git-wip-us.apache.org/repos/asf/ambari/blob/20519ec8/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java index 0a3282f..deb6b70 100644 --- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java +++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java @@ -18,13 +18,22 @@ package org.apache.ambari.view.slider; -import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.inject.Inject; -import com.google.inject.Singleton; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.security.PrivilegedExceptionAction; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.zip.ZipException; + import org.apache.ambari.view.ViewContext; import org.apache.ambari.view.slider.clients.AmbariClient; import org.apache.ambari.view.slider.clients.AmbariCluster; @@ -58,29 +67,21 @@ import org.apache.slider.common.params.ActionThawArgs; import org.apache.slider.common.tools.SliderFileSystem; import org.apache.slider.core.exceptions.UnknownApplicationInstanceException; import org.apache.slider.core.main.LauncherExitCodes; +import org.apache.slider.providers.agent.application.metadata.Application; import org.apache.slider.providers.agent.application.metadata.Component; import org.apache.slider.providers.agent.application.metadata.Metainfo; import org.apache.slider.providers.agent.application.metadata.MetainfoParser; -import org.apache.slider.providers.agent.application.metadata.Service; import org.apache.tools.zip.ZipFile; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.security.PrivilegedExceptionAction; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.zip.ZipException; +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.google.inject.Inject; +import com.google.inject.Singleton; @Singleton public class SliderAppsViewControllerImpl implements SliderAppsViewController { @@ -595,9 +596,8 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController { Metainfo metainfo = new MetainfoParser().parse(zipFile .getInputStream(zipFile.getEntry("metainfo.xml"))); // Create app type object - if (metainfo.getServices() != null - && metainfo.getServices().size() > 0) { - Service service = metainfo.getServices().get(0); + if (metainfo.getApplication() != null) { + Application application = metainfo.getApplication(); String appConfigJsonString = IOUtils.toString( zipFile.getInputStream(zipFile.getEntry("appConfig.json")), "UTF-8"); @@ -609,10 +609,10 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController { JsonElement resourcesJson = new JsonParser() .parse(resourcesJsonString); SliderAppType appType = new SliderAppType(); - appType.setId(service.getName()); - appType.setTypeName(service.getName()); - appType.setTypeDescription(service.getComment()); - appType.setTypeVersion(service.getVersion()); + appType.setId(application.getName()); + appType.setTypeName(application.getName()); + appType.setTypeDescription(application.getComment()); + appType.setTypeVersion(application.getVersion()); appType.setTypePackageFileName(appZip.getName()); // Configs Map<String, String> configsMap = new HashMap<String, String>(); @@ -624,7 +624,7 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController { appType.setTypeConfigs(configsMap); // Components ArrayList<SliderAppTypeComponent> appTypeComponentList = new ArrayList<SliderAppTypeComponent>(); - for (Component component : service.getComponents()) { + for (Component component : application.getComponents()) { if ("CLIENT".equals(component.getCategory())) { continue; }
