Repository: incubator-atlas Updated Branches: refs/heads/master b15aa4007 -> a05f752d2
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a05f752d/dashboard/public/modules/tags/tagsRoutes.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/tagsRoutes.js b/dashboard/public/modules/tags/tagsRoutes.js deleted file mode 100755 index ebe1e87..0000000 --- a/dashboard/public/modules/tags/tagsRoutes.js +++ /dev/null @@ -1,49 +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. - */ - -'use strict'; - -angular.module('dgc.tags').config(['$stateProvider', - function($stateProvider) { - $stateProvider.state('tags', { - url: '/tags', - templateUrl: '/modules/tags/definition/views/add.html' - }); - $stateProvider.state('addTag', { - parent: 'details', - params: { - tId: null, - frm: 'addTag' - }, - onEnter: ['$stateParams', '$state', '$modal', 'navigationResource', function($stateParams, $state, $modal, navigationResource) { - $modal.open({ - templateUrl: '/modules/tags/instance/views/createTag.html', - controller: 'createTagController', - windowClass: 'create-tag-entity', - resolve: { - typesList: function() { - return navigationResource.get().$promise; - } - } - }).result.finally(function() { - $state.go('^'); - }); - }] - }); - } -]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a05f752d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6013cdc..eac95c8 100755 --- a/pom.xml +++ b/pom.xml @@ -466,7 +466,6 @@ <module>repository</module> <module>authorization</module> <module>catalog</module> - <!-- <module>dashboard</module> --> <module>dashboardv2</module> <module>webapp</module> @@ -1053,13 +1052,6 @@ <version>${project.version}</version> </dependency> - <!-- <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-dashboard</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> --> - <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-dashboardv2</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a05f752d/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index cc85f9a..1bb1920 100644 --- a/release-log.txt +++ b/release-log.txt @@ -22,6 +22,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-731 Remove dashboard module in Atlas, replaced by dashboardv2 (kevalbhatt18 via sumasai) ATLAS-664 UI: Add Support for Versioning / History (Kalyanikashikar via yhemanth) ATLAS-833 Make default build profile for External HBase and Solr (tbeerbower via yhemanth) ATLAS-841 mvn clean install of Atlas is failing python unit tests (yhemanth) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a05f752d/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 5b023eb..6b0a927 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -292,14 +292,7 @@ <artifactId>spring-ldap-core</artifactId> <version>${spring-ldap-core.version}</version> </dependency> - - <!-- <dependency> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-dashboard</artifactId> - <type>war</type> - </dependency> --> - - <dependency> + <dependency> <groupId>org.apache.atlas</groupId> <artifactId>atlas-dashboardv2</artifactId> <type>war</type> @@ -315,10 +308,6 @@ <archiveClasses>true</archiveClasses> <attachClasses>true</attachClasses> <overlays> - <!-- <overlay> - <groupId>org.apache.atlas</groupId> - <artifactId>atlas-dashboard</artifactId> - </overlay> --> <overlay> <groupId>org.apache.atlas</groupId> <artifactId>atlas-dashboardv2</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a05f752d/webapp/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/index.html b/webapp/src/main/webapp/index.html deleted file mode 100755 index c248b79..0000000 --- a/webapp/src/main/webapp/index.html +++ /dev/null @@ -1,34 +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. - --> - -<!DOCTYPE HTML> -<html lang="en"> -<head> - <meta charset="UTF-8"/> - <meta name="viewport" content="width=device-width, initial-scale=1.0"/> - <meta name="Date-Revision-yyyymmdd" content="20130821"/> - <meta http-equiv="Content-Language" content="en"/> - <title>Apache Atlas - Data Governance for Hadoop</title> -</head> -<body class="topBarEnabled"> -<h1> Apache Atlas </h1> -<a href="./dashboard/index.html" title="Atlas">Atlas Dashboard</a> -<br/> -More information at: <a href="http://atlas.incubator.apache.org/index.html"; title="About">Project Website</a> -</body> -</html>
