From 3efcac6d72f4f59e8ceb33bdcfdb04799c4c71ca Mon Sep 17 00:00:00 2001
From: lahiru <lahiru.himasha@gmail.com>
Date: Wed, 9 Mar 2016 12:27:55 +0530
Subject: [PATCH 1/5] Add to favourit css issues fixed

---
 .../themes/store/js/logic/myapp/myapp.js      | 33 ++++++-------
 .../store/partials/page-content-myapps.hbs    | 49 ++++++++-----------
 .../store/partials/ribbons/favorite.hbs       |  2 +-
 3 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/js/logic/myapp/myapp.js b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/js/logic/myapp/myapp.js
index 43b5750d1..d25160af3 100644
--- a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/js/logic/myapp/myapp.js
+++ b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/js/logic/myapp/myapp.js
@@ -57,7 +57,6 @@ $( document ).ready(function() {
         appData['provider'] = $(this).data("provider");
         appData['storeTenantDomain'] = storeTenantDomain;
 
-        $(this).hide();
         var waitIconId = '#wait-' + appId;
         $(waitIconId).show();
 
@@ -77,7 +76,6 @@ $( document ).ready(function() {
         appData['provider'] = $(this).data("provider");
         appData['storeTenantDomain'] = storeTenantDomain;
 
-        $(this).hide();
         var waitIconId = '#wait-' + appId;
         $(waitIconId).show();
 
@@ -87,8 +85,6 @@ $( document ).ready(function() {
 
     var addToFavourite = function (data, appId) {
         var waitIconId = '#wait-' + appId;
-        var rmvIconId = '#rmv-' + appId;
-        var addIconId = '#add-' + appId;
         $.ajax({
                    url: API_ADD_TO_FAVOURITE,
                    dataType: 'JSON',
@@ -97,13 +93,17 @@ $( document ).ready(function() {
                    success: function (response, textStatus, xhr) {
                        if (response.error == false) {
                            $(waitIconId).hide();
-                           $(rmvIconId).show();
                            var message = 'You have successfully added  <b>' + data.name +
                                          '</b> to your favourite apps';
                            notify(message);
+
+                           document.getElementById("favRibbon-" + appId).style.visibility = "visible";
+                           document.getElementById("listItemAddFavorite-" + appId).className = "";
+                           document.getElementById("listItemAddFavorite-" + appId).classList.add("display-none-lg");
+                           document.getElementById("listItemRmvFavorite-" + appId).className = "";
+                           document.getElementById("listItemRmvFavorite-" + appId).classList.add("display-block-lg");
                        } else {
                            $(waitIconId).hide();
-                           $(addIconId).show();
                            var message = 'Error occured in while adding  web app: ' + data.name +
                                          ' to my favourite web apps';
                            notify(message);
@@ -112,7 +112,6 @@ $( document ).ready(function() {
                    },
                    error: function (response) {
                        $(waitIconId).hide();
-                       $(addIconId).show();
                        if (response.status == 401) {
                            var message = 'Your session has time out.Please login again';
                            notify(message);
@@ -127,9 +126,6 @@ $( document ).ready(function() {
 
     var removeFromFavourite = function (data, appId) {
         var waitIconId = '#wait-' + appId;
-        var rmvIconId = '#rmv-' + appId;
-        var addIconId = '#add-' + appId;
-
         $.ajax({
                    url: API_REMOVE_FROM_FAVOURITE,
                    type: 'POST',
@@ -137,29 +133,30 @@ $( document ).ready(function() {
                    success: function (response, textStatus, xhr) {
                        if (response.error == false) {
                            $(waitIconId).hide();
-                           $(addIconId).show();
                            var message = 'You have successfully removed  <b>' + data.name
-                               + '</b> from your favourite apps';
+                                         + '</b> from your favourite apps';
                            notify(message);
-                           $('#btnRemoveFromFav').hide();
-                           $('#btnAddToFav').show();
+
+                           document.getElementById("favRibbon-" + appId).style.visibility = "hidden";
+                           document.getElementById("listItemRmvFavorite-" + appId).className = "";
+                           document.getElementById("listItemRmvFavorite-" + appId).classList.add("display-none-lg");
+                           document.getElementById("listItemAddFavorite-" + appId).className = "";
+                           document.getElementById("listItemAddFavorite-" + appId).classList.add("display-block-lg");
                        } else {
                            $(waitIconId).hide();
-                           $(rmvIconId).show();
                            var message = 'Error occured  when remove  web app: ' + data.name
-                               + ' from my favourite web apps';
+                                         + ' from my favourite web apps';
                            notify(message);
                        }
                    },
                    error: function (response) {
                        $(waitIconId).hide();
-                       $(rmvIconId).show();
                        if (response.status == 401) {
                            var message = 'Your session has time out.Please login again';
                            notify(message);
                        } else {
                            var message = 'Error occured  when remove  web app: ' + data.name
-                               + ' from my favourite web apps';
+                                         + ' from my favourite web apps';
                            notify(message);
                        }
                    }
diff --git a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/page-content-myapps.hbs b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/page-content-myapps.hbs
index 14455e287..d0b3ea950 100644
--- a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/page-content-myapps.hbs
+++ b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/page-content-myapps.hbs
@@ -8,13 +8,10 @@
                        data-name="{{attributes.overview_name}}" data-version="{{attributes.overview_version}}"
                        data-context="{{attributes.overview_context}}" class="hover-overlay-container">
                         <div class="ratio-responsive-4by3">
-                            {{#if isFavourite}}
-                                {{> ribbons/favorite}}
-                            {{else}}
-                                {{#ifCond attributes.overview_advertiseOnly "==" "true"}}
-                                    {{> ribbons/advertise}}
-                                {{/ifCond}}
-                            {{/if}}
+                            {{> ribbons/favorite}}
+                            {{#ifCond attributes.overview_advertiseOnly "==" "true"}}
+                                {{> ribbons/advertise}}
+                            {{/ifCond}}
                             {{#ifCond lifecycleState "==" "DEPRECATED"}}
                                 {{> ribbons/deprecated}}
                             {{/ifCond}}
@@ -52,23 +49,20 @@
                                 <i class="fw fw-ellipsis fw-rotate-90"></i>
                             </a>
                             <ul class="more-menu-items dropdown-menu">
-                                {{#if isFavourite}}
-                                    <li>
+                                    <li id="listItemRmvFavorite-{{id}}" {{#unless isFavourite}} class="display-none-lg" {{/unless}}>
                                         <a href="#" id="rmv-{{id}}" data-name="{{attributes.overview_name}}"
                                            data-provider="{{attributes.overview_provider}}"
                                            data-version="{{attributes.overview_version}}" class="remove-from-fav">
                                             Remove from Favorites
                                         </a>
                                     </li>
-                                {{else}}
-                                    <li>
+                                    <li id="listItemAddFavorite-{{id}}" {{#if isFavourite}} class="display-none-lg" {{/if}}>
                                         <a href="#" id="add-{{id}}" data-name="{{attributes.overview_name}}"
                                            data-provider="{{attributes.overview_provider}}"
                                            data-version="{{attributes.overview_version}}" class="add-to-fav">
                                             Add to Favorites
                                         </a>
                                     </li>
-                                {{/if}}
                                 {{#ifCond attributes.overview_advertiseOnly "==" "true"}}
                                     <li>
                                         <a href="{{url "/t"}}/{{attributes.overview_appTenant}}/assets/{{../../../assetType}}/{{attributes.overview_advertisedAppUuid}}">
@@ -132,23 +126,20 @@
                                 <i class="fw fw-ellipsis fw-rotate-90"></i>
                             </a>
                             <ul class="more-menu-items dropdown-menu">
-                                {{#if isFavourite}}
-                                    <li>
-                                        <a href="#" id="rmv-{{id}}" data-name="{{attributes.overview_name}}"
-                                           data-provider="{{attributes.overview_provider}}"
-                                           data-version="{{attributes.overview_version}}" class="remove-from-fav">
-                                            Remove from Favorites
-                                        </a>
-                                    </li>
-                                {{else}}
-                                    <li>
-                                        <a href="#" id="add-{{id}}" data-name="{{attributes.overview_name}}"
-                                           data-provider="{{attributes.overview_provider}}"
-                                           data-version="{{attributes.overview_version}}" class="add-to-fav">
-                                            Add to Favorites
-                                        </a>
-                                    </li>
-                                {{/if}}
+                                <li id="listItemRmvFavorite-{{id}}" {{#unless isFavourite}} class="display-none-lg" {{/unless}}>
+                                    <a href="#" id="rmv-{{id}}" data-name="{{attributes.overview_name}}"
+                                       data-provider="{{attributes.overview_provider}}"
+                                       data-version="{{attributes.overview_version}}" class="remove-from-fav">
+                                        Remove from Favorites
+                                    </a>
+                                </li>
+                                <li id="listItemAddFavorite-{{id}}" {{#if isFavourite}} class="display-none-lg" {{/if}}>
+                                    <a href="#" id="add-{{id}}" data-name="{{attributes.overview_name}}"
+                                       data-provider="{{attributes.overview_provider}}"
+                                       data-version="{{attributes.overview_version}}" class="add-to-fav">
+                                        Add to Favorites
+                                    </a>
+                                </li>
 
                                 {{#if ../../user}}
                                     {{#if ../../../config.isSelfSubscriptionEnabled}}
diff --git a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/ribbons/favorite.hbs b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/ribbons/favorite.hbs
index 3102b9e31..a850e8179 100644
--- a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/ribbons/favorite.hbs
+++ b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/ribbons/favorite.hbs
@@ -1,4 +1,4 @@
 {{!-- app tile thubnail ribbon - favorite --}}
-<div class="app-thumbnail-ribbon background-color-favorite col-xs-offset-1 col-sm-offset-1 col-md-offset-1 col-lg-offset-1 col-xs-1 col-sm-2 col-md-2 col-lg-2">
+<div {{#unless isFavourite}} style="visibility: hidden" {{/unless}} id="favRibbon-{{id}}" class="app-thumbnail-ribbon background-color-favorite col-xs-offset-1 col-sm-offset-1 col-md-offset-1 col-lg-offset-1 col-xs-1 col-sm-2 col-md-2 col-lg-2">
     <span><i class="fw fw-heart"></i></span>
 </div>
\ No newline at end of file

From 34a9b671db1ba6645cd916057c1ce2368efdee56 Mon Sep 17 00:00:00 2001
From: lahiru <lahiru.himasha@gmail.com>
Date: Wed, 9 Mar 2016 13:39:21 +0530
Subject: [PATCH 2/5] hide add-to-fav button for anonymous users

---
 .../store/partials/page-content-myapps.hbs    | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/page-content-myapps.hbs b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/page-content-myapps.hbs
index d0b3ea950..894e534d5 100644
--- a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/page-content-myapps.hbs
+++ b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/themes/store/partials/page-content-myapps.hbs
@@ -49,20 +49,24 @@
                                 <i class="fw fw-ellipsis fw-rotate-90"></i>
                             </a>
                             <ul class="more-menu-items dropdown-menu">
-                                    <li id="listItemRmvFavorite-{{id}}" {{#unless isFavourite}} class="display-none-lg" {{/unless}}>
+                                {{#if ../../user}}
+                                    <li id="listItemRmvFavorite-{{id}}" {{#unless isFavourite}}
+                                        class="display-none-lg" {{/unless}}>
                                         <a href="#" id="rmv-{{id}}" data-name="{{attributes.overview_name}}"
                                            data-provider="{{attributes.overview_provider}}"
                                            data-version="{{attributes.overview_version}}" class="remove-from-fav">
                                             Remove from Favorites
                                         </a>
                                     </li>
-                                    <li id="listItemAddFavorite-{{id}}" {{#if isFavourite}} class="display-none-lg" {{/if}}>
+                                    <li id="listItemAddFavorite-{{id}}" {{#if isFavourite}}
+                                        class="display-none-lg" {{/if}}>
                                         <a href="#" id="add-{{id}}" data-name="{{attributes.overview_name}}"
                                            data-provider="{{attributes.overview_provider}}"
                                            data-version="{{attributes.overview_version}}" class="add-to-fav">
                                             Add to Favorites
                                         </a>
                                     </li>
+                                {{/if}}
                                 {{#ifCond attributes.overview_advertiseOnly "==" "true"}}
                                     <li>
                                         <a href="{{url "/t"}}/{{attributes.overview_appTenant}}/assets/{{../../../assetType}}/{{attributes.overview_advertisedAppUuid}}">
@@ -126,22 +130,25 @@
                                 <i class="fw fw-ellipsis fw-rotate-90"></i>
                             </a>
                             <ul class="more-menu-items dropdown-menu">
-                                <li id="listItemRmvFavorite-{{id}}" {{#unless isFavourite}} class="display-none-lg" {{/unless}}>
-                                    <a href="#" id="rmv-{{id}}" data-name="{{attributes.overview_name}}"
-                                       data-provider="{{attributes.overview_provider}}"
-                                       data-version="{{attributes.overview_version}}" class="remove-from-fav">
-                                        Remove from Favorites
-                                    </a>
-                                </li>
-                                <li id="listItemAddFavorite-{{id}}" {{#if isFavourite}} class="display-none-lg" {{/if}}>
-                                    <a href="#" id="add-{{id}}" data-name="{{attributes.overview_name}}"
-                                       data-provider="{{attributes.overview_provider}}"
-                                       data-version="{{attributes.overview_version}}" class="add-to-fav">
-                                        Add to Favorites
-                                    </a>
-                                </li>
-
                                 {{#if ../../user}}
+                                    <li id="listItemRmvFavorite-{{id}}" {{#unless isFavourite}}
+                                        class="display-none-lg" {{/unless}}>
+                                        <a href="#" id="rmv-{{id}}" data-name="{{attributes.overview_name}}"
+                                           data-provider="{{attributes.overview_provider}}"
+                                           data-version="{{attributes.overview_version}}" class="remove-from-fav">
+                                            Remove from Favorites
+                                        </a>
+                                    </li>
+                                    <li id="listItemAddFavorite-{{id}}" {{#if isFavourite}}
+                                        class="display-none-lg" {{/if}}>
+                                        <a href="#" id="add-{{id}}" data-name="{{attributes.overview_name}}"
+                                           data-provider="{{attributes.overview_provider}}"
+                                           data-version="{{attributes.overview_version}}" class="add-to-fav">
+                                            Add to Favorites
+                                        </a>
+                                    </li>
+
+
                                     {{#if ../../../config.isSelfSubscriptionEnabled}}
                                         {{#if ../../../../config.isEnterpriseSubscriptionEnabled}}
                                             <li>

From b32d7f3ceb2402cf944cae08179d41a8aa18f899 Mon Sep 17 00:00:00 2001
From: lahiru <lahiru.himasha@gmail.com>
Date: Wed, 9 Mar 2016 21:07:38 +0530
Subject: [PATCH 3/5] lifecycle unpublish issue fixed

---
 .../carbon/appmgt/impl/APIGatewayManager.java |  6 ++-
 .../carbon/appmgt/impl/APIProviderImpl.java   | 32 +++++++++++++---
 .../publisher/apis/v1/asset_api_router.jag    | 38 +++++++++++++++++++
 .../apis/v1/lifecycle_api_router.jag          | 16 ++++++--
 .../publisher/themes/appm/js/list-assets.js   | 38 +++++++++++++++++--
 .../themes/appm/partials/list-assets.hbs      |  2 +
 6 files changed, 119 insertions(+), 13 deletions(-)

diff --git a/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIGatewayManager.java b/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIGatewayManager.java
index f80c62718..2d5008a1a 100644
--- a/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIGatewayManager.java
+++ b/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIGatewayManager.java
@@ -164,8 +164,10 @@ public void removeFromGateway(WebApp api, String tenantDomain) throws Exception
 									  environment.getName());
 				}
 				String operation = "delete";
-				client.deleteNonVersionedWebApp(tenantDomain);
-				client.deleteVersionedWebApp(tenantDomain);
+                if (api.isDefaultVersion()) {
+                    client.deleteNonVersionedWebApp(tenantDomain);
+                }
+                client.deleteVersionedWebApp(tenantDomain);
 				undeployCustomSequences(api, tenantDomain, environment);
 			}
 		}
diff --git a/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java b/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java
index 41dbb82e0..32e1fabc4 100644
--- a/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java
+++ b/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java
@@ -843,13 +843,29 @@ public void changeAPIStatus(WebApp api, APIStatus status, String userId,
                 String gatewayType = config.getFirstProperty(AppMConstants.API_GATEWAY_TYPE);
                 if (!api.isAdvertiseOnly()) { // no need to publish to gateway if webb is only for advertising
                     if (updateGatewayConfig) {
-                        if (status.equals(APIStatus.PUBLISHED) || status.equals(APIStatus.DEPRECATED) ||
-                                status.equals(APIStatus.BLOCKED)) {
 
-                            //publish to gateway if skipGateway is disabled only
-                            if (!api.getSkipGateway()) {
-                                publishToGateway(api);
+                        if (api.isDefaultVersion()) {
+                            if (status.equals(APIStatus.UNPUBLISHED)) {
+                                APIIdentifier identifier = new APIIdentifier(api.getId().getProviderName(),
+                                                                             api.getId().getApiName(),
+                                                                             null);
+
+                                WebApp webApp = new WebApp(identifier);
+                                appMDAO.updatePublishedDefaultVersion(webApp);
+
+                                identifier = new APIIdentifier(api.getId().getProviderName(),
+                                                               api.getId().getApiName(),
+                                                               api.getId().getVersion());
+
+
+                                webApp = getAPI(identifier);
+                                webApp.setDefaultVersion(false);
+                                updateApiArtifact(webApp, false, false);
                             }
+                        }
+
+                        if (status.equals(APIStatus.PUBLISHED) || status.equals(APIStatus.DEPRECATED) ||
+                                status.equals(APIStatus.BLOCKED)) {
 
                             //update version
                             if (status.equals(APIStatus.PUBLISHED)) {
@@ -863,9 +879,15 @@ public void changeAPIStatus(WebApp api, APIStatus status, String userId,
                                     if (defaultPublishedAppVersion == null || "".equals(defaultPublishedAppVersion)) {
                                         appMDAO.updatePublishedDefaultVersion(api);
                                         removeDefaultVersionFromNonPublishedApps(api);
+                                        api.setDefaultVersion(true);
                                     }
                                 }
                             }
+
+                            //publish to gateway if skipGateway is disabled only
+                            if (!api.getSkipGateway()) {
+                                publishToGateway(api);
+                            }
                         } else {
                             removeFromGateway(api);
                         }
diff --git a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag
index c2b05b242..f62cddf63 100755
--- a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag
+++ b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag
@@ -911,6 +911,44 @@ require('/modules/publisher.js').exec(function(ctx) {
 
             });
 
+
+    //get uuid of given asset for-> provider,name,lifecycle state
+    routeManager.register('GET', 'publisher', '/publisher/api/asset/get/uuid/list/{type}/{provider}/{name}/{lifecyclestate}',
+                          function (context) {
+                              log.info(stringify(context.params));
+                              var assetProvider = context.params.provider;
+                              var assetName = context.params.name;
+                              var lifecycleState = context.params.lifecyclestate;
+                              var shortName = context.params.type;
+                              var artifactManager = rxtManager.getArtifactManager(shortName);
+
+                              var fn = function (asset) {
+                                  var cond1 = (asset.attributes.overview_provider == assetProvider ) ? true : false;
+                                  var cond2 = (asset.attributes.overview_name == assetName ) ? true : false;
+                                  var cond3 = (asset.lifecycleState == lifecycleState ) ? true : false;
+                                  return (cond1 && cond2 && cond3);
+                              }
+
+                              var artifacts = artifactManager.find(fn, null);
+                              var noOfArtifacts = 0;
+                              var UUIDs = [];
+                              for (noOfArtifacts = 0; noOfArtifacts < artifacts.length; noOfArtifacts++) {
+                                  var artifactId = artifacts[noOfArtifacts].id;
+                                  UUIDs.push(artifactId);
+                              }
+                              if (UUIDs.length > 0) {
+                                  var res = {error: false, uuids: UUIDs, count: noOfArtifacts};
+                                  response.contentType = "application/json";
+                                  print(res);
+                              } else {
+                                  var res = {error: false, uuids: UUIDs, message: 'Could not find UUID for given webapp'};
+                                  response.contentType = "application/json";
+                                  print(res);
+                              }
+
+
+                          });
+
     //Get external
     routeManager.register('GET', 'publisher', '/publisher/api/asset/get/external/stores/{type}/{provider}/{name}/{version}',
             function (context) {
diff --git a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/lifecycle_api_router.jag b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/lifecycle_api_router.jag
index 4931f3601..2b2818cce 100644
--- a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/lifecycle_api_router.jag
+++ b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/lifecycle_api_router.jag
@@ -376,11 +376,18 @@ require('/modules/publisher.js').exec(function (ctx) {
         } else {
             // some error occurred in promoteArtifactLifeCycle function,
             // revert previously unpublished artifacts to Publish state
+
+            /*
             for (i = 0; i < previousArtifacts.length; i++) {
                 promoteArtifactLifeCycle(artifactManager, previousArtifacts[i], appType,
                                          "Re-Publish");
-                // ignore errors when reverting changes
             }
+            */
+
+            // ignore errors when reverting changes
+            promoteArtifactLifeCycle(artifactManager, currentArtifact, appType,
+                                     "Re-Publish");
+
             response.status = 500;
             response.contentType = "application/json";
             content.status = "Error";
@@ -465,8 +472,11 @@ require('/modules/publisher.js').exec(function (ctx) {
                 promoteArtifactLifeCycle(artifactManager, currentArtifact, appType, "Unpublish");
                 // revert previously unpublished artifacts to Publish state
                 for (i = 0; i < previousArtifacts.length; i++) {
-                    promoteArtifactLifeCycle(artifactManager, previousArtifacts[i], appType,
-                                             "Re-Publish");
+                    if (previousArtifacts[i].attributes.overview_version
+                        == currentArtifact.attributes.overview_oldVersion) {
+                        promoteArtifactLifeCycle(artifactManager, previousArtifacts[i], appType,
+                                                 "Re-Publish");
+                    }
                     // ignore errors when reverting changes
                 }
                 response.status = 500;
diff --git a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/js/list-assets.js b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/js/list-assets.js
index e584b9297..ed5bc3686 100644
--- a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/js/list-assets.js
+++ b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/js/list-assets.js
@@ -23,6 +23,7 @@ $(".btn-action").click(function (e) {
     var name = $(this).data("name");
     var version = $(this).data("version");
 	var action = $(this).data("action");
+    var isDefault = Boolean($(this).data("isdefault"));
 
     var status = isPublishedToExternalStore(action, provider, name, version);
 
@@ -37,8 +38,19 @@ $(".btn-action").click(function (e) {
 
 	if (action == "Reject") {
 		showCommentModel("Reason for Rejection", action, app, "webapp");
-	} else {
-		jQuery.ajax({
+    } else {
+        if (action == "Unpublish" && isDefault) {
+            var publishedVersionsAvailable = isPublishedVersionsAvailable(provider, name);
+            if (publishedVersionsAvailable) {
+                var faultMsg = "'" + action + "' is not permitted as this is the default version of the WebApp. "
+                               + "Please select other version of this WebApp as the default version and proceed.";
+                var status = "Not Allowed";
+                showMessageModel(faultMsg, status, 'webapp');
+                $(parent).children().attr('disabled', false);
+                return false;
+            }
+        }
+        jQuery.ajax({
 			url: caramel.context + '/api/lifecycle/' + action + '/webapp/' + app,
 			type: 'PUT',
 			success: function (data, text) {
@@ -220,4 +232,24 @@ function isPublishedToExternalStore(action, provider, name, version) {
 
     }
     return publishedInExternalStores;
-}
\ No newline at end of file
+}
+
+
+function isPublishedVersionsAvailable(provider, name) {
+    var result;
+    $.ajax({
+               url: caramel.context + '/api/asset/get/uuid/list/' + 'webapp' + '/' + provider + '/' + name + '/'
+                    + 'Published',
+               type: 'GET',
+               async: false,
+               contentType: 'application/json',
+               dataType: 'json', // the type of data that you're expecting back from the server
+               success: function (responseData, status, xhr) {
+                   result = (parseInt(responseData.count) > 1);
+               },
+               error: function () {
+                   result = false;
+               }
+           });
+    return result;
+}
diff --git a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/partials/list-assets.hbs b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/partials/list-assets.hbs
index 8e54dcf5b..65bbab4be 100644
--- a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/partials/list-assets.hbs
+++ b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/themes/appm/partials/list-assets.hbs
@@ -112,6 +112,7 @@
                                              data-name="{{../../../attributes.overview_name}}"
                                              data-provider="{{../../../attributes.overview_provider}}"
                                              data-version="{{../../../attributes.overview_version}}"
+                                             data-isDefault="{{../../../attributes.overview_makeAsDefault}}"
                                              class="btn {{style}} btn-action" name="addNewAssetButton">{{name}}</a>
                                      {{/ifCond}}
 
@@ -121,6 +122,7 @@
                                          data-name="{{../../attributes.overview_name}}"
                                          data-provider="{{../../attributes.overview_provider}}"
                                          data-version="{{../../attributes.overview_version}}"
+                                         data-isdefault="{{../../attributes.overview_makeAsDefaultVersion}}"
                                          class="btn {{style}} btn-action" name="addNewAssetButton">{{name}}</a>
                                  {{/ifCond}}
                              {{/this.lifecycleAvailableActions}}

From d43f2fee06948091ca168e978d5ce5365c2aa99a Mon Sep 17 00:00:00 2001
From: lahiru <lahiru.himasha@gmail.com>
Date: Wed, 9 Mar 2016 21:10:14 +0530
Subject: [PATCH 4/5] removing info logs

---
 .../src/main/resources/publisher/apis/v1/asset_api_router.jag    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag
index f62cddf63..44134b2e7 100755
--- a/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag
+++ b/features/org.wso2.carbon.appmgt.publisher.feature/src/main/resources/publisher/apis/v1/asset_api_router.jag
@@ -915,7 +915,6 @@ require('/modules/publisher.js').exec(function(ctx) {
     //get uuid of given asset for-> provider,name,lifecycle state
     routeManager.register('GET', 'publisher', '/publisher/api/asset/get/uuid/list/{type}/{provider}/{name}/{lifecyclestate}',
                           function (context) {
-                              log.info(stringify(context.params));
                               var assetProvider = context.params.provider;
                               var assetName = context.params.name;
                               var lifecycleState = context.params.lifecyclestate;

From fb8fdcb2bb3151c97e5891e047e9231bbfbcad47 Mon Sep 17 00:00:00 2001
From: lahiru <lahiru.himasha@gmail.com>
Date: Wed, 9 Mar 2016 21:14:35 +0530
Subject: [PATCH 5/5] describing gateway method -add comments

---
 .../java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java b/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java
index 32e1fabc4..b4bb5ee46 100644
--- a/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java
+++ b/components/org.wso2.carbon.appmgt.impl/src/main/java/org/wso2/carbon/appmgt/impl/APIProviderImpl.java
@@ -846,18 +846,18 @@ public void changeAPIStatus(WebApp api, APIStatus status, String userId,
 
                         if (api.isDefaultVersion()) {
                             if (status.equals(APIStatus.UNPUBLISHED)) {
+                                //when un-publishing default version, reset the default published version as null in table
                                 APIIdentifier identifier = new APIIdentifier(api.getId().getProviderName(),
                                                                              api.getId().getApiName(),
                                                                              null);
-
                                 WebApp webApp = new WebApp(identifier);
                                 appMDAO.updatePublishedDefaultVersion(webApp);
 
+
+                                //update the registry and reset default version
                                 identifier = new APIIdentifier(api.getId().getProviderName(),
                                                                api.getId().getApiName(),
                                                                api.getId().getVersion());
-
-
                                 webApp = getAPI(identifier);
                                 webApp.setDefaultVersion(false);
                                 updateApiArtifact(webApp, false, false);