Repository: ambari Updated Branches: refs/heads/trunk a964003c7 -> 5ad79b964
Revert "AMBARI-9274. Slider View: View dependency on Slider should be through external repository (srimanth)" This reverts commit ae49f7c9664178560428af227e769bcf63421d38. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ad79b96 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ad79b96 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ad79b96 Branch: refs/heads/trunk Commit: 5ad79b9644f90c38efafd0b9084a9c22221bc82e Parents: a964003 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Thu Jan 22 20:05:40 2015 -0800 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Thu Jan 22 20:05:40 2015 -0800 ---------------------------------------------------------------------- .../slider-agent/0.60.0/slider-agent-0.60.0.pom | 25 ++ .../0.60.0/slider-agent-0.60.0.tar.gz | Bin 0 -> 471063 bytes .../slider-agent/maven-metadata-local.xml | 28 ++ .../slider-core/0.60.0/slider-core-0.60.0.jar | Bin 0 -> 1203741 bytes .../slider-core/0.60.0/slider-core-0.60.0.pom | 25 ++ .../slider/slider-core/maven-metadata-local.xml | 28 ++ contrib/views/slider/pom.xml | 330 ++++++++++++++++++- .../slider/SliderAppsViewControllerImpl.java | 17 +- 8 files changed, 434 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5ad79b96/contrib/views/slider/lib/org/apache/slider/slider-agent/0.60.0/slider-agent-0.60.0.pom ---------------------------------------------------------------------- diff --git a/contrib/views/slider/lib/org/apache/slider/slider-agent/0.60.0/slider-agent-0.60.0.pom b/contrib/views/slider/lib/org/apache/slider/slider-agent/0.60.0/slider-agent-0.60.0.pom new file mode 100644 index 0000000..0b1b9f5 --- /dev/null +++ b/contrib/views/slider/lib/org/apache/slider/slider-agent/0.60.0/slider-agent-0.60.0.pom @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.slider</groupId> + <artifactId>slider-agent</artifactId> + <version>0.60.0</version> + <description>POM was created from install:install-file</description> +</project> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ad79b96/contrib/views/slider/lib/org/apache/slider/slider-agent/0.60.0/slider-agent-0.60.0.tar.gz ---------------------------------------------------------------------- diff --git a/contrib/views/slider/lib/org/apache/slider/slider-agent/0.60.0/slider-agent-0.60.0.tar.gz b/contrib/views/slider/lib/org/apache/slider/slider-agent/0.60.0/slider-agent-0.60.0.tar.gz new file mode 100644 index 0000000..0ddef92 Binary files /dev/null and b/contrib/views/slider/lib/org/apache/slider/slider-agent/0.60.0/slider-agent-0.60.0.tar.gz differ http://git-wip-us.apache.org/repos/asf/ambari/blob/5ad79b96/contrib/views/slider/lib/org/apache/slider/slider-agent/maven-metadata-local.xml ---------------------------------------------------------------------- diff --git a/contrib/views/slider/lib/org/apache/slider/slider-agent/maven-metadata-local.xml b/contrib/views/slider/lib/org/apache/slider/slider-agent/maven-metadata-local.xml new file mode 100644 index 0000000..34bf9d6 --- /dev/null +++ b/contrib/views/slider/lib/org/apache/slider/slider-agent/maven-metadata-local.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<metadata> + <groupId>org.apache.slider</groupId> + <artifactId>slider-agent</artifactId> + <versioning> + <release>0.60.0</release> + <versions> + <version>0.60.0</version> + </versions> + <lastUpdated>20141111220614</lastUpdated> + </versioning> +</metadata> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ad79b96/contrib/views/slider/lib/org/apache/slider/slider-core/0.60.0/slider-core-0.60.0.jar ---------------------------------------------------------------------- diff --git a/contrib/views/slider/lib/org/apache/slider/slider-core/0.60.0/slider-core-0.60.0.jar b/contrib/views/slider/lib/org/apache/slider/slider-core/0.60.0/slider-core-0.60.0.jar new file mode 100644 index 0000000..08a770b Binary files /dev/null and b/contrib/views/slider/lib/org/apache/slider/slider-core/0.60.0/slider-core-0.60.0.jar differ http://git-wip-us.apache.org/repos/asf/ambari/blob/5ad79b96/contrib/views/slider/lib/org/apache/slider/slider-core/0.60.0/slider-core-0.60.0.pom ---------------------------------------------------------------------- diff --git a/contrib/views/slider/lib/org/apache/slider/slider-core/0.60.0/slider-core-0.60.0.pom b/contrib/views/slider/lib/org/apache/slider/slider-core/0.60.0/slider-core-0.60.0.pom new file mode 100644 index 0000000..b1dc8e5 --- /dev/null +++ b/contrib/views/slider/lib/org/apache/slider/slider-core/0.60.0/slider-core-0.60.0.pom @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.slider</groupId> + <artifactId>slider-core</artifactId> + <version>0.60.0</version> + <description>POM was created from install:install-file</description> +</project> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ad79b96/contrib/views/slider/lib/org/apache/slider/slider-core/maven-metadata-local.xml ---------------------------------------------------------------------- diff --git a/contrib/views/slider/lib/org/apache/slider/slider-core/maven-metadata-local.xml b/contrib/views/slider/lib/org/apache/slider/slider-core/maven-metadata-local.xml new file mode 100644 index 0000000..cc9dacb --- /dev/null +++ b/contrib/views/slider/lib/org/apache/slider/slider-core/maven-metadata-local.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<metadata> + <groupId>org.apache.slider</groupId> + <artifactId>slider-core</artifactId> + <versioning> + <release>0.60.0</release> + <versions> + <version>0.60.0</version> + </versions> + <lastUpdated>20141111220202</lastUpdated> + </versioning> +</metadata> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ad79b96/contrib/views/slider/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml index 71025d4..ff7976e 100644 --- a/contrib/views/slider/pom.xml +++ b/contrib/views/slider/pom.xml @@ -24,6 +24,36 @@ <dependencies> <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-xc</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> <groupId>org.apache.slider</groupId> <artifactId>slider-core</artifactId> <version>${slider.version}</version> @@ -45,6 +75,253 @@ <scope>test</scope> </dependency> <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>${guice.version}</version> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-servlet</artifactId> + <version>${guice.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-core</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-grizzly2</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.ambari</groupId> + <artifactId>ambari-views</artifactId> + <version>${ambari.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + + <!-- ==================================================================== --> + <!-- Slider Dependencies (to be removed when Slider has Maven repository) --> + <!-- ==================================================================== --> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-x-discovery</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-x-discovery-server</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.version}</version> + <exclusions> + <exclusion> + <groupId>org.junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${hadoop.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-grizzly2</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-common</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-grizzly2</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-client</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey.jersey-test-framework</groupId> + <artifactId>jersey-test-framework-grizzly2</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-registry</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-common</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-web-proxy</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client</artifactId> + <version>${hadoop.version}</version> + <type>pom</type> + <exclusions> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>${avro.version}</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <artifactId>paranamer-ant</artifactId> + <groupId>com.thoughtworks.paranamer</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.bigtop.itest</groupId> + <artifactId>itest-common</artifactId> + <version>${bigtop.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <version>${commons-configuration.version}</version> @@ -78,23 +355,48 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.ambari</groupId> - <artifactId>ambari-views</artifactId> - <scope>provided</scope> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + <version>${jcommander.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + </exclusions> </dependency> + <!-- ======================================================== --> + <!-- Jetty --> + <!-- ======================================================== --> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>${commons-compress.version}</version> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> </dependency> <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-sslengine</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>${metrics.version}</version> </dependency> </dependencies> <repositories> <repository> + <id>SliderAppsLibsRepo</id> + <name>SliderAppsLibsRepo</name> + <url>file://${project.basedir}/lib</url> + </repository> + <repository> <id>ASF Staging</id> <url>https://repository.apache.org/content/groups/staging/</url> </repository> @@ -114,13 +416,21 @@ <nodejs.directory>${basedir}/target/nodejs</nodejs.directory> <npm.version>1.4.3</npm.version> <ui.directory>${basedir}/src/main/resources/ui</ui.directory> + <hadoop.version>2.6.0-SNAPSHOT</hadoop.version> + <avro.version>1.7.4</avro.version> + <bigtop.version>0.7.0</bigtop.version> <commons-configuration.version>1.6</commons-configuration.version> <commons-lang.version>2.6</commons-lang.version> - <commons-compress.version>1.9</commons-compress.version> <httpclient.version>4.2.5</httpclient.version> - <slider.version>0.61.0-SNAPSHOT</slider.version> + <jcommander.version>1.30</jcommander.version> + <curator.version>2.4.1</curator.version> + <zookeeper.version>3.4.5</zookeeper.version> + <jetty.version>6.1.26</jetty.version> + <metrics.version>3.0.1</metrics.version> + <slider.version>0.60.0</slider.version> <guice.version>3.0</guice.version> <jackson.version>1.9.13</jackson.version> + <gson.version>2.2.2</gson.version> <jersey.version>1.9</jersey.version> </properties> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ad79b96/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 f2b8b6c..ebd21d8 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 @@ -35,7 +35,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.regex.Pattern; -import java.util.zip.ZipEntry; import java.util.zip.ZipException; import org.apache.ambari.view.ViewContext; @@ -49,8 +48,6 @@ import org.apache.ambari.view.slider.rest.client.AmbariHttpClient; import org.apache.ambari.view.slider.rest.client.Metric; import org.apache.ambari.view.slider.rest.client.SliderAppMasterClient; import org.apache.ambari.view.slider.rest.client.SliderAppMasterClient.SliderAppMasterData; -import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; -import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.io.IOUtils; import org.apache.commons.io.filefilter.RegexFileFilter; import org.apache.hadoop.conf.Configuration; @@ -81,6 +78,8 @@ 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.tools.zip.ZipEntry; +import org.apache.tools.zip.ZipFile; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; @@ -1025,13 +1024,13 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController { // Create app type object if (metainfo.getApplication() != null) { Application application = metainfo.getApplication(); - ZipArchiveEntry appConfigZipEntry = zipFile.getEntry("appConfig-default.json"); - ZipArchiveEntry appConfigSecuredZipEntry = zipFile.getEntry("appConfig-secured-default.json"); + ZipEntry appConfigZipEntry = zipFile.getEntry("appConfig-default.json"); + ZipEntry appConfigSecuredZipEntry = zipFile.getEntry("appConfig-secured-default.json"); if (appConfigZipEntry == null) { throw new IllegalStateException("Slider App package '" + appZip.getName() + "' does not contain 'appConfig-default.json' file"); } - ZipArchiveEntry resourcesZipEntry = zipFile.getEntry("resources-default.json"); - ZipArchiveEntry resourcesSecuredZipEntry = zipFile.getEntry("resources-secured-default.json"); + ZipEntry resourcesZipEntry = zipFile.getEntry("resources-default.json"); + ZipEntry resourcesSecuredZipEntry = zipFile.getEntry("resources-secured-default.json"); if (resourcesZipEntry == null) { throw new IllegalStateException("Slider App package '" + appZip.getName() + "' does not contain 'resources-default.json' file"); } @@ -1103,13 +1102,13 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController { return appTypes; } - private JsonObject parseAppTypeResources(ZipFile zipFile, ZipArchiveEntry resourcesZipEntry) throws ZipException, IOException { + private JsonObject parseAppTypeResources(ZipFile zipFile, ZipEntry resourcesZipEntry) throws ZipException, IOException { String resourcesJsonString = IOUtils.toString(zipFile.getInputStream(resourcesZipEntry), "UTF-8"); JsonElement resourcesJson = new JsonParser().parse(resourcesJsonString); return resourcesJson.getAsJsonObject().get("components").getAsJsonObject(); } - private Map<String, String> parseAppTypeConfigs(ZipFile zipFile, ZipArchiveEntry appConfigZipEntry, String zipFileName, String appName) throws IOException, + private Map<String, String> parseAppTypeConfigs(ZipFile zipFile, ZipEntry appConfigZipEntry, String zipFileName, String appName) throws IOException, ZipException { String appConfigJsonString = IOUtils.toString(zipFile.getInputStream(appConfigZipEntry), "UTF-8"); JsonElement appConfigJson = new JsonParser().parse(appConfigJsonString);