Replacing appmgt with cloud mgt(commit id: 1c2bde4cf06317372666f23167…

…4752c14666153f)

modules/jaggery-apps/appmgt/src/bin.xml

@@ -0,0 +1,40 @@
+<assembly>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+
+
+    <id>carbon</id>
+
+    <formats>
+
+        <format>zip</format>
+
+    </formats>
+
+
+
+    <fileSets>
+
+        <fileSet>
+
+            <directory>src</directory>
+
+            <outputDirectory></outputDirectory>
+          <excludes>
+
+                <exclude>**/bin.xml</exclude>
+         </excludes>
+
+
+        </fileSet>
+
+
+
+    </fileSets>
+
+
+
+
+
+</assembly>

modules/jaggery-apps/appmgt/src/jagg/config_reader.jag

@@ -1,4 +1,21 @@
 <%
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. 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.
+ */
 include('constants.jag');
 var appFactoryConfigReaderModule = require("appFactory");
 var appFactoryConfigReader = new appFactoryConfigReaderModule.AppFactoryConfigurationReader();

modules/jaggery-apps/appmgt/src/jagg/constants.jag

@@ -1,4 +1,24 @@
 <%
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. 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.
+ */
+//Appfactory version info
+var APPFAC_VERSION = "AppfactoryVersion";
+
 var DOMAIN_NAME = "DomainName";
 var FINE_GRAINED_DOMAIN_MAPPING = "FineGrainedDomainMappingAllowedStage";
 var ISSUETRACKER_SUMMARY_ONLY="IssueTrackerConnector.summaryOnly";
@@ -19,6 +39,14 @@ var APPLICATION_REPO_LINK = "applicationRepoLink";
 var APPLICATION_LIST = "applications";
 var APP_INFO = "/appinfo";
 
+// constants for lifecycle-add page
+var SUCCESSFUL = "successful";
+var TAGGED = "Tagged";
+var LATEST = "Latest";
+var PROMOTE = "promote";
+var PROMOTED = "Promoted";
+
+
 //appfactory.xml keys
 var SSO_NAME = "SSORelyingParty.Name";
 var SSO_PROVIDER = "SSORelyingParty.IdentityProviderURL";
@@ -51,11 +79,14 @@ var API_MANAGER_PROD = "prod";
 var API_MANAGER_SANDBOX = "sandbox";
 
 var LIFE_CYCLE_NAME="ApplicationLifecycle";
+var UPLOADABLE_APPLICATION_LIFE_CYCLE_NAME="UploadableApplicationLifeCycle";
 var APP_VERSION = "/appversion";
+var UPLOADABLE_APPLICATION_INITIAL_VERSION="1.0.0"
 
 var API_MANAGER_BUTTON = "ApiManager.ButtonLabel";
 var API_MANAGER_SERVER_URL = "ApiManager.Server.Url";
 var API_MANAGER_STORE_URL = "ApiManager.Store.Url";
+var API_MANAGER_STORE_SUBSCRIPTION_URL = "ApiManager.StoreSubscription.Url";
 var API_MANAGER_SERVICE_NAME = "ApiManager.Service.Name";
 var API_MANAGER_SERVICE_NAMESPACE = "ApiManager.Service.Namespace";
 var SANDBOX_KEYS_PROPERTY = "ApiManager.Keys.Property.Sandbox";
@@ -103,7 +134,7 @@ var PERMISSION_CONFIGURATION_API_MANAGER ="/permission/admin/appfactory/configur
 var PERMISSION_CONFIGURATION_API_SUBSCRIBE = "/permission/admin/appfactory/configure/api/subscribe";
 var PERMISSION_USER_INVITE ="/permission/admin/appfactory/usermgt/invite";
 var PERMISSION_ADMIN ="/permission/admin/appfactory";
-var PERMISSION_TENANT_ADMIN ="/permission/admin";
+var PERMISSION_TENANT_ADMIN ="/permission/admin/";
 var PERMISSION_VISIBILITY_STAGE = "/permission/admin/appfactory/visibility/";
 var PERMISSION_CEO_DASHBOARD = "/permission/admin/appfactory/ceo/dashboard";
 var PERMISSION_TASKS_VIEW = "/permission/admin/appfactory/tasks/view";
@@ -118,6 +149,16 @@ var PERMISSION_DATASOURCE_CREATE="/permission/admin/appfactory/datasource/create
 var PERMISSION_CONFIGURATION_RESOURCES_FOR_STAGE = "/permission/admin/appfactory/configure/resources/";
 var PERMISSION_RESOURCES_ACCESS_FOR_STAGE = "/permission/admin/appfactory/access/resources/";
 
+// Tablink Permissions
+var PERMISSION_TABLINK_OVERVIEW="/permission/admin/login";
+var PERMISSION_TABLINK_TEAM="/permission/admin/login";
+var PERMISSION_TABLINK_REPOS_AND_BUILDS="/permission/admin/appfactory/develop";
+var PERMISSION_TABLINK_RESOURCES="/permission/admin/appfactory/resources";
+var PERMISSION_TABLINK_ISSUES="/permission/admin/login";
+var PERMISSION_TABLINK_LIFECYCLE_MANAGEMENT_DEMOTE_TO="/permission/admin/appfactory/demoteTo";
+var PERMISSION_TABLINK_LIFECYCLE_MANAGEMENT_PROMOTE_TO="/permission/admin/appfactory/promoteTo";
+var PERMISSION_TABLINK_LOGS="/permission/admin/appfactory/logs";
+
 
 var USER_SEARCH_STATUS = "EnableUserSearch";
 
@@ -158,7 +199,7 @@ var BAM_ADMIN_PASSWORD = "BAM.AdminPassword"
 var ISSUETRACKER_URL = "IssueTrackerConnector.issueTracker.Property.FrontUrl";
 var ISSUE_TRACKER_SERVER_URL = "IssueTrackerConnector.issueTracker.Property.Url";
 
-var DEPLOYER_APPTYPE_EP= ".Deployer.ApplicationType.*.Endpoint";
+var DEPLOYER_APPTYPE_EP= ".PAASServicesURL";
 var SC_URL=".TenantMgtUrl";
 
 //For Codenvy
@@ -175,6 +216,7 @@ var SAML_ASSERTION_TOKEN_SESSION_KEY = "SAML_ASSERTION_TOKEN";
 
 //For uploading existing application flow (WAR)
 var TMP_UPLOADED_APPLICATIONS_PATH = "tmpUploadedApps"
+var UPPLOADABLE_SUFFIX = ".uploaded";
 //For claims
 
 var FIRST_LOGIN_CLAIM="http://wso2.org/claims/firstlogin";
@@ -186,6 +228,21 @@ var ERROR_NOTIFICATION_POLLING_PERIOD="NotificationConfig.MessageBroker.PollingP
 
 var GIT_BASE_URL="RepositoryProviderConfig.git.Property.BaseURL";
 
+// Tenant Info
+var TENANT_INFO_CACHE = "TENANT_INFO_CACHE";
+var TENANT_INFO_APP_TYPE = "APP_TYPE";
+var UNAUTHORIZED_ERROR_RESPONSE ={"errorCode":"401","errorMessage":"Unauthorized access!!!"};
+
+// Cache
+var USER_HOME_CAHCE = "USER_HOME_CACHE";
+var FIELD_APP_CREATION_STATUS = "applicationCreationStatus";
+var APP_CTX_DELETED_KEYS = "DELETED_KEYS_APP_CTX_CACHE";
+
+//auth headers
+var MUTUALSSL_HEADER_USERNAME_URL = "http://mutualssl.carbon.wso2.org";
+var CLOUD_HEADER_USERNAME_URL = "http://cloud.carbon.wso2.org/username";
+var CLOUD_HEADER_SECRET_URL = "http://cloud.carbon.wso2.org/secret";
+
 var PAGES={
               APP_HOME : "APP_HOME",
               USER_HOME : "USER_HOME",               
@@ -196,4 +253,12 @@ var PAGES={
               SERVER : "SERVER",
               ISSUES : "ISSUES" 
             };
+
+var APPLICATION_CREATION_STATUS = {
+    COMPLETED:"COMPLETED",
+    PENDING:"PENDING",
+    FAULTY:"FAULTY"
+};
+
+
 %>

modules/jaggery-apps/appmgt/src/jagg/correlationKeys.jag

@@ -0,0 +1,31 @@
+<%
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. 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.
+ */
+include('constants.jag');
+
+function dbCorrelationKey (appKey, dbName, stageName){
+    var correlationKey = appKey + "-" + stageName + "-database-" + dbName;
+    return correlationKey;
+}
+
+function dbPrivilegeCorrelationKey (appKey, dbname, stage, username){
+    var correlationKey = appKey + "-" + stage + "-dbPrivilege-" + dbname + "-" + username
+    return correlationKey;
+}
+
+%>

modules/jaggery-apps/appmgt/src/jagg/helpmessage_reader-bkup.jag

@@ -1,4 +1,21 @@
 <%
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. 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.
+ */
 include('constants.jag');
 var helpMessages = require("helpmessages.json");
 

modules/jaggery-apps/appmgt/src/jagg/jagg.jag

@@ -1,4 +1,21 @@
 <%
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. 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.
+ */
 include('/jagg/constants.jag');
 
 //TODO : remove this when log configs are implemented

modules/jaggery-apps/appmgt/src/jagg/jaggery_acs.jag

@@ -1,3 +1,20 @@
+<!--
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. 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.
+ -->
 <html>
     <body>
     Waiting for responses from identity server and validate response and forward to requested URI.
@@ -44,7 +61,8 @@
             session.put("LOGGED_IN_USER", ssoRelyingParty.getLoggedInUser(sessionId));
             response.sendRedirect("/appmgt/site/pages/index.jag");
             createTenantInfoObject();
-	    putUserRolesToSession(ssoRelyingParty.getLoggedInUser(sessionId));
+            putUserRolesToSession(ssoRelyingParty.getLoggedInUser(sessionId));
+            return;
         } else {
             // if the saml response is log out request from IDP, we log out from web app.
             ssoRelyingParty.invalidateSessionBySessionId(sessionId);

modules/jaggery-apps/appmgt/src/jagg/locale_en.json

@@ -1,7 +1,7 @@
 {
     "sections":{
         "applicationHome":{
-            "helpTips":{"appDescription":"Click to edit the application's description","productionUrl":"Edit the application’s subdomain to complete the production URL","appIcon":"Click on the icon to change it","launch":"Click the buttons associated with each application version to deploy and launch it","teamAndResources":"Shown below is the summary of team members and resources allocated to this application"}
+            "helpTips":{"appDescription":"Click to edit the application's description","productionUrlViewOnly":"This URL will be assigned to a branch once it is promoted to production.","productionUrl":"Edit the application’s subdomain to complete the production URL.","appIcon":"Click on the icon to change it","launch":"Click the buttons associated with each application version to deploy and launch it","teamAndResources":"Shown below is the summary of team members and resources allocated to this application"}
         },
         "team":{
             "description":{"roles":"appowner,developer,qa,devops,cxo", "details":{ "msg":"", "subMsg":"The team members participating in the current application are listed here."} },
@@ -24,20 +24,24 @@
         },
         "memberAddition":{
             "addMember":{"roles":"appowner", "details":{ "msg":"", "subMsg":"You can type in the member name in the box below to add to the list. To get access, the member accounts need to already exist in the organization. </p>To add new members to the organization to change roles of existing members, please go to the <a href=www.google.lk> organisation page</a> instead.", } },
-            "helpTips":{"addMemberHelp":"Enter the member's user name. Click <link> to see your organization's members."}
+            "helpTips":{"addMemberHelp":"Enter the member's user name."}
         },
         "resourcesOverview":{
-            "description":{"roles":"appowner,developer,qa,devops,cxo", "details":{ "msg":"", "subMsg":"Manage databases, APIs and properties (name,value pairs) across all stages using this section.<p> Use a single name within your application to refer to a resource whose value will change from stage to stage.<p> Code snippets are given in each section to be used in the application. Read more <a href=https://docs.wso2.org/display/AF200/WSO2+App+Factory+Documentation target=_blank>here<a>."} },
-            "helpTips":{"databaseHelp":"Datasources created for this application are listed below.","apiHelp":"APIs created for this application are listed below.","propertyHelp":"Property resources created for this application are listed below","userRealmHelp":"Selecting this option enables this application to use user realm services from within the application","noDatabases":"Databases have not been created yet.","noAPIs":"No APIs have been subscribed to yet.","noProperties":"Property resources have not been created yet."}
+            "description":{"roles":"appowner,developer,qa,devops,cxo", "details":{ "msg":"", "subMsg":"<p> Use a single name within your application to refer to a resource whose value will change from stage to stage.<p> Code snippets are given in each section to be used in the application. Read more <a href=https://docs.wso2.org/display/AF200/WSO2+App+Factory+Documentation target=_blank>here<a>."} },
+            "helpTips":{"datasourceHelp":"Datasources created for this application are listed below.","apiHelp":"APIs created for this application are listed below.","propertyHelp":"Property resources created for this application are listed below","userRealmHelp":"Selecting this option enables this application to use user realm services from within the application","noDatasources":"Datasources have not been created yet.","noAPIs":"No APIs have been subscribed to yet.","noProperties":"Property resources have not been created yet."}
         },
         "resources-databases":{
             "description":{"roles":"appowner,developer,qa,devops,cxo", "details":{ "msg":"", "subMsg":"Create/update and delete datasources, databases, database users and permission templates."} },
             "helpTips":{"datasourceHelp":"Listed below are the datasources that were created for the databases used within this application","databaseHelp":"Listed below are the databases that were created for this application","databaseUserHelp":"Database users created here can be used with existing databases or new ones created for this application.","permissionTemplateHelp":"Permission templates can be created only by members who have permission to access all the stages.<br> Templates created here can be used with existing databases or new ones created for this application."}
         },
+        "databases": {
+            "description": {"roles": "appowner,developer,qa,devops,cxo", "details": {"msg": "", "subMsg": "Create/update and delete MySQL databases, database users and permission templates."} }
+        },
         "add-databases":{
             "helpTips":{"createInAllEnvsHelp":"Select this option to create this database in all environments of the application"}
         },
         "resources-datasources":{
+            "description":{"roles":"appowner,developer,qa,devops,cxo", "details":{ "msg":"", "subMsg":" This datasource uses a unique name but is registered with different connection details across different stages of the application lifecycle."} },
             "helpTips":{"datasourceHelp":"Shown below are the datasource that were created for the databases within this application space"}
         },
         "resources-apis":{

modules/jaggery-apps/appmgt/src/jagg/sessionDestroyedListener.js

@@ -1,4 +1,20 @@
-
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. 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.
+ */
 include("/jagg/jagg.jag");
 include("/jagg/constants.jag");
 include("/jagg/config_reader.jag");