You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/04/04 08:19:57 UTC

[19/33] Removed autoscaler, cloud-controller and stratos-manager products

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Util.java
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Util.java b/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Util.java
deleted file mode 100644
index 904537f..0000000
--- a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Util.java
+++ /dev/null
@@ -1,264 +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.
- */
-package org.apache.stratos.manager.services.mgt.util;
-
-import org.wso2.carbon.registry.core.Collection;
-import org.wso2.carbon.registry.core.RegistryConstants;
-import org.wso2.carbon.registry.core.Resource;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.registry.core.session.UserRegistry;
-import org.apache.stratos.common.config.CloudServiceConfig;
-import org.apache.stratos.common.config.CloudServicesDescConfig;
-import org.apache.stratos.common.config.PermissionConfig;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.common.util.CommonUtil;
-import org.wso2.carbon.user.api.RealmConfiguration;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.user.core.tenant.TenantManager;
-import org.wso2.carbon.user.mgt.UserMgtConstants;
-import org.wso2.carbon.utils.CarbonUtils;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.activation.MimetypesFileTypeMap;
-
-public class Util {
-
-    private static final Log log = LogFactory.getLog(Util.class);
-
-    private static final String CONFIG_FILENAME = "cloud-services-desc.xml";
-
-    private static RegistryService registryService;
-    private static RealmService realmService;
-    private static CloudServicesDescConfig cloudServicesDescConfig = null;
-
-    public static synchronized void setRegistryService(RegistryService service) {
-        if ((registryService == null) || (service == null)) {
-            registryService = service;
-        }
-    }
-
-    public static RegistryService getRegistryService() {
-        return registryService;
-    }
-
-    public static synchronized void setRealmService(RealmService service) {
-        if ((realmService == null) || (service == null)) {
-            realmService = service;
-        }
-    }
-
-    public static RealmService getRealmService() {
-        return realmService;
-    }
-
-    public static TenantManager getTenantManager() {
-        return realmService.getTenantManager();
-    }
-
-    public static RealmConfiguration getBootstrapRealmConfiguration() {
-        return realmService.getBootstrapRealmConfiguration();
-    }
-
-    public static UserRegistry getTenantZeroSystemGovernanceRegistry() throws RegistryException {
-        return registryService.getGovernanceSystemRegistry();
-    }
-
-    public static UserRegistry getSystemGovernanceRegistry(int tenantId) throws RegistryException {
-        return registryService.getGovernanceSystemRegistry(tenantId);
-    }
-
-    public static UserRegistry getSystemConfigRegistry(int tenantId) throws RegistryException {
-        return registryService.getConfigSystemRegistry(tenantId);
-    }
-
-    public static void loadCloudServicesConfiguration() throws Exception {
-        // now load the cloud services configuration
-        String configFileName =
-                CarbonUtils.getCarbonConfigDirPath() + File.separator + StratosConstants.MULTITENANCY_CONFIG_FOLDER +
-                        File.separator+ CONFIG_FILENAME;
-        OMElement configElement;
-        try {
-            configElement = CommonUtil.buildOMElement(new FileInputStream(configFileName));
-        } catch (Exception e) {
-            String msg = "Error in building the cloud service configuration. config filename: " +
-                            configFileName + ".";
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-        cloudServicesDescConfig = new CloudServicesDescConfig(configElement);
-    }
-
-    public static CloudServicesDescConfig getCloudServicesDescConfig() {
-        return cloudServicesDescConfig;
-    }
-
-    public static CloudServiceConfig getCloudServiceConfig(String cloudServiceName) {
-        Map<String, CloudServiceConfig> cloudServiceConfigs =
-                cloudServicesDescConfig.getCloudServiceConfigs();
-        return cloudServiceConfigs.get(cloudServiceName);
-    }
-
-    public static void setCloudServiceActive(boolean active, String cloudServiceName, 
-                                             int tenantId)throws Exception {
-        CloudServiceConfig cloudServiceConfig = getCloudServiceConfig(cloudServiceName);
-        if (cloudServiceConfig.getLabel() == null) {
-            // for the non-labeled services, we are not setting/unsetting the service active
-            return;
-        }
-
-        UserRegistry tenantZeroSystemGovernanceRegistry;
-        UserRegistry systemConfigRegistry;
-        try {
-            tenantZeroSystemGovernanceRegistry = Util.getTenantZeroSystemGovernanceRegistry();
-            systemConfigRegistry = Util.getSystemConfigRegistry(tenantId);
-        } catch (RegistryException e) {
-            String msg = "Error in getting the tenant 0 system config registry";
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-
-        String cloudServiceInfoPath =
-                Constants.CLOUD_SERVICE_INFO_STORE_PATH + RegistryConstants.PATH_SEPARATOR +
-                        tenantId + RegistryConstants.PATH_SEPARATOR + cloudServiceName;
-        Resource cloudServiceInfoResource;
-        if (tenantZeroSystemGovernanceRegistry.resourceExists(cloudServiceInfoPath)) {
-            cloudServiceInfoResource = tenantZeroSystemGovernanceRegistry.get(cloudServiceInfoPath);
-        } else {
-            cloudServiceInfoResource = tenantZeroSystemGovernanceRegistry.newCollection();
-        }
-        cloudServiceInfoResource.setProperty(Constants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY,
-                active ? "true" : "false");
-        tenantZeroSystemGovernanceRegistry.put(cloudServiceInfoPath, cloudServiceInfoResource);
-
-        // then we will copy the permissions
-        List<PermissionConfig> permissionConfigs = cloudServiceConfig.getPermissionConfigs();
-        for (PermissionConfig permissionConfig : permissionConfigs) {
-            String path = permissionConfig.getPath();
-            String name = permissionConfig.getName();
-            if (active) {
-                if (!systemConfigRegistry.resourceExists(path)) {
-                    Collection collection = systemConfigRegistry.newCollection();
-                    collection.setProperty(UserMgtConstants.DISPLAY_NAME, name);
-                    systemConfigRegistry.put(path, collection);
-                }
-            } else {
-                if (systemConfigRegistry.resourceExists(path)) {
-                    systemConfigRegistry.delete(path);
-                }
-            }
-        }
-    }
-
-    public static boolean isCloudServiceActive(String cloudServiceName, 
-                                               int tenantId)throws Exception {
-        UserRegistry systemGovernanceRegistry;
-        try {
-            systemGovernanceRegistry = Util.getTenantZeroSystemGovernanceRegistry();
-        } catch (RegistryException e) {
-            String msg = "Error in getting the tenant 0 system config registry";
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-
-        String cloudServiceInfoPath =
-                Constants.CLOUD_SERVICE_INFO_STORE_PATH + RegistryConstants.PATH_SEPARATOR +
-                        tenantId + RegistryConstants.PATH_SEPARATOR + cloudServiceName;
-        
-        if (systemGovernanceRegistry.resourceExists(cloudServiceInfoPath)) {
-            Resource cloudServiceInfoResource = systemGovernanceRegistry.get(cloudServiceInfoPath);
-            String isActiveStr = cloudServiceInfoResource.getProperty(
-                    Constants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY);
-            return "true".equals(isActiveStr);
-        }
-        
-        return false;
-    }
-
-    /**
-     * Currently this is not used, as the icons are loaded from the webapps
-     * 
-     * @throws Exception
-     */
-    public static void loadServiceIcons() throws Exception {
-        String serviceIconDirLocation =
-                CarbonUtils.getCarbonHome() + "/resources/cloud-service-icons";
-        File serviceIconDirDir = new File(serviceIconDirLocation);
-        UserRegistry registry = getTenantZeroSystemGovernanceRegistry();
-        try {
-            // adding the common media types
-            Map<String, String> extensionToMediaTypeMap = new HashMap<String, String>();
-            extensionToMediaTypeMap.put("gif", "img/gif");
-            extensionToMediaTypeMap.put("jpg", "img/gif");
-            extensionToMediaTypeMap.put("png", "img/png");
-
-            File[] filesAndDirs = serviceIconDirDir.listFiles();
-            if (filesAndDirs == null) {
-                return;
-            }
-            List<File> filesDirs = Arrays.asList(filesAndDirs);
-
-            for (File file : filesDirs) {
-                String filename = file.getName();
-                String fileRegistryPath = Constants.CLOUD_SERVICE_ICONS_STORE_PATH +
-                                RegistryConstants.PATH_SEPARATOR + filename;
-
-                // Add the file to registry
-                Resource newResource = registry.newResource();
-                String mediaType = null;
-                if (filename.contains(".")) {
-                    String fileExt = filename.substring(filename.lastIndexOf(".") + 1);
-                    mediaType = extensionToMediaTypeMap.get(fileExt.toLowerCase());
-                }
-                if (mediaType == null) {
-                    mediaType = new MimetypesFileTypeMap().getContentType(file);
-                }
-                newResource.setMediaType(mediaType);
-                newResource.setContentStream(new FileInputStream(file));
-                registry.put(fileRegistryPath, newResource);
-            }
-        } catch (Exception e) {
-            String msg = "Error loading icons to the system registry for registry path: " +
-                            Constants.CLOUD_SERVICE_ICONS_STORE_PATH;
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-
-        try {
-            CommonUtil.setAnonAuthorization(RegistryConstants.GOVERNANCE_REGISTRY_BASE_PATH + 
-                    Constants.CLOUD_SERVICE_ICONS_STORE_PATH, registry.getUserRealm());
-        } catch (RegistryException e) {
-            String msg = "Setting the annon access enabled for the services icons paths.";
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/cloud-service-mgt/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/cloud-service-mgt/src/main/resources/META-INF/component.xml b/products/stratos-manager/modules/cloud-service-mgt/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 29bdc6b..0000000
--- a/products/stratos-manager/modules/cloud-service-mgt/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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.
-  -->
-
-<component xmlns="http://products.wso2.org/carbon">
-    <ManagementPermissions>
-        <ManagementPermission>
-            <DisplayName>Configure</DisplayName>
-            <ResourceId>/permission/admin/configure</ResourceId>
-        </ManagementPermission>
-        <ManagementPermission>
-            <DisplayName>Cloud-Services</DisplayName>
-            <ResourceId>/permission/admin/configure/cloud-services</ResourceId>
-        </ManagementPermission>
-   </ManagementPermissions>
-</component>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/cloud-service-mgt/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/cloud-service-mgt/src/main/resources/META-INF/services.xml b/products/stratos-manager/modules/cloud-service-mgt/src/main/resources/META-INF/services.xml
deleted file mode 100644
index efc772e..0000000
--- a/products/stratos-manager/modules/cloud-service-mgt/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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.
-  -->
-<serviceGroup>
-    <service name="CloudManagerService" scope="transportsession">
-        <transports>
-            <transport>https</transport>
-        </transports>
-        <parameter name="ServiceClass" locked="false">
-            org.apache.stratos.manager.services.mgt.services.CloudManagerService
-        </parameter>
-        <operation name="retrieveCloudServiceInfo">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/login</parameter>
-        </operation>
-        <operation name="saveCloudServicesActivity">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/cloud-services</parameter>
-        </operation>
-        <operation name="activate">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/cloud-services</parameter>
-        </operation>
-        <operation name="deactivate">
-            <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/cloud-services</parameter>
-        </operation>
-    </service>
-    <parameter name="adminService" locked="true">true</parameter>
-    <parameter name="hiddenService" locked="true">true</parameter>
-</serviceGroup>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/pom.xml b/products/stratos-manager/modules/dashboard/pom.xml
deleted file mode 100644
index 665378c..0000000
--- a/products/stratos-manager/modules/dashboard/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-	<groupId>org.apache.stratos</groupId>
-	<artifactId>stratos-manager-parent</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.manager.dashboard.ui</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache Stratos - Cloud Manager Dashboard User Interface</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.apache.stratos.manager.dashboard.ui.*,
-                        </Export-Package>
-                        <Import-Package>
-                            org.wso2.carbon.ui.servlets.*,
-                            javax.servlet; version=2.4.0,
-                            javax.servlet.http; version=2.4.0,
-                            org.apache.lucene.*,
-                            *;resolution:=optional
-                        </Import-Package>
-                        <Carbon-Component>UIBundle</Carbon-Component>
-                    </instructions>
-                </configuration>
-            </plugin>
-            
-        </plugins>
-    </build>
-
-   
-    <dependencies>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.common.ui</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.core</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2.wso2</groupId>
-            <artifactId>axis2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-            <artifactId>axiom</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ui</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.core</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.profiles.ui</artifactId>
-            <version>${registry-component.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.resource.ui</artifactId>
-            <version>${governance-component.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.account.mgt.ui</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.manager.dashboard.stub</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <eclipse.version>3.2.0</eclipse.version>
-        <!-- Component versions == Carbon version, if not, please change the properties below. -->
-        <registry-component.version>4.2.0</registry-component.version>
-       <governance-component.version>4.2.0</governance-component.version>
-    </properties>
-
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java b/products/stratos-manager/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
deleted file mode 100644
index cdd9b16..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
+++ /dev/null
@@ -1,125 +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.
- */
-package org.apache.stratos.manager.dashboard.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.context.CarbonContext;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-import org.apache.stratos.manager.dashboard.stub.CloudManagerServiceStub;
-import org.apache.stratos.manager.dashboard.stub.xsd.CloudService;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpSession;
-
-public class CloudManagerServiceClient {
-     private static final Log log = LogFactory.getLog(CloudManagerServiceClient.class);
-
-    private CloudManagerServiceStub stub;
-    private String epr;
-    public static final String CLOUD_SERVICE = "cloudService";
-
-    public CloudManagerServiceClient(
-            String cookie, String backendServerURL, ConfigurationContext configContext)
-            throws RegistryException {
-
-        epr = backendServerURL + "CloudManagerService";
-
-        try {
-            stub = new CloudManagerServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg = "Failed to initiate AddServices service client. " + axisFault.getMessage();
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public CloudManagerServiceClient(ServletRequest request, ServletConfig config, HttpSession session)
-            throws RegistryException {
-
-        String cookie = (String)session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-        String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-        ConfigurationContext configContext = (ConfigurationContext) config.
-                getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-        epr = backendServerURL + "CloudManagerService";
-
-        try {
-            stub = new CloudManagerServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg = "Failed to initiate Add Services service client. " + axisFault.getMessage();
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public CloudService[] retrieveCloudServiceInfo() throws Exception {
-        /*try {
-            if (CarbonContext.getCurrentContext().getCache(null).containsKey(CLOUD_SERVICE)) {
-                return (CloudService[]) CarbonContext.getCurrentContext()
-                        .getCache(null).get(CLOUD_SERVICE);
-            }
-        } catch (Exception ignored) {
-            // TODO: this exception needs not be handled, but the situation which leads to this
-            // exception needs to be.
-        }
-        CloudService[] cloudServices = stub.retrieveCloudServiceInfo();
-        CarbonContext.getCurrentContext().getCache(null).put(CLOUD_SERVICE, cloudServices);
-        return cloudServices;*/
-    	return null;
-    }
-
-
-    public void saveCloudServicesActivity(String[] activeServiceNames) throws Exception {
-       /* CloudService[] cloudServices =
-                (CloudService[]) CarbonContext.getCurrentContext().getCache(null).get(CLOUD_SERVICE);
-
-        for (CloudService cloudService : cloudServices) {
-            for (String activeService : activeServiceNames) {
-                if (cloudService.getName().equals(activeService)) {
-                    cloudService.setActive(true);
-                    break;
-                } else {
-                    cloudService.setActive(false);
-                }
-            }
-        }
-
-        stub.saveCloudServicesActivity(activeServiceNames);*/
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/utils/Util.java
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/utils/Util.java b/products/stratos-manager/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/utils/Util.java
deleted file mode 100644
index 9d3e1a1..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/utils/Util.java
+++ /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.
- */
-package org.apache.stratos.manager.dashboard.ui.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Util {
-    public static List<String> getNewlyActivatedServices(List<String> oldActivateServices,
-                                                  List<String> newActivateServices) {
-        List<String> newlyActivatedServices = new ArrayList<String>();
-        for (String service: newActivateServices) {
-            if (!oldActivateServices.contains(service)) {
-                newlyActivatedServices.add(service);
-            }
-        }
-        return newlyActivatedServices;
-    }
-    public static List<String> getNewlyDeactivatedServices(List<String> oldActivateServices,
-                                                  List<String> newActivateServices) {
-        List<String> newlyDeactivatedServices = new ArrayList<String>();
-        for (String service: oldActivateServices) {
-            if (!newActivateServices.contains(service)) {
-                newlyDeactivatedServices.add(service);
-            }
-        }
-        return newlyDeactivatedServices;
-    }
-
-   
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/CloudManagerService.wsdl
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/CloudManagerService.wsdl b/products/stratos-manager/modules/dashboard/src/main/resources/CloudManagerService.wsdl
deleted file mode 100644
index ff3fc7b..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/CloudManagerService.wsdl
+++ /dev/null
@@ -1,331 +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.
-  -->
-
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd"
-                  xmlns:ns="http://services.mgt.services.manager.stratos.apache.org"
-                  xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-                  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-                  xmlns:ax2298="http://beans.mgt.services.manager.stratos.apache.org/xsd"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-                  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-                  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-                  targetNamespace="http://services.mgt.services.manager.stratos.apache.org">
-    <wsdl:documentation>CloudManagerService</wsdl:documentation>
-    <wsdl:types>
-        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified"
-                   targetNamespace="http://beans.mgt.services.manager.stratos.apache.org/xsd">
-            <xs:complexType name="CloudService">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="active" type="xs:boolean"/>
-                    <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="icon" nillable="true" type="xs:string"/>
-
-                    <xs:element minOccurs="0" name="label" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="link" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="productPageURL" nillable="true" type="xs:string"/>
-                </xs:sequence>
-            </xs:complexType>
-        </xs:schema>
-        <xs:schema xmlns:ax2299="http://beans.mgt.services.manager.stratos.apache.org/xsd"
-                   attributeFormDefault="qualified" elementFormDefault="qualified"
-                   targetNamespace="http://services.mgt.services.manager.stratos.apache.org">
-            <xs:import namespace="http://beans.mgt.services.manager.stratos.apache.org/xsd"/>
-
-            <xs:element name="CloudManagerServiceException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="CloudManagerServiceException" nillable="true"
-                                    type="ns:Exception"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:complexType name="Exception">
-                <xs:sequence>
-
-                    <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string"/>
-                </xs:sequence>
-            </xs:complexType>
-            <xs:element name="saveCloudServicesActivity">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="activeServiceNames" nillable="true"
-                                    type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-
-            </xs:element>
-            <xs:element name="retrieveCloudServiceInfo">
-                <xs:complexType>
-                    <xs:sequence/>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="retrieveCloudServiceInfoResponse">
-                <xs:complexType>
-                    <xs:sequence>
-
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true"
-                                    type="ax2299:CloudService"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="deactivate">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="cloudServiceName" nillable="true" type="xs:string"/>
-                    </xs:sequence>
-
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="activate">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="cloudServiceName" nillable="true" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="saveCloudServicesActivityRequest">
-        <wsdl:part name="parameters" element="ns:saveCloudServicesActivity"/>
-    </wsdl:message>
-    <wsdl:message name="saveCloudServicesActivityResponse"/>
-    <wsdl:message name="CloudManagerServiceException">
-        <wsdl:part name="parameters" element="ns:CloudManagerServiceException"/>
-    </wsdl:message>
-
-    <wsdl:message name="activateRequest">
-        <wsdl:part name="parameters" element="ns:activate"/>
-    </wsdl:message>
-    <wsdl:message name="activateResponse"/>
-    <wsdl:message name="retrieveCloudServiceInfoRequest">
-        <wsdl:part name="parameters" element="ns:retrieveCloudServiceInfo"/>
-    </wsdl:message>
-    <wsdl:message name="retrieveCloudServiceInfoResponse">
-        <wsdl:part name="parameters" element="ns:retrieveCloudServiceInfoResponse"/>
-
-    </wsdl:message>
-    <wsdl:message name="deactivateRequest">
-        <wsdl:part name="parameters" element="ns:deactivate"/>
-    </wsdl:message>
-    <wsdl:message name="deactivateResponse"/>
-    <wsdl:portType name="CloudManagerServicePortType">
-        <wsdl:operation name="saveCloudServicesActivity">
-            <wsdl:input message="ns:saveCloudServicesActivityRequest" wsaw:Action="urn:saveCloudServicesActivity"/>
-            <wsdl:output message="ns:saveCloudServicesActivityResponse"
-                         wsaw:Action="urn:saveCloudServicesActivityResponse"/>
-
-            <wsdl:fault message="ns:CloudManagerServiceException" name="CloudManagerServiceException"
-                        wsaw:Action="urn:saveCloudServicesActivityCloudManagerServiceException"/>
-        </wsdl:operation>
-        <wsdl:operation name="activate">
-            <wsdl:input message="ns:activateRequest" wsaw:Action="urn:activate"/>
-            <wsdl:output message="ns:activateResponse" wsaw:Action="urn:activateResponse"/>
-            <wsdl:fault message="ns:CloudManagerServiceException" name="CloudManagerServiceException"
-                        wsaw:Action="urn:activateCloudManagerServiceException"/>
-        </wsdl:operation>
-        <wsdl:operation name="retrieveCloudServiceInfo">
-            <wsdl:input message="ns:retrieveCloudServiceInfoRequest" wsaw:Action="urn:retrieveCloudServiceInfo"/>
-
-            <wsdl:output message="ns:retrieveCloudServiceInfoResponse"
-                         wsaw:Action="urn:retrieveCloudServiceInfoResponse"/>
-            <wsdl:fault message="ns:CloudManagerServiceException" name="CloudManagerServiceException"
-                        wsaw:Action="urn:retrieveCloudServiceInfoCloudManagerServiceException"/>
-        </wsdl:operation>
-        <wsdl:operation name="deactivate">
-            <wsdl:input message="ns:deactivateRequest" wsaw:Action="urn:deactivate"/>
-            <wsdl:output message="ns:deactivateResponse" wsaw:Action="urn:deactivateResponse"/>
-            <wsdl:fault message="ns:CloudManagerServiceException" name="CloudManagerServiceException"
-                        wsaw:Action="urn:deactivateCloudManagerServiceException"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="CloudManagerServiceSoap11Binding" type="ns:CloudManagerServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <wsdl:operation name="saveCloudServicesActivity">
-            <soap:operation soapAction="urn:saveCloudServicesActivity" style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-
-            </wsdl:output>
-            <wsdl:fault name="CloudManagerServiceException">
-                <soap:fault use="literal" name="CloudManagerServiceException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="activate">
-            <soap:operation soapAction="urn:activate" style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="CloudManagerServiceException">
-                <soap:fault use="literal" name="CloudManagerServiceException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="retrieveCloudServiceInfo">
-
-            <soap:operation soapAction="urn:retrieveCloudServiceInfo" style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="CloudManagerServiceException">
-                <soap:fault use="literal" name="CloudManagerServiceException"/>
-
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="deactivate">
-            <soap:operation soapAction="urn:deactivate" style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-
-            </wsdl:output>
-            <wsdl:fault name="CloudManagerServiceException">
-                <soap:fault use="literal" name="CloudManagerServiceException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="CloudManagerServiceSoap12Binding" type="ns:CloudManagerServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-        <wsdl:operation name="saveCloudServicesActivity">
-
-            <soap12:operation soapAction="urn:saveCloudServicesActivity" style="document"/>
-            <wsdl:input>
-                <soap12:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="CloudManagerServiceException">
-                <soap12:fault use="literal" name="CloudManagerServiceException"/>
-
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="activate">
-            <soap12:operation soapAction="urn:activate" style="document"/>
-            <wsdl:input>
-                <soap12:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal"/>
-
-            </wsdl:output>
-            <wsdl:fault name="CloudManagerServiceException">
-                <soap12:fault use="literal" name="CloudManagerServiceException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="retrieveCloudServiceInfo">
-            <soap12:operation soapAction="urn:retrieveCloudServiceInfo" style="document"/>
-            <wsdl:input>
-                <soap12:body use="literal"/>
-
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="CloudManagerServiceException">
-                <soap12:fault use="literal" name="CloudManagerServiceException"/>
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="deactivate">
-
-            <soap12:operation soapAction="urn:deactivate" style="document"/>
-            <wsdl:input>
-                <soap12:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="CloudManagerServiceException">
-                <soap12:fault use="literal" name="CloudManagerServiceException"/>
-
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="CloudManagerServiceHttpBinding" type="ns:CloudManagerServicePortType">
-        <http:binding verb="POST"/>
-        <wsdl:operation name="saveCloudServicesActivity">
-            <http:operation location="saveCloudServicesActivity"/>
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters"/>
-
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="activate">
-            <http:operation location="activate"/>
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters"/>
-
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="retrieveCloudServiceInfo">
-            <http:operation location="retrieveCloudServiceInfo"/>
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters"/>
-
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="deactivate">
-            <http:operation location="deactivate"/>
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters"/>
-
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CloudManagerService">
-        <wsdl:port name="CloudManagerServiceHttpsSoap11Endpoint" binding="ns:CloudManagerServiceSoap11Binding">
-            <soap:address
-                    location="https://10.100.0.26:9443/services/CloudManagerService.CloudManagerServiceHttpsSoap11Endpoint/"/>
-
-        </wsdl:port>
-        <wsdl:port name="CloudManagerServiceHttpsSoap12Endpoint" binding="ns:CloudManagerServiceSoap12Binding">
-            <soap12:address
-                    location="https://10.100.0.26:9443/services/CloudManagerService.CloudManagerServiceHttpsSoap12Endpoint/"/>
-        </wsdl:port>
-        <wsdl:port name="CloudManagerServiceHttpsEndpoint" binding="ns:CloudManagerServiceHttpBinding">
-            <http:address
-                    location="https://10.100.0.26:9443/services/CloudManagerService.CloudManagerServiceHttpsEndpoint/"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/META-INF/component.xml b/products/stratos-manager/modules/dashboard/src/main/resources/META-INF/component.xml
deleted file mode 100644
index e127fda..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,36 +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.
-  -->
-<component xmlns="http://products.wso2.org/carbon">
-    <!-- sample menu configuration -->
-    <menus>
-        <menu>
-            <id>mt_cloud_services_configurations</id>
-            <i18n-key>cloud.services.configurations</i18n-key>
-            <i18n-bundle>org.apache.stratos.manager.dashboard.ui.i18n.Resources</i18n-bundle>
-            <parent-menu>configure_menu</parent-menu>
-            <link>../tenant-dashboard/cloud_services_configuration.jsp</link>
-            <region>region1</region>
-            <icon>../tenant-dashboard/images/service-configuration.gif</icon>
-            <order>40</order>
-            <style-class>home</style-class>
-            <require-permission>/permission/admin/configure/cloud-services</require-permission>
-            <require-not-super-tenant>true</require-not-super-tenant>
-        </menu>
-    </menus>
-</component>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/org/apache/stratos/manager/dashboard/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/org/apache/stratos/manager/dashboard/ui/i18n/JSResources.properties b/products/stratos-manager/modules/dashboard/src/main/resources/org/apache/stratos/manager/dashboard/ui/i18n/JSResources.properties
deleted file mode 100644
index a86aac2..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/org/apache/stratos/manager/dashboard/ui/i18n/JSResources.properties
+++ /dev/null
@@ -1,24 +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.
-#
-#
-
-password.mismatched=Passwords do not match.
-current.password.should.provided=You should provide the current password inorder to change the password.
-session.timed.out=Session timed out.

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/org/apache/stratos/manager/dashboard/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/org/apache/stratos/manager/dashboard/ui/i18n/Resources.properties b/products/stratos-manager/modules/dashboard/src/main/resources/org/apache/stratos/manager/dashboard/ui/i18n/Resources.properties
deleted file mode 100644
index 7747ca8..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/org/apache/stratos/manager/dashboard/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,24 +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.
-#
-#
-
-cloud.services.configurations=Services
-activate.your.cloud.services=Activate your Cloud Services
-cloud.services=Cloud Services

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/cloud_services_configuration.jsp
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/cloud_services_configuration.jsp b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/cloud_services_configuration.jsp
deleted file mode 100644
index 180fc20..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/cloud_services_configuration.jsp
+++ /dev/null
@@ -1,204 +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.
---%>
-<%@ page import="org.apache.stratos.manager.dashboard.ui.clients.CloudManagerServiceClient" %>
-<%@ page import="org.apache.stratos.manager.dashboard.stub.xsd.CloudService" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.apache.stratos.account.mgt.ui.clients.AccountMgtClient" %>
-<%@ page import="org.apache.stratos.common.constants.StratosConstants" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="org.apache.stratos.manager.dashboard.ui.utils.Util" %>
-<%@ page import="org.wso2.carbon.utils.multitenancy.MultitenantConstants" %>
-
-
-<jsp:include page="../registry_common/registry_common-i18n-ajaxprocessor.jsp"/>
-<script type="text/javascript" src="../registry_common/js/registry_validation.js"></script>
-<script type="text/javascript" src="../registry_common/js/registry_common.js"></script>
-<script type="text/javascript" src="../ajax/js/prototype.js"></script>
-<script type="text/javascript" src="../tenant-dashboard/js/dashboard.js"></script>
-<link href="../tenant-dashboard/css/dashboard.css" rel="stylesheet" type="text/css" media="all"/>
-
-
-<%
-
-    CloudManagerServiceClient cloudManagerClient;
-    CloudService[] cloudServices = null;
-    String error = "Error in getting the available and active service details.";
-    try {
-        cloudManagerClient = new CloudManagerServiceClient(request, config, session);
-        cloudServices = cloudManagerClient.retrieveCloudServiceInfo();
-    } catch (Exception e) {
-        request.setAttribute(CarbonUIMessage.ID, new CarbonUIMessage(error,error,null)); 
-%>
-        <jsp:include page="../admin/error.jsp?<%=error%>"/>
-<%
-        return;
-    }
-%>
-<fmt:bundle basename="org.apache.stratos.manager.dashboard.ui.i18n.Resources">
-<carbon:jsi18n
-        resourceBundle="org.apache.stratos.manager.dashboard.ui.i18n.JSResources"
-        request="<%=request%>" namespace="org.apache.stratos.manager.dashboard.ui"/>
-
-<div id="middle">
-<h2><fmt:message key="activate.your.cloud.services"/></h2>
-<div id="workArea">
-<%
-// if the account management permission there, we are showing the message to validate email address
-if (CarbonUIUtil.isUserAuthorized(request, "/permission/admin/configure/account")) {
-
-    AccountMgtClient client = new AccountMgtClient(config, session);
-    boolean isEmailValidated = client.isEmailValidated();
-
-    if (!isEmailValidated) {
-%>
-
-<div class="green-note">Your organization has not validated the contact email address yet. Please validate it following
-the instructions in the <a href="../account-mgt/account_mgt.jsp">Account Management</a> page (Accessible from Configure-&gt;Account menu). </div>
-<%
-    }
-}
-String tenantDomain = null;
-if (session.getAttribute(MultitenantConstants.TENANT_DOMAIN) != null) {
-    tenantDomain = (String)session.getAttribute(MultitenantConstants.TENANT_DOMAIN);
-} else {
-    // user is not logged in or just logged out, but still they are inside url own to the domain
-    tenantDomain = (String)request.getAttribute(MultitenantConstants.TENANT_DOMAIN);
-}
-String linkSuffix = "";
-    if (tenantDomain != null) {
-        linkSuffix = "/" + MultitenantConstants.TENANT_AWARE_URL_PREFIX + "/" + tenantDomain;
-    }
-
-boolean isUserAuthorized = CarbonUIUtil.isUserAuthorized(request, "/permission/admin/configure/cloud-services");    
-%>
-<form id="cloudService" action="cloud_services_save_ajaxprocessor.jsp" method="post">
-<div>
-    <table cellspacing="0" class="tips">
-<%
-    List<String> activeServices = new ArrayList<String>();
-    int index = 1;
-
-    for (CloudService cloudService: cloudServices) {
-        index++;
-        String name = cloudService.getName();       
-        String imagePath = "images/" + name.replace(" ", "-") + "-logo.gif";
-        String projectPageUrl = cloudService.getProductPageURL();
-        String link = cloudService.getLink() + linkSuffix;
-        String icon = cloudService.getIcon();
-        String iconPath = icon.substring(0, icon.lastIndexOf('/'));
-        String iconName = icon.substring(icon.lastIndexOf('/') + 1);
-        String inactiveIcon = iconPath + "/" + "inactive-" + iconName;
-        String description = cloudService.getDescription();
-        String label = cloudService.getLabel();
-        boolean active = name.equals(StratosConstants.CLOUD_IDENTITY_SERVICE) ||
-                name.equals(StratosConstants.CLOUD_GOVERNANCE_SERVICE) ||
-                cloudService.getActive();
-        String disabledStr = (name.equals(StratosConstants.CLOUD_IDENTITY_SERVICE) ||
-                name.equals(StratosConstants.CLOUD_GOVERNANCE_SERVICE))?" disabled ": "";
-        boolean disabledBtn = (name.equals(StratosConstants.CLOUD_IDENTITY_SERVICE) ||
-                name.equals(StratosConstants.CLOUD_GOVERNANCE_SERVICE));
-        if (!isUserAuthorized) {
-            disabledStr = " disabled ";
-        }
-        /*if (name.equals(StratosConstants.CLOUD_ESB_SERVICE)) {
-            active = false;
-            disabledStr = " disabled "; // we show an inactive and disabled link
-        }*/
-        if (active) {
-            activeServices.add(label);
-        }
-%>
-            <tr class="tips-row">
-
-            <td class="tip-checkbox">
-                <input type="checkbox" <%=disabledStr%> <%=active ? " checked=\"true\"" : ""%>
-                       name="cloudServices" id="cloudServices<%=index%>"  value="<%=name%>" style="display:none;"/>
-            </td>
-
-            <td>
-            	<img src="<%=icon%>" class="iconImage">
-                <% if (active) { %>
-            	<a target="_blank" href="<%=link%>" class="linkToService"><%=label%></a>
-                 <% } else { %>
-                <a class="linkToService"><%=label%></a>
-                <% } %>
-
-            </td>
-	<td class="access">
-        <% if (!disabledBtn) { %>          
-                <% if (active) { %>
-                <a target="_blank" input type="button" onclick="document.getElementById('cloudServices<%=index%>').checked=false;onChangeServiceSubscription()" class="deactivate-button"> Deactivate
-                </a>
-                <% } else { %>
-                <a target="_blank" input type="button" onclick="document.getElementById('cloudServices<%=index%>').checked=true;onChangeServiceSubscription()" class="activate-button"> Activate
-                <% } %>
-        <% } %>
-    </td>
-                
-	<td class="powered">Powered by<br/><a href="<%=projectPageUrl%>" target="_blank"><img src="<%=imagePath%>"/></a></td>
-                 </tr>
-               <% index++;
-            } %>
-
-                <td>&nbsp;</td>
-                </tr>
-    </table>
-    </div>
-</form>
-<%
-    List<String> oldActiveServices = (List<String>)session.getAttribute("active-statos-services");
-    if (oldActiveServices != null) {
-        List<String> newlyActivatedServices = Util.getNewlyActivatedServices(oldActiveServices, activeServices);
-        List<String> newlyDeactivatedServices = Util.getNewlyDeactivatedServices(oldActiveServices, activeServices);
-        String msg = null;
-        if (newlyActivatedServices.size() > 0) {
-            msg = "<li>";
-            for (String service: newlyActivatedServices) {
-                msg += "<ul>" + service + " <strong>activated</strong></ul>";
-            }
-            msg += "</li>";
-        }
-        if (newlyDeactivatedServices.size() > 0) {
-            if (msg == null) {
-                msg = "<li>";
-            }
-            for (String service: newlyDeactivatedServices) {
-                msg += "<ul>" + service + " <strong>deactivated</strong></ul>";
-            }
-            msg += "</li>";
-        }
-        if (msg != null) {
-%>
-    <script type="text/javascript">
-        jQuery(document).ready(function() {
-            CARBON.showInfoDialog('<%=msg%>');
-        });
-    </script>
-<%
-        }
-    }
-    session.setAttribute("active-statos-services", activeServices);
-%>
-</div>
-</div>
-</fmt:bundle>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/cloud_services_save_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/cloud_services_save_ajaxprocessor.jsp b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/cloud_services_save_ajaxprocessor.jsp
deleted file mode 100644
index b9e7482..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/cloud_services_save_ajaxprocessor.jsp
+++ /dev/null
@@ -1,35 +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.
-  --%>
-<%@ page import="org.apache.stratos.manager.dashboard.ui.clients.CloudManagerServiceClient" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %><%
-    String[] activeCloudServiceNames = request.getParameterValues("cloudServices");
-
-    String error = "Error in saving the results of the activities";
-    try {
-        CloudManagerServiceClient cloudServiceClient = new CloudManagerServiceClient(request, config, session);
-        cloudServiceClient.saveCloudServicesActivity(activeCloudServiceNames);
-    } catch (Exception e) {
-        request.setAttribute(CarbonUIMessage.ID, new CarbonUIMessage(error,error,null));
-%>
-        <jsp:include page="../admin/error.jsp?<%=error%>"/>
-<%
-        return;
-    }
-    response.sendRedirect("../tenant-dashboard/cloud_services_configuration.jsp");
-%>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/css/dashboard.css
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/css/dashboard.css b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/css/dashboard.css
deleted file mode 100644
index af1eb5e..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/css/dashboard.css
+++ /dev/null
@@ -1,252 +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.
- *
-*/
-
-div.dashboard-clear {
-    clear:both;
-    margin-top:5px;
-}
-
-div.dashboard-comp {
-    width: 300px;
-    margin: 5px;
-    float: left;
-    border:1px solid #6997b2;
-    background: #ffffff;
-    height: 300px;
-}
-.dashboard-comp-head{
-background-image:url( ../../admin/images/table-header.gif);
-background-position:left bottom;
-background-repeat:repeat-x;
-font-weight:normal;
-height:22px;
-line-height:22px;
-text-indent:5px;
-font-weight:bold;
-}
-.dashboard-comp-bottom{
-padding-left:5px;
-padding-top:5px;
-}
-.dashboard-comp-msg{
-color:#505050;
-padding:5px;
-}
-
-div.dashboard-comp-body {
-    overflow: auto;
-    max-height: 230px;
-}
-
-div.activity-comp-body {
-    overflow: auto;
-    max-height: 278px;
-}
-table.tips {
-	border-collapse: separate;
-	padding-bottom: 10px;
-	width: 90%;
-}
-table.tips tbody tr.tips-row {
-}
-tr.tips-row td {
-	border-bottom: solid 1px #ccc;
-}
-tr.tips-row td.tip-checkbox {
-	padding-left: 40px;
-	padding-top: 4px;
-	padding-bottom: 4px;
-    border-left: 0px;
-    border-right: 0px;
-    border-top: 0px;
-    vertical-align: top;
-    padding-right:12px !important;
-}
-tr.tips-row td.tip-img {
-	padding-left: 15px;
-	padding-top: 4px;
-	padding-bottom: 4px;
-    border-left: 0px;
-    border-right: 0px;
-    border-top: 0px;
-    vertical-align: top;
-    padding-right:12px !important;
-}
-tr.tips-row td.tip-img a img {
-	border: 0px;
-}
-tr.tips-row td.tip {
-	background-image: url(../images/aas-top.gif);
-	background-repeat: no-repeat;
-	background-position: left 7px;
-    margin: 0px;
-    padding-left: 0px;
-    padding-right: 15px;
-    padding-top: 20px;
-    padding-bottom: 0px;
-    /*border-bottom: 1px solid #aaa;*/
-    border-left: 0px;
-    border-right: 0px;
-    border-top: 0px;
-    vertical-align: top;
-}
-tr.tips-row td.tip img {
-	float: left;
-	margin-top: -20px;
-	margin-left: 17px;
-	margin-right: 12px;
-	margin-bottom: 20px;
-}
-tr.tips-row td.tip h2 {
-    background-color: transparent !important;
-	font-size: 125%;
-	line-height: 125%;
-	margin-top: 0px;
-	margin-bottom: 3px;
-    border:medium none !important;
-    margin-top:3px !important;
-    margin-left: 0px !important;
-    padding-left: 0px !important;
-}
-tr.tips-row td.tip h2 a {
-	font-size:14px;
-    text-decoration:underline;
-}
-tr.tips-row td.tip p {
-	padding-bottom: 15px;
-}
-tr.tips-row td.access {
-	padding-left: 30px;
-	padding-right: 30px;
-	vertical-align: middle;
-}
-tr.tips-row td.access a.go-button {
-	width: 63px;
-	height: 42px;
-	display: block;
-	background-color: #ccc;
-	font-size: 20px;
-	line-height: 40px;
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-	padding-left: 19px;
-	background-image: url(../images/go-button.gif);
-	background-repeat: no-repeat;
-	background-position: left top;
-}
-tr.tips-row td.access span.inactive {
-	width: 63px;
-	height: 42px;
-	display: block;
-	background-color: #ccc;
-	font-size: 20px;
-	line-height: 40px;
-	font-weight: bold;
-	color: #999999;
-	text-decoration: none;
-	padding-left: 19px;
-	background-image: url(../images/inactive-go-button.gif);
-	background-repeat: no-repeat;
-	background-position: left top;
-}
-tr.tips-row td.access a.go-button:hover {
-	color: #0084A9;
-}
-tr.tips-row td.powered {
-	padding-left: 10px;
-	padding-right: 20px;
-	text-align: right;
-	font-size: 12px;
-	line-height: 20px;
-	color: #666666;
-	vertical-align: middle;
-}
-.green-note {
-    color: #f00;
-}
-div#menu ul.main li a.menu-home {
-display:block !important;
-}
-/* service config buttons */
-td.access a.activate-button {
-	width: 98px;
-	height: 42px;
-	cursor: pointer;
-	display: block;
-	background-color: #ccc;
-	font-size: 15px;
-	line-height: 40px;
-	font-weight: normal;
-	color: #000000;
-	text-decoration: none;
-	padding-left: 47px;
-	background-image: url(../images/activate-button.gif);
-	background-repeat: no-repeat;
-	background-position: left top;
-}
-td.access a.activate-button:hover {
-	color: #00853F;
-}
-td.access a.deactivate-button {
-	width: 103px;
-	height: 42px;
-	cursor: pointer;
-	display: block;
-	background-color: #ccc;
-	font-size: 15px;
-	line-height: 40px;
-	font-weight: normal;
-	color: #000000;
-	text-decoration: none;
-	padding-left: 42px;
-	background-image: url(../images/deactivate-button.gif);
-	background-repeat: no-repeat;
-	background-position: left top;
-}
-td.access a.deactivate-button:hover {
-	color: #B5121B;
-}
-.home_tips{
-width:100%;
-}
-.home_tips td{
-border-bottom:solid 1px #ccc;
-padding-bottom:5px !important;
-padding-top:5px !important;
-}
-.home_tips td img{
-vertical-align:middle;
-
-}
-.home_tips td img.iconImage{
-margin-right:10px;
-
-}
-.linkToService{
-color:#0D4D79 !important;
-padding-left:10px !important;
-font-size:18px;
-text-decoration:underline !important;
-}
-.home_tips td.powered{
-text-align:right;
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png
deleted file mode 100644
index 1386a9e..0000000
Binary files a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/userguide-old.html
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/userguide-old.html b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/userguide-old.html
deleted file mode 100644
index e57a9b5..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/userguide-old.html
+++ /dev/null
@@ -1,101 +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.
-  -->
-<html>
-<head>
-    <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"/>
-  <title>Cloud Services - User Guide</title>
-  <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
-<body>
-<p>[<a href="../../issue/viewAccounts.jsp">Issue Tracking</a>]
-            | [<a href="http://wso2.com/cloud/services/privacy-policy">Privacy Policy</a>] | [<a href="http://wso2.com/cloud/services/terms-of-use/">Terms of Use</a>]
-        </p>
-
-<h2><a href="http://wso2.com/cloud/stratos/">Cloud Services Home</a> </h1>
-
-<p>
-Cloud Services Home page provides an interface to access the services of the SOA platform of your organization. Stratos provides a web-based console for provisioning new tenants on the platform, allowing self-service provisioning of any WSO2 Carbon product, and running elastically on your choice of underlying virtualization infrastructure to provide all the PaaS benefits inherent to a cloud-native platform. A list of the services available under WSO2 Stratos for the tenant can be found in the cloud services home.
-</p>
-
-<img src="../../tenant-dashboard/docs/images/dashboard.png"/>
-<p>Figure1: Cloud Services Home Page</p>
-</body>
-
-<h3><a href="http://wso2.com/products/application-server/">Application Server</a></h3>
-<p>
-The WSO2 Application Server is an open source, enterprise-ready, Web services engine based on Apache Axis2. Bringing together a number of Apache Web services projects, WSO2 Application Server provides a secure, transactional and reliable runtime to create, consume, deploy and manage Web services for your SOA. 
-</p>
-
-<h3><a href="http://wso2.com/products/data-services-server/">Data Services Server</a></h3>
-<p>
-The WSO2 Data Services Server, data service tier assures ready access to enterprise data scattered across heterogeneous data sources in a unified manner. Due to the single data layer, benefits of optimizations and availability of more processing power will be visible to every service consumer. Access to real time data provides more accurate, up-to-date information for applications. Further this single interface to enterprise data can greatly help in preserving integrity of frequently modified data. 
-</p>
-
-<h3><a href="http://wso2.com/products/mashup-server/">Mashup Server</a></h3>
-<p>
-The WSO2 Mashup Server provides a platform for rapidly deploying Web service Mashups. Combining simple yet rich mashups with reusability, security, reliability and governance, the WSO2 Mashup Server offers enterprise-class service composition.  
-</p>
-
-<h3><a href="http://wso2.com/products/identity-server/">Identity Server</a></h3>
-<p>
-The WSO2 Identity Server is an open source identity and entitlement management server. It supports Information Cards and OpenID for authentication as well as XACML for fine grained authorization. Providing a complete enterprise ready identity solution, it integrates easily into existing user stores such as LDAP or Active Directory and supports multi-factor authentication and much more. The WSO2 Identity Server helps you build secured SOA in a few very easy steps.
-</p>
-
-<h3><a href="http://wso2.com/products/governance-registry/">Governance Registry</a></h3>
-<p>
-The WSO2 Governance Registry addresses both design-time and runtime governance scenarios, to ensure compliance with corporate standards. It allows enterprise architects and developers to always keep track of the services being created and used within an SOA. 
-</p>
-
-<h3><a href="http://wso2.com/products/gadget-server/">Gadget Server</a></h3>
-<p>
-With the WSO2 Gadget Server, you can offer your execs, employees, partners, or customers a way to get all the information in one place that they need. Each user's dashboard is individualized, allowing him/her to add, customize, and rearrange gadgets, as well as group them into tab sets. The open "Web" model means users can select gadgets not only from your enterprise, but also from Google and many others.
-</p>
-
-<h3><a href="http://wso2.com/products/business-activity-monitor/">Business Activity Monitor</a></h3>
-<p>
-The WSO2 Business Activity Monitor (WSO2 BAM) serves the needs of both business and IT domain experts to monitor and understand business activities within an SOA deployment. While specifically designed to monitor SOA deployments, it can be extended to cater to other general monitoring requirements as well. 
-</p>
-
-<h3><a href="http://wso2.com/products/business-process-server/">Business Process Server</a></h3>
-<p>
-The WSO2 Business Process Server is an easy-to-use open source business process server that executes business processes written using the WS-BPEL standard. Powered by Apache ODE, it provides a complete Web-based graphical console to deploy, manage and view processes in addition to managing and viewing process instances
-</p>
-
-<h3><a href="http://wso2.com/products/business-rules-server/">Business Rules Server</a></h3>
-<p>
-The WSO2 Business Rules Server brings the agility of business rules to your Service Oriented Architecture toolkit. Based on a solid platform for hosting business rules, our BRS excels at extending the capabilities of your SOA. 
-</p>
-
-<h3><a href="http://wso2.com/products/enterprise-service-bus/">Enterprise Service Bus</a></h3>
-<p>
-The WSO2 Enterprise Service Bus offers a lean approach to create a Service Oriented Architecture by adding monitoring, management, and virtualization to your existing service interactions. Its innovative design leads it to be one of the highest performance, lowest footprint, and widest interoperability integration systems available.
-</p>
-
-<h3><a href="http://wso2.com/products/message-broker/">Message Broker</a></h3>
-<p>
-The WSO2 Message Broker brings messaging and eventing capabilities into your Service Oriented Architecture. Extending the WSO2 Carbon platform to support event driven architectures, WSO2 Message Broker is powered by Apache Qpid, one of the leading Advanced Message Queuing Protocol (AMQP) messaging engines available today. 
-</p>
-
-<h3><a href="http://wso2.com/products/complex-event-processing-server/">Complex Event Processing Server</a></h3>
-<p>
-The WSO2 Complex Event Processing Server enables you to intelligently single out events with predefined properties and even manage and combine them in a manner that allows for real time analysis and a rapid response to whatever threat or opportunity that enterprises face.
-</p>
-
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/userguide.html
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/userguide.html b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/userguide.html
deleted file mode 100644
index f4f4ff1..0000000
--- a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/docs/userguide.html
+++ /dev/null
@@ -1,37 +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.
-  -->
-<html>
-<head>
-    <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"/>
-  <title>Cloud Services - User Guide</title>
-  <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
-<body>
-
-	<h1>Cloud Services</h1>
-
-
-	<p>
-		Please refer <a href="http://docs.wso2.org/wiki/display/Stratos200/WSO2+Stratos+Documentation">
-			WSO2 Stratos 2.0 Documentation</a> for more information.
-	</p>
-</body>
-
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Cloud-Gateway-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Cloud-Gateway-logo.gif b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Cloud-Gateway-logo.gif
deleted file mode 100644
index 2154397..0000000
Binary files a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Cloud-Gateway-logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Storage-Server-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Storage-Server-logo.gif b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Storage-Server-logo.gif
deleted file mode 100644
index 3ee3303..0000000
Binary files a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Storage-Server-logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Application-Server-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Application-Server-logo.gif b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Application-Server-logo.gif
deleted file mode 100644
index 55e4751..0000000
Binary files a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Application-Server-logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Activity-Monitor-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Activity-Monitor-logo.gif b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Activity-Monitor-logo.gif
deleted file mode 100644
index f8b6a74..0000000
Binary files a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Activity-Monitor-logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Process-Server-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Process-Server-logo.gif b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Process-Server-logo.gif
deleted file mode 100644
index 5dd2171..0000000
Binary files a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Process-Server-logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Rules-Server-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Rules-Server-logo.gif b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Rules-Server-logo.gif
deleted file mode 100644
index ccba887..0000000
Binary files a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Business-Rules-Server-logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Cloud-Services-Gateway-logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Cloud-Services-Gateway-logo.gif b/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Cloud-Services-Gateway-logo.gif
deleted file mode 100644
index e69aaa6..0000000
Binary files a/products/stratos-manager/modules/dashboard/src/main/resources/web/tenant-dashboard/images/WSO2-Stratos-Cloud-Services-Gateway-logo.gif and /dev/null differ