You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rk...@apache.org on 2016/12/02 09:25:11 UTC
[2/2] ambari git commit: AMBARI-18975 Remove Zeppelin View from
Ambari (r-kamath)
AMBARI-18975 Remove Zeppelin View from Ambari (r-kamath)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2dc7538
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2dc7538
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2dc7538
Branch: refs/heads/trunk
Commit: c2dc7538b65ab9f045010b7964ba00551b0ea099
Parents: 73d372b
Author: Renjith Kamath <re...@gmail.com>
Authored: Fri Dec 2 14:39:28 2016 +0530
Committer: Renjith Kamath <re...@gmail.com>
Committed: Fri Dec 2 14:52:51 2016 +0530
----------------------------------------------------------------------
.../server/upgrade/UpgradeCatalog250.java | 6 +
.../server/upgrade/UpgradeCatalog250Test.java | 17 +-
contrib/views/pom.xml | 1 -
contrib/views/zeppelin/pom.xml | 190 -------------------
.../view/zeppelin/ZeppelinServiceCheck.java | 55 ------
.../ambari/view/zeppelin/ZeppelinServlet.java | 113 -----------
.../zeppelin/src/main/resources/WEB-INF/web.xml | 40 ----
.../src/main/resources/view.log4j.properties | 27 ---
.../views/zeppelin/src/main/resources/view.xml | 48 -----
9 files changed, 17 insertions(+), 480 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index 3b2cdd3..837f340 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -136,6 +136,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog {
updateAMSConfigs();
updateKafkaConfigs();
updateHiveLlapConfigs();
+ updateTablesForZeppelinViewRemoval();
}
protected void updateHostVersionTable() throws SQLException {
@@ -227,6 +228,11 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog {
}
}
+ protected void updateTablesForZeppelinViewRemoval() throws SQLException {
+ dbAccessor.executeQuery("DELETE from viewinstance WHERE view_name='ZEPPELIN{1.0.0}'", true);
+ dbAccessor.executeQuery("DELETE from viewmain WHERE view_name='ZEPPELIN{1.0.0}'", true);
+ dbAccessor.executeQuery("DELETE from viewparameter WHERE view_name='ZEPPELIN{1.0.0}'", true);
+ }
protected String updateAmsEnvContent(String content) {
if (content == null) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
index 978e2dc..0b2b32d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
@@ -210,16 +210,18 @@ public class UpgradeCatalog250Test {
@Test
public void testExecuteDMLUpdates() throws Exception {
Method updateAmsConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateAMSConfigs");
- Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml");
Method updateKafkaConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateKafkaConfigs");
Method updateHiveLlapConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateHiveLlapConfigs");
+ Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml");
+ Method updateTablesForZeppelinViewRemoval = UpgradeCatalog250.class.getDeclaredMethod("updateTablesForZeppelinViewRemoval");
UpgradeCatalog250 upgradeCatalog250 = createMockBuilder(UpgradeCatalog250.class)
- .addMockedMethod(updateAmsConfigs)
- .addMockedMethod(addNewConfigurationsFromXml)
- .addMockedMethod(updateKafkaConfigs)
- .addMockedMethod(updateHiveLlapConfigs)
- .createMock();
+ .addMockedMethod(updateAmsConfigs)
+ .addMockedMethod(updateKafkaConfigs)
+ .addMockedMethod(updateHiveLlapConfigs)
+ .addMockedMethod(addNewConfigurationsFromXml)
+ .addMockedMethod(updateTablesForZeppelinViewRemoval)
+ .createMock();
upgradeCatalog250.updateAMSConfigs();
expectLastCall().once();
@@ -233,6 +235,9 @@ public class UpgradeCatalog250Test {
upgradeCatalog250.updateHiveLlapConfigs();
expectLastCall().once();
+ upgradeCatalog250.updateTablesForZeppelinViewRemoval();
+ expectLastCall().once();
+
replay(upgradeCatalog250);
upgradeCatalog250.executeDMLUpdates();
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/contrib/views/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml
index fb7d8fa..ea426cd 100644
--- a/contrib/views/pom.xml
+++ b/contrib/views/pom.xml
@@ -46,7 +46,6 @@
<module>tez</module>
<module>hawq</module>
<module>storm</module>
- <module>zeppelin</module>
<module>hueambarimigration</module>
<module>hive-next</module>
<module>hive</module>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/contrib/views/zeppelin/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/zeppelin/pom.xml b/contrib/views/zeppelin/pom.xml
deleted file mode 100644
index 2a52ce7..0000000
--- a/contrib/views/zeppelin/pom.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<!--
- 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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ambari.contrib.views</groupId>
- <artifactId>zeppelin-view</artifactId>
- <version>1.0.0.0</version>
- <name>Zeppelin</name>
-
- <parent>
- <groupId>org.apache.ambari.contrib.views</groupId>
- <artifactId>ambari-contrib-views</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ambari</groupId>
- <artifactId>ambari-views</artifactId>
- <version>${ambari.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ambari.contrib.views</groupId>
- <artifactId>ambari-views-utils</artifactId>
- <version>2.0.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20160212</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.2</version>
- </dependency>
-
-
- </dependencies>
-
- <properties>
- <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
- <hive-version>1.0.0</hive-version>
- <ambari.version>2.0.0.0-SNAPSHOT</ambari.version>
- </properties>
- <build>
- <plugins>
-
- <!-- Building frontend -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- <includeScope>runtime</includeScope>
- </configuration>
- </execution>
- <execution>
- <id>copy-artifact</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <type>${project.packaging}</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${views.jars.dir.rel}</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.vafer</groupId>
- <artifactId>jdeb</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <phase>none</phase>
- <goals>
- <goal>jdeb</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <submodules>false</submodules>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>WEB-INF/web.xml</include>
- <include>META-INF/**/*</include>
- <include>view.xml</include>
- <include>WEB-INF/index.jsp</include>
- </includes>
- </resource>
- <resource>
- <targetPath>WEB-INF/lib</targetPath>
- <filtering>false</filtering>
- <directory>target/lib</directory>
- </resource>
- </resources>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/contrib/views/zeppelin/src/main/java/org/apache/ambari/view/zeppelin/ZeppelinServiceCheck.java
----------------------------------------------------------------------
diff --git a/contrib/views/zeppelin/src/main/java/org/apache/ambari/view/zeppelin/ZeppelinServiceCheck.java b/contrib/views/zeppelin/src/main/java/org/apache/ambari/view/zeppelin/ZeppelinServiceCheck.java
deleted file mode 100644
index 8f94260..0000000
--- a/contrib/views/zeppelin/src/main/java/org/apache/ambari/view/zeppelin/ZeppelinServiceCheck.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ambari.view.zeppelin;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.json.JSONObject;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-
-public class ZeppelinServiceCheck {
- static String check(String host, String port) {
- String url = "http://" + host + ":" + port;
- JSONObject json = new JSONObject();
- json.put("url", url);
- try {
- HttpClient httpclient = HttpClientBuilder.create().build();
- HttpGet httpget = new HttpGet(url);
- HttpResponse httpresponse = httpclient.execute(httpget);
- if (httpresponse.getStatusLine().getStatusCode() == 200) {
- json.put("status", "SUCCESS");
- json.put("message", "Zeppelin is running");
- }
- } catch (Exception e) {
- json.put("status", "ERROR");
- json.put("message", "Zeppelin is not running");
- }
- return json.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/contrib/views/zeppelin/src/main/java/org/apache/ambari/view/zeppelin/ZeppelinServlet.java
----------------------------------------------------------------------
diff --git a/contrib/views/zeppelin/src/main/java/org/apache/ambari/view/zeppelin/ZeppelinServlet.java b/contrib/views/zeppelin/src/main/java/org/apache/ambari/view/zeppelin/ZeppelinServlet.java
deleted file mode 100644
index ab61a3d..0000000
--- a/contrib/views/zeppelin/src/main/java/org/apache/ambari/view/zeppelin/ZeppelinServlet.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ambari.view.zeppelin;
-
-import org.apache.ambari.view.ViewContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-
-
-public class ZeppelinServlet extends HttpServlet {
- private ViewContext viewContext;
- private final static Logger LOG = LoggerFactory.getLogger(ZeppelinServlet.class);
-
- @Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
-
- ServletContext context = config.getServletContext();
- viewContext = (ViewContext) context.getAttribute(ViewContext.CONTEXT_ATTRIBUTE);
- }
-
- public void service(HttpServletRequest req,
- HttpServletResponse res) throws IOException {
- res.setContentType("text/html");
- PrintWriter out = res.getWriter();
- String publicName = "";
- String port = "";
- try {
- port = viewContext.getProperties().get("zeppelin.server.port");
- if (viewContext.getCluster() != null) {
- List<String> hostsForServiceComponents = viewContext.getCluster().getHostsForServiceComponent
- ("ZEPPELIN", "ZEPPELIN_MASTER");
- publicName = hostsForServiceComponents.get(0);
- } else {
- publicName = viewContext.getProperties().get("zeppelin.host.publicname");
- }
- } catch (Exception e) {
- LOG.error("Zeppelin view servlet failed", e);
- }
- out.println("<html lang=\"en\">" +
- "<head>" +
- " <meta charset=\"utf-8\"/>" +
- " <link rel=\"stylesheet\" href=\"/stylesheets/vendor.css\">" +
- "</head>" +
- "<body>" +
- "" +
- "<div class=\"container-fluid\" id=\"messageContainer\" style=\"display:none;\">" +
- " <h1>Welcome to the Zeppelin View</h1>" +
- " <h3>Service check failed</h3>" +
- "" +
- " <table class=\"table\">" +
- " <tbody>" +
- " <tr>" +
- " <td>zeppelin service is not running</td>" +
- " </tr>" +
- " </tbody>" +
- " </table>" +
- "" +
- "</div>" +
- "" +
- "<iframe id='zeppelinIFrame' width=\"100%\" seamless=\"seamless\" style=\"border: 0px;\"></iframe>" +
- "<script>" +
- "var $ = jQuery = parent.jQuery;" +
- "var iframe = document.querySelector('#zeppelinIFrame');" +
- "var messageContainer = document.querySelector('#messageContainer');" +
- "" +
- "var serviceCheckResponse = $.parseJSON(' " + ZeppelinServiceCheck.check(publicName, port) + "');" +
- "" +
- "if (serviceCheckResponse.status === \"SUCCESS\") {" +
- " messageContainer.style.display = \"none\";" +
- " iframe.style.display = \"block\";" +
- " iframe.src = serviceCheckResponse.url;" +
- " iframe.height = window.innerHeight;" +
- "} else {" +
- " messageContainer.style.display = \"block\";" +
- " iframe.style.display = \"none\";" +
- "}" +
- "" +
- "$(window).resize(function () {" +
- " iframe.height = window.innerHeight;" +
- "});" +
- "</script>" +
- "</body>" +
- "</html>");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/contrib/views/zeppelin/src/main/resources/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/contrib/views/zeppelin/src/main/resources/WEB-INF/web.xml b/contrib/views/zeppelin/src/main/resources/WEB-INF/web.xml
deleted file mode 100644
index 6b2d156..0000000
--- a/contrib/views/zeppelin/src/main/resources/WEB-INF/web.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!--
-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. Kerberos, LDAP, Custom. Binary/Htt
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <display-name>Zeppelin view servlet</display-name>
- <description>
- This is the Zeppelin view servlet application.
- </description>
-
- <servlet>
- <servlet-name>ZeppelinServlet</servlet-name>
- <servlet-class>org.apache.ambari.view.zeppelin.ZeppelinServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ZeppelinServlet</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
-</web-app>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/contrib/views/zeppelin/src/main/resources/view.log4j.properties
----------------------------------------------------------------------
diff --git a/contrib/views/zeppelin/src/main/resources/view.log4j.properties b/contrib/views/zeppelin/src/main/resources/view.log4j.properties
deleted file mode 100644
index 15d264e..0000000
--- a/contrib/views/zeppelin/src/main/resources/view.log4j.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2011 The Apache Software Foundation
-#
-# 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.
-
-log4j.appender.zeppelinView=org.apache.log4j.RollingFileAppender
-log4j.appender.zeppelinView.File=${ambari.log.dir}/zeppelin-view/zeppelin-view.log
-log4j.appender.zeppelinView.MaxFileSize=80MB
-log4j.appender.zeppelinView.MaxBackupIndex=60
-log4j.appender.zeppelinView.layout=org.apache.log4j.PatternLayout
-log4j.appender.zeppelinView.layout.ConversionPattern=%d{DATE} %5p [%t] [%X{viewName} %X{viewVersion} %X{viewInstanceName}] %c{1}:%L - %m%n
-
-log4j.logger.org.apache.ambari.view.zeppelin=INFO,zeppelinView
-log4j.additivity.org.apache.ambari.view.zeppelin=false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2dc7538/contrib/views/zeppelin/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/zeppelin/src/main/resources/view.xml b/contrib/views/zeppelin/src/main/resources/view.xml
deleted file mode 100644
index 197c397..0000000
--- a/contrib/views/zeppelin/src/main/resources/view.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-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. Kerberos, LDAP, Custom. Binary/Htt
--->
-<view>
- <name>ZEPPELIN</name>
- <label>Zeppelin View!</label>
- <version>1.0.0</version>
- <build>${env.BUILD_NUMBER}</build>
- <description>Ambari view for Apache Zeppelin</description>
-
- <parameter>
- <name>zeppelin.server.port</name>
- <description>Zeppelin Http port (example: 9995).</description>
- <label>Zeppelin Http port</label>
- <cluster-config>zeppelin-config/zeppelin.server.port</cluster-config>
- <required>true</required>
- </parameter>
- <parameter>
- <name>zeppelin.host.publicname</name>
- <description>Zeppelin host name</description>
- <label>Zeppelin host name</label>
- <cluster-config>fake</cluster-config>
- <required>true</required>
- </parameter>
-
- <auto-instance>
- <name>AUTO_ZEPPELIN_INSTANCE</name>
- <label>Zeppelin View</label>
- <description>This view instance is auto created when the Zeppelin service is added to a cluster.</description>
- <stack-id>HDP-2.*</stack-id>
- <services>
- <service>ZEPPELIN</service>
- </services>
- </auto-instance>
-</view>
\ No newline at end of file