You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/12 18:55:01 UTC
[1/3] removed directories which refactors and some are not in use
Updated Branches:
refs/heads/master 3fe8d72fb -> 6d1da26a2
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/pom.xml b/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/pom.xml
deleted file mode 100644
index f7414d4..0000000
--- a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed 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.wso2.carbon</groupId>
- <artifactId>stratos-components</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.stratos.landing.page.deployer</artifactId>
- <version>2.1.0</version>
- <packaging>bundle</packaging>
- <name>WSO2 Stratos - Landing Page Webapp Deployer</name>
- <description>Deployment module for Stratos Service specific Landing Page</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tomcat</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- <version>${orbit.version.axis2}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom.wso2</groupId>
- <artifactId>axiom</artifactId>
- <version>${orbit.version.axiom}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <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>
- <Private-Package>
- org.wso2.carbon.stratos.landing.page.deployer.internal
- </Private-Package>
- <Export-Package>
- !org.wso2.carbon.stratos.landing.page.deployer.internal,
- org.wso2.carbon.stratos.landing.page.deployer.*;
- </Export-Package>
- <Import-Package>
- org.apache.axis2.*;"
- </Import-Package>
- <Axis2Deployer>StratosLandingPageWebappDeployer</Axis2Deployer>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/LandingPageWebappDeployer.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/LandingPageWebappDeployer.java b/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/LandingPageWebappDeployer.java
deleted file mode 100644
index 065c354..0000000
--- a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/LandingPageWebappDeployer.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed 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.wso2.carbon.stratos.landing.page.deployer;
-
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.AbstractDeployer;
-import org.apache.axis2.deployment.DeploymentException;
-import org.apache.axis2.deployment.repository.util.DeploymentFileData;
-import org.apache.catalina.Context;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.stratos.landing.page.deployer.internal.DataHolder;
-import org.wso2.carbon.tomcat.CarbonTomcatException;
-
-import java.io.File;
-
-/**
- * Special deployer to deploy the Stratos Service specific landing pages.
- * Implemented as a separate deployer since we get the ability to modify the the html
- * without having to shutdown the server.
- */
-public class LandingPageWebappDeployer extends AbstractDeployer {
- private static final Log log = LogFactory.getLog(LandingPageWebappDeployer.class);
-
- private final String LANDING_PAGE_WEBAPP_ROOT = "STRATOS_ROOT";
- public static final String WEBAPPS = "webapps";
- public static final String WEBAPP_CONTEXT = "home";
-
- public void init(ConfigurationContext configCtx) {
- //commenting out the following and added a fix below, because in local transport mode,
- //getTenantDomain(true) always returning carbon.super. See CARBON-13858
-
-// // deploy the landing page for super tenant only
-// String domain = null;
-// SuperTenantCarbonContext context = SuperTenantCarbonContext.getCurrentContext();
-// if(context != null ) {
-// domain = context.getTenantDomain(true);
-// }
-//
-// if (domain != null && !domain.equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
-// return;
-// }
-
- // Super tenant repository path
- String repoPath = configCtx.getAxisConfiguration().getRepository().getPath();
- // if tenant's repository, then return without deploying
- if (repoPath != null && (repoPath.contains("repository" + File.separator + "tenants") ||
- repoPath.contains("repository/tenants") )) {
- return;
- }
- if (!repoPath.endsWith("/") && !repoPath.endsWith(File.separator)) {
- repoPath += File.separator;
- }
-
- String landingpageWebappDir = repoPath + WEBAPPS + File.separator + LANDING_PAGE_WEBAPP_ROOT;
- File webappFile = new File(landingpageWebappDir);
- if (webappFile.exists()) {
- DeploymentFileData landingpageAppFile = new DeploymentFileData(webappFile);
- try {
- deploy(landingpageAppFile);
- } catch (DeploymentException e) {
- log.error("Error while deploying landing page webapp.", e);
- }
- } else {
- log.warn("Product landing page not found.");
- }
- }
-
- public void deploy(DeploymentFileData deploymentFileData) throws DeploymentException {
- String carbonWebContextRoot = "/" + WEBAPP_CONTEXT;
- if (deploymentFileData.getFile() != null) {
- Context context = null;
- try {
- context = DataHolder.getCarbonTomcatService().
- addWebApp(carbonWebContextRoot,deploymentFileData.getFile().getAbsolutePath(), null);
- log.info("Deployed product landing page webapp: " + context);
- } catch (CarbonTomcatException e) {
- String msg = "Webapp failed to deploy :" + deploymentFileData.getFile().getName();
- log.error(msg, e);
- throw new DeploymentException(msg, e);
- }
- }
- }
-
- public void setDirectory(String repoDir) {
- }
-
- public void setExtension(String extension) {
- }
-
- public void undeploy(String fileName) throws DeploymentException {
- }
-
- public void cleanup() throws DeploymentException {
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/internal/DataHolder.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/internal/DataHolder.java b/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/internal/DataHolder.java
deleted file mode 100644
index f1e1815..0000000
--- a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/internal/DataHolder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2005-2010, 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.
-*/
-
-package org.wso2.carbon.stratos.landing.page.deployer.internal;
-
-import org.wso2.carbon.tomcat.api.CarbonTomcatService;
-
-/**
- * Holds data required by the LandingPageWebappDeployer
- */
-public class DataHolder {
- private static CarbonTomcatService carbonTomcatService;
-
- public static CarbonTomcatService getCarbonTomcatService() {
- return carbonTomcatService;
- }
-
- public static void setCarbonTomcatService(CarbonTomcatService carbonTomcatService) {
- DataHolder.carbonTomcatService = carbonTomcatService;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/internal/LandingPageWebappDeployerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/internal/LandingPageWebappDeployerServiceComponent.java b/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/internal/LandingPageWebappDeployerServiceComponent.java
deleted file mode 100644
index c5a4691..0000000
--- a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/java/org/wso2/carbon/stratos/landing/page/deployer/internal/LandingPageWebappDeployerServiceComponent.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2005-2010, 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.
-*/
-
-package org.wso2.carbon.stratos.landing.page.deployer.internal;
-
-import org.wso2.carbon.tomcat.api.CarbonTomcatService;
-
-/**
- * @scr.component name="org.wso2.carbon.stratos.landing.page.deployer.internal.LandingPageWebappDeployerServiceComponent"
- * immediate="true"
- * @scr.reference name="carbon.tomcat.service"
- * interface="org.wso2.carbon.tomcat.api.CarbonTomcatService"
- * cardinality="1..1" policy="dynamic" bind="setCarbonTomcatService"
- * unbind="unsetCarbonTomcatService"
- */
-public class LandingPageWebappDeployerServiceComponent {
-
- protected void setCarbonTomcatService(CarbonTomcatService carbonTomcatService) {
- DataHolder.setCarbonTomcatService(carbonTomcatService);
- }
-
-
- protected void unsetCarbonTomcatService(CarbonTomcatService carbonTomcatService) {
- DataHolder.setCarbonTomcatService(null);
- }
-
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/resources/META-INF/component.xml b/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 7cd403e..0000000
--- a/components/stratos/org.wso2.carbon.stratos.landing.page.deployer/2.1.0/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed 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">
- <deployers>
- <deployer>
- <directory>stratos_home</directory>
- <class>org.wso2.carbon.stratos.landing.page.deployer.LandingPageWebappDeployer</class>
- </deployer>
- </deployers>
-</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/pom.xml b/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/pom.xml
deleted file mode 100644
index 762b4a3..0000000
--- a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed 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.wso2.carbon</groupId>
- <artifactId>stratos-components</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.ui.menu.stratos</artifactId>
- <packaging>bundle</packaging>
- <name>WSO2 Stratos - Dashboard User Interface</name>
-
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.common</artifactId>
- </dependency>
- </dependencies>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <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>
- <Private-Package>org.wso2.carbon.ui.menu.stratos.internal.*;-split-package:=merge-first,</Private-Package>
- <Export-Package>org.wso2.carbon.ui.menu.stratos.*,org.wso2.stratos.ui.menu.general.*</Export-Package>
- <Import-Package></Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- <!--<Fragment-Host>org.wso2.carbon.ui</Fragment-Host>-->
- <Carbon-Component>UIBundle</Carbon-Component>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/java/org/wso2/carbon/ui/menu/stratos/Util.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/java/org/wso2/carbon/ui/menu/stratos/Util.java b/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/java/org/wso2/carbon/ui/menu/stratos/Util.java
deleted file mode 100644
index bb85207..0000000
--- a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/java/org/wso2/carbon/ui/menu/stratos/Util.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2005-2010, 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.
-*/
-
-package org.wso2.carbon.ui.menu.stratos;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.wso2.carbon.stratos.common.config.CloudServiceConfig;
-import org.wso2.carbon.stratos.common.config.CloudServiceConfigParser;
-import org.wso2.carbon.stratos.common.exception.StratosException;
-
-import java.util.Map;
-
-/**
- * Implements the Utility methods for Stratos UI General Menu component such as extracting the
- * Manager Home page URL from the config files.
- */
-public class Util {
-
- private static Log log = LogFactory.getLog(Util.class);
-
- // use "https://stratoslive.wso2.com" as the default value.
- private static String managerHomepageURL = "https://stratoslive.wso2.com";
-
- // constants used to parse the cloud-services-desc.xml
- private static final String STRATOS_MANAGER = "WSO2 Stratos Manager";
-
- /**
- * Extracts the Manager homepage URL from the CloudServiceConfiguration which is parsed via cloud-services-desc.xml.
- * @throws StratosException Failing to obtain the Manager home page URL via CloudServiceConfiguration.
- */
- public static void readManagerURLFromConfig() throws StratosException {
- try {
- Map<String, CloudServiceConfig> cloudServiceConfigs = CloudServiceConfigParser.
- loadCloudServicesConfiguration().getCloudServiceConfigs();
- managerHomepageURL = cloudServiceConfigs.get(STRATOS_MANAGER).getLink() +
- "/carbon/sso-acs/redirect_ajaxprocessor.jsp";
-
- } catch (Exception e) {
- String errorMsg = "Error while reading the Manager Homepage URL from " +
- "cloud service configuration.";
- log.error(errorMsg, e);
- throw new StratosException(errorMsg, e);
- }
- }
-
- /**
- * Get the Manager Homepage URL.
- * @return returns the value specified in SAML2SSOConfiguration.ManagerHomepage, if not returns
- * the default value, "https://stratoslive.wso2.com".
- */
- public static String getManagerHomepageURL(){
- return managerHomepageURL;
- }
-
- /**
- * Read the element value for the given element
- * @param element Parent element
- * @param tagName name of the child element
- * @return value of the element
- */
- private static String getTextValue(Element element, String tagName) {
- String textVal = null;
- NodeList nl = element.getElementsByTagName(tagName);
- if(nl != null && nl.getLength() > 0) {
- Element el = (Element)nl.item(0);
- textVal = el.getFirstChild().getNodeValue();
- }
- return textVal;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/java/org/wso2/carbon/ui/menu/stratos/internal/StratosUIGeneralMenuDSComponent.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/java/org/wso2/carbon/ui/menu/stratos/internal/StratosUIGeneralMenuDSComponent.java b/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/java/org/wso2/carbon/ui/menu/stratos/internal/StratosUIGeneralMenuDSComponent.java
deleted file mode 100644
index dddc265..0000000
--- a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/java/org/wso2/carbon/ui/menu/stratos/internal/StratosUIGeneralMenuDSComponent.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2005-2010, 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.
-*/
-
-package org.wso2.carbon.ui.menu.stratos.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.stratos.common.exception.StratosException;
-import org.wso2.carbon.ui.menu.stratos.Util;
-
-/**
- * @scr.component name="org.wso2.carbon.ui.menu.general.internal.StratosUIGeneralMenuDSComponent"
- * immediate="true"
- */
-public class StratosUIGeneralMenuDSComponent {
- private static Log log = LogFactory.getLog(StratosUIGeneralMenuDSComponent.class);
-
- protected void activate(ComponentContext ctxt) {
- try {
- // read the Manager Homepage URL from the config. files.
- Util.readManagerURLFromConfig();
- if (log.isDebugEnabled()) {
- log.debug("Stratos UI General Menu bundle is activated.");
- }
- } catch (StratosException igonre) {
- // ignore this exception, as the default value is used if it fails to read it from here.
- }
- }
-
- protected void deactivate(ComponentContext ctxt) {
- if(log.isDebugEnabled()){
- log.debug("Stratos UI General Menu bundle is deactivated.");
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/META-INF/component.xml b/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 8a72558..0000000
--- a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, 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.
- -->
-<component xmlns="http://products.wso2.org/carbon">
- <menus>
- <menu>
- <id>manager_menu</id>
- <i18n-key>manager</i18n-key>
- <i18n-bundle>org.wso2.stratos.ui.menu.general.i18n.Resources</i18n-bundle>
- <parent-menu></parent-menu>
- <link>#</link>
- <region>region5</region>
- <order>39</order>
- <style-class>home</style-class>
- <require-permission>/permission/admin/login</require-permission>
- <require-cloud-deployment>true</require-cloud-deployment>
- </menu>
- <menu>
- <id>manager_home_menu</id>
- <i18n-key>manager.home.page</i18n-key>
- <i18n-bundle>org.wso2.stratos.ui.menu.general.i18n.Resources</i18n-bundle>
- <parent-menu>manager_menu</parent-menu>
- <link>../manager-home/load_manager_ajaxprocessor.jsp</link>
- <region>region5</region>
- <order>1</order>
- <style-class>manage-configuration</style-class>
- <icon>../manager-home/images/services.gif</icon>
- <require-permission>/permission/admin/login</require-permission>
- </menu>
- </menus>
-</component>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/org/wso2/stratos/ui/menu/general/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/org/wso2/stratos/ui/menu/general/i18n/Resources.properties b/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/org/wso2/stratos/ui/menu/general/i18n/Resources.properties
deleted file mode 100644
index b01af41..0000000
--- a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/org/wso2/stratos/ui/menu/general/i18n/Resources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-manager=WSO2 Stratos
-manager.home.page=Stratos Manager
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/web/manager-home/images/services.gif
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/web/manager-home/images/services.gif b/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/web/manager-home/images/services.gif
deleted file mode 100644
index 9883116..0000000
Binary files a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/web/manager-home/images/services.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/web/manager-home/load_manager_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/web/manager-home/load_manager_ajaxprocessor.jsp b/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/web/manager-home/load_manager_ajaxprocessor.jsp
deleted file mode 100644
index 8475e93..0000000
--- a/components/stratos/org.wso2.carbon.ui.menu.stratos/2.1.0/src/main/resources/web/manager-home/load_manager_ajaxprocessor.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-~ Copyright (c) 2005-2010, 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.
--->
-<%@ page import="org.wso2.carbon.ui.menu.stratos.Util" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-<html>
-<head></head>
-<body>
-<%--Redirect the browser to the Manager Homepage --%>
-<form action="<%=Util.getManagerHomepageURL()%>" method="GET" id="manager_redirector"></form>
-<script type="text/javascript">
- document.forms[0].submit();
-</script>
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui/2.1.0/pom.xml b/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui/2.1.0/pom.xml
deleted file mode 100644
index efaec13..0000000
--- a/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui/2.1.0/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed 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.wso2.carbon</groupId>
- <artifactId>tenant.activity.parent</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.tenant.activity.ui</artifactId>
- <packaging>bundle</packaging>
- <name>WSO2 Stratos - Tenant Activity - User Interface</name>
-
- <build>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Private-Package>
- org.wso2.carbon.tenant.activity.ui.internal.*,
- </Private-Package>
- <Export-Package>
- org.wso2.carbon.tenant.activity.ui.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.tenant.activity.stub.*; version="${carbon.platform.package.import.version.range}",
- org.wso2.carbon.stratos.common.*,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.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>commons-codec.wso2</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.common.ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>javax.servlet</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>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.activity.stub</artifactId>
- <version>4.1.0</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui/2.1.0/src/main/resources/web/tenant-activity/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui/2.1.0/src/main/resources/web/tenant-activity/docs/userguide.html b/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui/2.1.0/src/main/resources/web/tenant-activity/docs/userguide.html
deleted file mode 100644
index 8cabd0d..0000000
--- a/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui/2.1.0/src/main/resources/web/tenant-activity/docs/userguide.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, 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.
- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <title>View Usage - User Guide</title>
- <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
-<body>
-<h1>View Usage</h1>
-
-<p>
-You can view usage of the stratos resource by your organization from this page
-</p>
-
-<p>
-<img src="images/view-usage.png" alt="View Usage"/>
-<div><strong>Figure1: View Usage</strong></div>
-</p>
-
-<p>
-
-<table>
- <thead>
- <td>
- The Form Field
- </td>
- <td>
- Description
- </td>
- </thead>
- <tbody>
- <tr>
- <td>Year-Month</td>
- <td>The year and the month the usage is metered.</td>
- </tr>
- <tr>
- <td>Number of Users</td>
- <td>Number of users of your stratos account.</td>
- </tr>
- <tr>
- <td>Active data storage</td>
- <td>The registry data storage amount.</td>
- </tr>
- <tr>
- <td>Registry Total Bandwidth</td>
- <td>Total bandwidth consumed by the registry accesses.</td>
- </tr>
- <tr>
- <td>Service Total Bandwidth</td>
- <td>The bandwidth consumed by the web services.</td>
- </tr>
- </tbody>
-</table>
-
-</p>
-
-</body>
-
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity/2.1.0/pom.xml b/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity/2.1.0/pom.xml
deleted file mode 100644
index 675b3ff..0000000
--- a/components/stratos/tenant-activity/org.wso2.carbon.tenant.activity/2.1.0/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<!--
- * Copyright (c) 2005-2010, 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.
- -->
-<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.wso2.carbon</groupId>
- <artifactId>tenant.activity.parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.tenant.activity</artifactId>
- <packaging>bundle</packaging>
- <name>WSO2 Stratos - TenantActivity</name>
-
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-code/src</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Private-Package>
- org.wso2.carbon.tenant.activity.internal.*,
- org.wso2.carbon.tenant.activity.services.*,
- </Private-Package>
- <Export-Package>
- org.wso2.carbon.tenant.activity.api.*,
- org.wso2.carbon.tenant.activity.util.*,
- org.wso2.carbon.tenant.activity.beans.*,
- org.wso2.carbon.tenant.activity.commands.*,
- </Export-Package>
- <Import-Package>
- !org.wso2.carbon.tenant.activity.stub.*,
- org.wso2.carbon.stratos.common.*,
- org.wso2.carbon.cluster.mgt.core.*,
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.0,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.axiom.*; version="${axiom.osgi.version.range}",
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- <version>${orbit.version.axis2}</version>
- </dependency>
- <!--dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${orbit.version.axis2}</version>
- </dependency-->
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.mgt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cluster.mgt.core</artifactId>
- <version>4.1.0</version>
- </dependency>
- </dependencies>
-</project>
[2/3] git commit: removed directories which refactors and some are
not in use
Posted by la...@apache.org.
removed directories which refactors and some are not in use
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6be46269
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6be46269
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6be46269
Branch: refs/heads/master
Commit: 6be46269c1ca7e7468882909f6c8c9d44bc35bd6
Parents: 69d8c75
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Fri Jul 12 22:23:59 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Fri Jul 12 22:23:59 2013 +0530
----------------------------------------------------------------------
components/stratos/account-mgt/pom.xml | 41 -----
components/stratos/domain-validator/pom.xml | 41 -----
.../org.wso2.carbon.activation/2.1.0/pom.xml | 94 -----------
.../internal/ActivationServiceComponent.java | 152 -----------------
.../activation/module/ActivationHandler.java | 154 ------------------
.../activation/module/ActivationModule.java | 65 --------
.../activation/service/ActivationService.java | 85 ----------
.../activation/utils/ActivationManager.java | 96 -----------
.../org/wso2/carbon/activation/utils/Util.java | 138 ----------------
.../src/main/resources/META-INF/module.xml | 33 ----
.../src/main/resources/META-INF/services.xml | 30 ----
.../org.wso2.carbon.activation/2.1.2/pom.xml | 94 -----------
.../internal/ActivationServiceComponent.java | 152 -----------------
.../activation/module/ActivationHandler.java | 161 -------------------
.../activation/module/ActivationModule.java | 65 --------
.../activation/service/ActivationService.java | 85 ----------
.../activation/utils/ActivationManager.java | 96 -----------
.../org/wso2/carbon/activation/utils/Util.java | 138 ----------------
.../src/main/resources/META-INF/module.xml | 33 ----
.../src/main/resources/META-INF/services.xml | 30 ----
.../2.1.0/pom.xml | 92 -----------
.../deployer/LandingPageWebappDeployer.java | 109 -------------
.../page/deployer/internal/DataHolder.java | 37 -----
...ndingPageWebappDeployerServiceComponent.java | 44 -----
.../src/main/resources/META-INF/component.xml | 23 ---
.../2.1.0/pom.xml | 90 -----------
.../org/wso2/carbon/ui/menu/stratos/Util.java | 88 ----------
.../StratosUIGeneralMenuDSComponent.java | 52 ------
.../src/main/resources/META-INF/component.xml | 45 ------
.../ui/menu/general/i18n/Resources.properties | 2 -
.../web/manager-home/images/services.gif | Bin 604 -> 0 bytes
.../manager-home/load_manager_ajaxprocessor.jsp | 30 ----
.../2.1.0/pom.xml | 132 ---------------
.../web/tenant-activity/docs/userguide.html | 76 ---------
.../2.1.0/pom.xml | 144 -----------------
35 files changed, 2747 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/account-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/account-mgt/pom.xml b/components/stratos/account-mgt/pom.xml
deleted file mode 100644
index c58b0a4..0000000
--- a/components/stratos/account-mgt/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed 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.wso2.carbon</groupId>
- <artifactId>stratos-components</artifactId>
- <version>2.1.0</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>account-mgt-parent</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Account Management Parent Module</name>
- <description>WSO2 Stratos Account Management Parent Module</description>
- <url>http://wso2.org</url>
-
- <modules>
- <module>org.wso2.carbon.account.mgt/2.1.0</module>
- <module>org.wso2.carbon.account.mgt.ui/2.1.0</module>
- </modules>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/domain-validator/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/domain-validator/pom.xml b/components/stratos/domain-validator/pom.xml
deleted file mode 100644
index aff23aa..0000000
--- a/components/stratos/domain-validator/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed 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.wso2.carbon</groupId>
- <artifactId>stratos-components</artifactId>
- <version>2.1.0</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>domain-validator-parent</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Domain Validator Parent Module</name>
- <description>WSO2 Stratos Domain Validator Parent Module</description>
- <url>http://wso2.org</url>
-
- <modules>
- <module>org.wso2.carbon.validate.domain/2.1.0</module>
- <module>org.wso2.carbon.validate.domain.ui/2.1.0</module>
- </modules>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/pom.xml b/components/stratos/org.wso2.carbon.activation/2.1.0/pom.xml
deleted file mode 100644
index a024242..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed 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.wso2.carbon</groupId>
- <artifactId>stratos-components</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.activation</artifactId>
- <version>2.1.0</version>
- <packaging>bundle</packaging>
- <name>WSO2 Stratos - Activation</name>
-
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Axis2Module>${project.artifactId}-${project.version}</Axis2Module>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- org.wso2.carbon.activation.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.stratos.common.*,
- org.wso2.carbon.registry.core.*;version=1.0.1,
- org.wso2.carbon.registry.resource.*,
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.0,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.axiom.*; version="${axiom.osgi.version.range}",
- *;resolution:=optional
- </Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.common</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/internal/ActivationServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/internal/ActivationServiceComponent.java b/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/internal/ActivationServiceComponent.java
deleted file mode 100644
index e3fb386..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/internal/ActivationServiceComponent.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.internal;
-
-import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.utils.ConfigurationContextService;
-import org.wso2.carbon.activation.service.ActivationService;
-import org.wso2.carbon.activation.utils.ActivationManager;
-import org.wso2.carbon.activation.utils.Util;
-
-/**
- * The Declarative Service Component for the Service Activation Module for Tenants.
- *
- * @scr.component name="org.wso2.carbon.metering" immediate="true"
- * @scr.reference name="registry.service"
- * interface="org.wso2.carbon.registry.core.service.RegistryService"
- * cardinality="1..1" policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
- * @scr.reference name="user.realmservice.default"
- * interface="org.wso2.carbon.user.core.service.RealmService"
- * cardinality="1..1" policy="dynamic" bind="setRealmService" unbind="unsetRealmService"
- * @scr.reference name="config.context.service"
- * interface="org.wso2.carbon.utils.ConfigurationContextService"
- * cardinality="0..1" policy="dynamic" bind="setConfigurationContextService"
- * unbind="unsetConfigurationContextService"
- */
-@SuppressWarnings({"JavaDoc", "unused"})
-public class ActivationServiceComponent {
-
- private static final Log log = LogFactory.getLog(ActivationServiceComponent.class);
-
- private static ServiceRegistration registration = null;
-
- /**
- * Activates the Registry Kernel bundle.
- *
- * @param context the OSGi component context.
- */
- protected void activate(ComponentContext context) {
- try {
- ActivationManager.startCacheCleaner();
- if (registration == null) {
- registration = context.getBundleContext().registerService(
- ActivationService.class.getName(), new ActivationService(), null);
- }
- log.debug("******* Stratos Activation bundle is activated ******* ");
- } catch (Exception e) {
- log.error("******* Stratos Activation bundle failed activating ****", e);
- }
- }
-
- /**
- * Deactivates the Registry Kernel bundle.
- *
- * @param context the OSGi component context.
- */
- protected void deactivate(ComponentContext context) {
- registration.unregister();
- registration = null;
- ActivationManager.stopCacheCleaner();
- log.debug("******* Stratos Activation bundle is deactivated ******* ");
- }
-
- /**
- * Method to set the registry service used. This will be used when accessing the registry. This
- * method is called when the OSGi Registry Service is available.
- *
- * @param registryService the registry service.
- */
- protected void setRegistryService(RegistryService registryService) {
- Util.setRegistryService(registryService);
- }
-
- /**
- * This method is called when the current registry service becomes un-available.
- *
- * @param registryService the current registry service instance, to be used for any
- * cleaning-up.
- */
- protected void unsetRegistryService(RegistryService registryService) {
- Util.setRegistryService(null);
- }
-
- /**
- * Method to set the realm service used. This will be used when accessing the user realm. This
- * method is called when the OSGi Realm Service is available.
- *
- * @param realmService the realm service.
- */
- protected void setRealmService(RealmService realmService) {
- Util.setRealmService(realmService);
- }
-
- /**
- * This method is called when the current realm service becomes un-available.
- *
- * @param realmService the current realm service instance, to be used for any cleaning-up.
- */
- protected void unsetRealmService(RealmService realmService) {
- Util.setRealmService(null);
- }
-
- /**
- * Method to set the configuration context service used. This method is called when the OSGi
- * ConfigurationContext Service is available.
- *
- * @param contextService the configuration context service.
- */
- protected void setConfigurationContextService(ConfigurationContextService contextService) {
- try {
- if (contextService.getServerConfigContext() != null &&
- contextService.getServerConfigContext().getAxisConfiguration() != null) {
- contextService.getServerConfigContext().getAxisConfiguration().engageModule(
- "activation");
- } else {
- log.error("Failed to engage Activation Module.");
- }
- } catch (AxisFault e) {
- log.error("Failed to engage Activation Module", e);
- }
- }
-
- /**
- * This method is called when the current configuration context service becomes un-available.
- *
- * @param contextService the current configuration context service instance, to be used for any
- * cleaning-up.
- */
- protected void unsetConfigurationContextService(ConfigurationContextService contextService) {
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/module/ActivationHandler.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/module/ActivationHandler.java b/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/module/ActivationHandler.java
deleted file mode 100644
index 4f1a1ca..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/module/ActivationHandler.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.module;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPBody;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.Handler;
-import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.activation.utils.ActivationManager;
-import org.wso2.carbon.activation.utils.Util;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;
-import org.wso2.carbon.stratos.common.util.CloudServicesUtil;
-import org.wso2.carbon.utils.ServerConstants;
-import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
-
-public class ActivationHandler extends AbstractHandler implements Handler {
-
- private static final Log log = LogFactory.getLog(ActivationHandler.class);
-
- private String name = "ActivationHandler";
-
- /**
- * {@inheritDoc}
- */
- public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {
- if(log.isDebugEnabled()){
- log.debug("Starting Activation Handler invocation. Incoming Message: " +
- messageContext.getEnvelope().toString());
- }
-
- AxisService service = messageContext.getAxisService();
- int tenantId = getTenantId(messageContext);
- if (service != null && "ActivationService".equals(service.getName())) {
- log.debug("Granted access to the Activation Service");
- if (tenantId > 0) {
- TenantAxisUtils.getTenantAxisConfiguration(getTenantDomain(messageContext),
- messageContext.getConfigurationContext());
- log.debug("Loaded Tenant Configuration");
- }
- return InvocationResponse.CONTINUE;
- }
- if (tenantId == MultitenantConstants.SUPER_TENANT_ID) {
- log.debug("Granted access for super tenant");
- return InvocationResponse.CONTINUE;
- }
- if (ActivationManager.activationRecorded(tenantId)) {
- if (ActivationManager.getActivation(tenantId)) {
- TenantAxisUtils.getTenantAxisConfiguration(getTenantDomain(messageContext),
- messageContext.getConfigurationContext());
- log.debug("Loaded Tenant Configuration");
- return InvocationResponse.CONTINUE;
- } else {
- if (log.isWarnEnabled()) {
- String serviceName = Util.getServiceName();
- log.warn("Failed attempt to access " + serviceName + " by tenant " + tenantId);
- }
- return InvocationResponse.ABORT;
- }
- }
- String serviceName = Util.getServiceName();
- try {
- if (CloudServicesUtil.isCloudServiceActive(serviceName, tenantId)) {
- log.debug("Successful attempt to access " + serviceName + " by tenant " + tenantId);
- ActivationManager.setActivation(tenantId, true);
- TenantAxisUtils.getTenantAxisConfiguration(getTenantDomain(messageContext),
- messageContext.getConfigurationContext());
- log.debug("Loaded Tenant Configuration");
- return InvocationResponse.CONTINUE;
- }
- } catch (Exception e) {
- throw new AxisFault("Failed to determine Activation status.", e);
- }
- log.warn("Failed attempt to access " + serviceName + " by tenant " + tenantId);
- ActivationManager.setActivation(tenantId, false);
- return InvocationResponse.ABORT;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getName() {
- return name;
- }
-
- /**
- * Method to set the name of the activation handler.
- *
- * @param name the name.
- */
- @SuppressWarnings("unused")
- public void setName(String name) {
- this.name = name;
- }
-
- private String getTenantDomain(MessageContext messageContext) {
- return PrivilegedCarbonContext.getCurrentContext(messageContext).getTenantDomain(true);
- }
-
- private int getTenantId(MessageContext messageContext) {
- PrivilegedCarbonContext carbonContext =
- PrivilegedCarbonContext.getCurrentContext(messageContext);
- int tenantId = carbonContext.getTenantId();
- if (tenantId > -1 || tenantId == MultitenantConstants.SUPER_TENANT_ID) {
- return tenantId;
- }
- String domain = carbonContext.getTenantDomain();
- if (domain == null) {
- SOAPBody soapBody = messageContext.getEnvelope().getBody();
- if (soapBody != null && soapBody.getFirstElement() != null) {
- OMElement usernameElem = soapBody.getFirstElement().getFirstChildWithName(
- new QName(ServerConstants.AUTHENTICATION_SERVICE_NS,
- ServerConstants.AUTHENTICATION_SERVICE_USERNAME));
- if (usernameElem != null) {
- String userName = usernameElem.getText();
- domain = MultitenantUtils.getTenantDomain(userName);
- }
- }
- }
- if (domain != null) {
- try {
- tenantId = Util.getRealmService().getTenantManager().getTenantId(domain);
- } catch (org.wso2.carbon.user.api.UserStoreException e) {
- log.error("An error occurred while obtaining the tenant id.", e);
- }
- }
- return tenantId;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/module/ActivationModule.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/module/ActivationModule.java b/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/module/ActivationModule.java
deleted file mode 100644
index 9cfbee5..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/module/ActivationModule.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.module;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisDescription;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.modules.Module;
-import org.apache.neethi.Assertion;
-import org.apache.neethi.Policy;
-
-/**
- * Module used to engage the activation handler.
- */
-public class ActivationModule implements Module {
-
- /**
- * {@inheritDoc}
- */
- public void init(ConfigurationContext configurationContext, AxisModule axisModule)
- throws AxisFault {
- }
-
- /**
- * {@inheritDoc}
- */
- public void engageNotify(AxisDescription axisDescription) throws AxisFault {
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean canSupportAssertion(Assertion assertion) {
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- public void applyPolicy(Policy policy, AxisDescription axisDescription) throws AxisFault {
- }
-
- /**
- * {@inheritDoc}
- */
- public void shutdown(ConfigurationContext configurationContext) throws AxisFault {
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/service/ActivationService.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/service/ActivationService.java b/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/service/ActivationService.java
deleted file mode 100644
index e16f2fb..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/service/ActivationService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.service;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.activation.utils.ActivationManager;
-import org.wso2.carbon.activation.utils.Util;
-import org.wso2.carbon.stratos.common.config.CloudServiceConfigParser;
-import org.wso2.carbon.stratos.common.config.CloudServicesDescConfig;
-import org.wso2.carbon.stratos.common.util.CloudServicesUtil;
-import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-
-/**
- * Admin Service to handle activation of cloud services used by tenants.
- */
-public class ActivationService {
-
- private static final Log log = LogFactory.getLog(ActivationService.class);
-
- /**
- * Method to update an activation record.
- *
- * @param tenantId the tenant identifier.
- *
- * @throws Exception if the operation failed.
- */
- public static void updateActivation(int tenantId) throws Exception {
- if (tenantId != 0) {
- String serviceName = Util.getServiceName();
- boolean isActive = CloudServicesUtil.isCloudServiceActive(serviceName, tenantId);
- CloudServicesDescConfig cloudServicesDesc =
- CloudServiceConfigParser.loadCloudServicesConfiguration();
- CloudServicesUtil.setCloudServiceActive(!isActive,
- serviceName,
- tenantId,
- cloudServicesDesc.getCloudServiceConfigs()
- .get(serviceName));
- ActivationManager.setActivation(tenantId, !isActive);
- }
- }
-
- /**
- * Method to determine whether a service is active for the given tenant.
- *
- * @param tenantId tenantId the tenant identifier.
- *
- * @return whether the service is active.
- * @throws Exception if the operation failed.
- */
- public boolean isActive(int tenantId) throws Exception {
- if (tenantId == MultitenantConstants.SUPER_TENANT_ID) {
- return true;
- }
- if (ActivationManager.activationRecorded(tenantId)) {
- return ActivationManager.getActivation(tenantId);
- }
- String serviceName = Util.getServiceName();
- if (CloudServicesUtil.isCloudServiceActive(serviceName, tenantId)) {
- log.debug("Successful attempt to access " + serviceName + " by tenant " + tenantId);
- ActivationManager.setActivation(tenantId, true);
- return true;
- }
- log.warn("Failed attempt to access " + serviceName + " by tenant " + tenantId);
- ActivationManager.setActivation(tenantId, false);
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/utils/ActivationManager.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/utils/ActivationManager.java b/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/utils/ActivationManager.java
deleted file mode 100644
index 41153a8..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/utils/ActivationManager.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.utils;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Manages Activations of Services for Tenants.
- */
-public class ActivationManager {
-
- private static final ConcurrentHashMap<Integer, Boolean> activations =
- new ConcurrentHashMap<Integer, Boolean>();
- private static Timer timer = null;
-
- /**
- * Starts cleaning up cached activation records at periodic intervals.
- */
- public static void startCacheCleaner() {
- TimerTask faultyServiceRectifier = new CacheCleaner();
- timer = new Timer();
- // Retry in 1 minute
- long retryIn = 1000 * 60;
- timer.schedule(faultyServiceRectifier, 0, retryIn);
- }
-
- /**
- * Stops cleaning up cached activation records.
- */
- public static void stopCacheCleaner() {
- timer.cancel();
- timer = null;
- }
-
- /**
- * Method to set an activation record.
- *
- * @param tenantId the tenant identifier.
- * @param status true if the service is active or false if not.
- */
- public static void setActivation(int tenantId, boolean status) {
- ActivationManager.activations.put(tenantId, status);
- }
-
- /**
- * Method to check whether an activation record exists for the given tenant.
- *
- * @param tenantId the tenant identifier.
- *
- * @return true if a record exists.
- */
- public static boolean activationRecorded(int tenantId) {
- return ActivationManager.activations.get(tenantId) != null;
- }
-
- /**
- * Method to retrieve an activation record.
- *
- * @param tenantId the tenant identifier.
- *
- * @return true if the service is active or false if not.
- */
- public static boolean getActivation(int tenantId) {
- return ActivationManager.activations.get(tenantId) != null &&
- ActivationManager.activations.get(tenantId);
- }
-
- private static class CacheCleaner extends TimerTask {
-
- /**
- * {@inheritDoc}
- */
- public void run() {
- ActivationManager.activations.clear();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/utils/Util.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/utils/Util.java b/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/utils/Util.java
deleted file mode 100644
index 9f01045..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/java/org/wso2/carbon/activation/utils/Util.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.utils;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.base.ServerConfiguration;
-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.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Utilities for the Service Activation Module for Tenants.
- */
-public class Util {
-
- private static RegistryService registryService = null;
- private static RealmService realmService = null;
- private static String serviceName = null;
- private static final Log log = LogFactory.getLog(Util.class);
-
- private static boolean cloudServiceInfoPathSanityChecked = false;
-
- /**
- * Stores an instance of the Registry Service that can be used to access the registry.
- *
- * @param service the Registry Service instance.
- */
- public static synchronized void setRegistryService(RegistryService service) {
- if (registryService == null) {
- registryService = service;
- }
- }
-
- /**
- * Method to retrieve the Registry Service instance.
- *
- * @return the Registry Service instance if it has been stored or null if not.
- */
- @SuppressWarnings("unused")
- public static RegistryService getRegistryService() {
- return registryService;
- }
-
- /**
- * Stores an instance of the Realm Service that can be used to access the user realm.
- *
- * @param service the Realm Service instance.
- */
- public static synchronized void setRealmService(RealmService service) {
- if (realmService == null) {
- realmService = service;
- }
- }
-
- /**
- * Method to retrieve the Realm Service instance.
- *
- * @return the Realm Service instance if it has been stored or null if not.
- */
- public static RealmService getRealmService() {
- return realmService;
- }
-
- private static UserRegistry getSuperTenantGovernanceSystemRegistry() throws RegistryException {
- return registryService.getGovernanceSystemRegistry();
- }
-
-// /**
-// * Method to determine whether the given cloud service is active.
-// *
-// * @param cloudServiceName the name of the cloud service.
-// * @param tenantId the tenant identifier.
-// * @param systemRegistry the super tenant's governance system registry
-// *
-// * @return true if the service is active or false if not.
-// * @throws Exception if the operation failed.
-// */
-// public static boolean isCloudServiceActive(String cloudServiceName,
-// int tenantId, UserRegistry systemRegistry)
-// throws Exception {
-// // The cloud manager is always active
-// if (StratosConstants.CLOUD_MANAGER_SERVICE.equals(cloudServiceName)) {
-// return true;
-// }
-//
-// if(!cloudServiceInfoPathSanityChecked) {
-// if(!systemRegistry.resourceExists(StratosConstants.CLOUD_SERVICE_INFO_STORE_PATH)) {
-// throw new RuntimeException("Cloud services list resource " +
-// StratosConstants.CLOUD_SERVICE_INFO_STORE_PATH + " does not exist");
-// }
-// cloudServiceInfoPathSanityChecked = true;
-// }
-//
-// String cloudServiceInfoPath = StratosConstants.CLOUD_SERVICE_INFO_STORE_PATH +
-// RegistryConstants.PATH_SEPARATOR + tenantId +
-// RegistryConstants.PATH_SEPARATOR + cloudServiceName;
-// Resource cloudServiceInfoResource;
-// if (systemRegistry.resourceExists(cloudServiceInfoPath)) {
-// cloudServiceInfoResource = systemRegistry.get(cloudServiceInfoPath);
-// String isActiveStr =
-// cloudServiceInfoResource.getProperty(StratosConstants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY);
-// return Boolean.toString(true).equals(isActiveStr);
-// }
-// return false;
-// }
-//
-
- /**
- * Method to obtain the name of the cloud service in which this module is running.
- *
- * @return the name of the service as defined in the server configuration.
- */
- public static String getServiceName() {
- if (serviceName == null) {
- serviceName = ServerConfiguration.getInstance().getFirstProperty("Name");
- }
- return serviceName;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/resources/META-INF/module.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/resources/META-INF/module.xml b/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/resources/META-INF/module.xml
deleted file mode 100644
index b92b725..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/resources/META-INF/module.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, 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.
- -->
-<module name="activation" class="org.wso2.carbon.activation.module.ActivationModule">
- <InFlow>
- <handler name="InFlowActivationHandler"
- class="org.wso2.carbon.activation.module.ActivationHandler">
- <order phase="Validation" phaseFirst="true"/>
- </handler>
- </InFlow>
-
- <InFaultFlow>
- <handler name="FaultInFlowActivationHandler"
- class="org.wso2.carbon.activation.module.ActivationHandler">
- <order phase="Validation" phaseFirst="true"/>
- </handler>
- </InFaultFlow>
- <parameter name="adminModule" locked="true">true</parameter>
-</module>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/resources/META-INF/services.xml b/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/resources/META-INF/services.xml
deleted file mode 100644
index dde74d7..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.0/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- !
- ! Copyright (c) 2005-2009, 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.
- !-->
-<serviceGroup>
- <service name="ActivationService" scope="transportsession">
- <transports>
- <transport>https</transport>
- </transports>
- <parameter name="ServiceClass" locked="false">
- org.wso2.carbon.activation.service.ActivationService
- </parameter>
- </service>
- <parameter name="hiddenService" locked="true">true</parameter>
-</serviceGroup>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/pom.xml b/components/stratos/org.wso2.carbon.activation/2.1.2/pom.xml
deleted file mode 100644
index b499811..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed 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.wso2.carbon</groupId>
- <artifactId>stratos-components</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.activation</artifactId>
- <version>2.1.2</version>
- <packaging>bundle</packaging>
- <name>WSO2 Stratos - Activation</name>
-
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Axis2Module>${project.artifactId}-${project.version}</Axis2Module>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- org.wso2.carbon.activation.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.stratos.common.*,
- org.wso2.carbon.registry.core.*;version=1.0.1,
- org.wso2.carbon.registry.resource.*,
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.0,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.axiom.*; version="${axiom.osgi.version.range}",
- *;resolution:=optional
- </Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.common</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/internal/ActivationServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/internal/ActivationServiceComponent.java b/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/internal/ActivationServiceComponent.java
deleted file mode 100644
index e3fb386..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/internal/ActivationServiceComponent.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.internal;
-
-import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.utils.ConfigurationContextService;
-import org.wso2.carbon.activation.service.ActivationService;
-import org.wso2.carbon.activation.utils.ActivationManager;
-import org.wso2.carbon.activation.utils.Util;
-
-/**
- * The Declarative Service Component for the Service Activation Module for Tenants.
- *
- * @scr.component name="org.wso2.carbon.metering" immediate="true"
- * @scr.reference name="registry.service"
- * interface="org.wso2.carbon.registry.core.service.RegistryService"
- * cardinality="1..1" policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
- * @scr.reference name="user.realmservice.default"
- * interface="org.wso2.carbon.user.core.service.RealmService"
- * cardinality="1..1" policy="dynamic" bind="setRealmService" unbind="unsetRealmService"
- * @scr.reference name="config.context.service"
- * interface="org.wso2.carbon.utils.ConfigurationContextService"
- * cardinality="0..1" policy="dynamic" bind="setConfigurationContextService"
- * unbind="unsetConfigurationContextService"
- */
-@SuppressWarnings({"JavaDoc", "unused"})
-public class ActivationServiceComponent {
-
- private static final Log log = LogFactory.getLog(ActivationServiceComponent.class);
-
- private static ServiceRegistration registration = null;
-
- /**
- * Activates the Registry Kernel bundle.
- *
- * @param context the OSGi component context.
- */
- protected void activate(ComponentContext context) {
- try {
- ActivationManager.startCacheCleaner();
- if (registration == null) {
- registration = context.getBundleContext().registerService(
- ActivationService.class.getName(), new ActivationService(), null);
- }
- log.debug("******* Stratos Activation bundle is activated ******* ");
- } catch (Exception e) {
- log.error("******* Stratos Activation bundle failed activating ****", e);
- }
- }
-
- /**
- * Deactivates the Registry Kernel bundle.
- *
- * @param context the OSGi component context.
- */
- protected void deactivate(ComponentContext context) {
- registration.unregister();
- registration = null;
- ActivationManager.stopCacheCleaner();
- log.debug("******* Stratos Activation bundle is deactivated ******* ");
- }
-
- /**
- * Method to set the registry service used. This will be used when accessing the registry. This
- * method is called when the OSGi Registry Service is available.
- *
- * @param registryService the registry service.
- */
- protected void setRegistryService(RegistryService registryService) {
- Util.setRegistryService(registryService);
- }
-
- /**
- * This method is called when the current registry service becomes un-available.
- *
- * @param registryService the current registry service instance, to be used for any
- * cleaning-up.
- */
- protected void unsetRegistryService(RegistryService registryService) {
- Util.setRegistryService(null);
- }
-
- /**
- * Method to set the realm service used. This will be used when accessing the user realm. This
- * method is called when the OSGi Realm Service is available.
- *
- * @param realmService the realm service.
- */
- protected void setRealmService(RealmService realmService) {
- Util.setRealmService(realmService);
- }
-
- /**
- * This method is called when the current realm service becomes un-available.
- *
- * @param realmService the current realm service instance, to be used for any cleaning-up.
- */
- protected void unsetRealmService(RealmService realmService) {
- Util.setRealmService(null);
- }
-
- /**
- * Method to set the configuration context service used. This method is called when the OSGi
- * ConfigurationContext Service is available.
- *
- * @param contextService the configuration context service.
- */
- protected void setConfigurationContextService(ConfigurationContextService contextService) {
- try {
- if (contextService.getServerConfigContext() != null &&
- contextService.getServerConfigContext().getAxisConfiguration() != null) {
- contextService.getServerConfigContext().getAxisConfiguration().engageModule(
- "activation");
- } else {
- log.error("Failed to engage Activation Module.");
- }
- } catch (AxisFault e) {
- log.error("Failed to engage Activation Module", e);
- }
- }
-
- /**
- * This method is called when the current configuration context service becomes un-available.
- *
- * @param contextService the current configuration context service instance, to be used for any
- * cleaning-up.
- */
- protected void unsetConfigurationContextService(ConfigurationContextService contextService) {
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/module/ActivationHandler.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/module/ActivationHandler.java b/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/module/ActivationHandler.java
deleted file mode 100644
index b2171cf..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/module/ActivationHandler.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.module;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPBody;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.Handler;
-import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.activation.utils.ActivationManager;
-import org.wso2.carbon.activation.utils.Util;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;
-import org.wso2.carbon.stratos.common.util.CloudServicesUtil;
-import org.wso2.carbon.utils.ServerConstants;
-import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
-
-public class ActivationHandler extends AbstractHandler implements Handler {
-
- private static final Log log = LogFactory.getLog(ActivationHandler.class);
-
- private String name = "ActivationHandler";
-
- /**
- * {@inheritDoc}
- */
- public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {
- String serviceName = Util.getServiceName();
- //TODO - tenant id and domain should retrieve from thread local carbon context
- //If service is api manager then we will pass activation handler check
- if(serviceName.equalsIgnoreCase("WSO2 API Manager")) {
- return InvocationResponse.CONTINUE;
- }
- if(log.isDebugEnabled()){
- log.debug("Starting Activation Handler invocation. Incoming Message: " +
- messageContext.getEnvelope().toString());
- }
-
- AxisService service = messageContext.getAxisService();
- int tenantId = getTenantId(messageContext);
- if (service != null && "ActivationService".equals(service.getName())) {
- log.debug("Granted access to the Activation Service");
- if (tenantId > 0) {
- TenantAxisUtils.getTenantAxisConfiguration(getTenantDomain(messageContext),
- messageContext.getConfigurationContext());
- log.debug("Loaded Tenant Configuration");
- }
- return InvocationResponse.CONTINUE;
- }
- if (tenantId == MultitenantConstants.SUPER_TENANT_ID) {
- log.debug("Granted access for super tenant");
- return InvocationResponse.CONTINUE;
- }
- if (ActivationManager.activationRecorded(tenantId)) {
- if (ActivationManager.getActivation(tenantId)) {
- TenantAxisUtils.getTenantAxisConfiguration(getTenantDomain(messageContext),
- messageContext.getConfigurationContext());
- log.debug("Loaded Tenant Configuration");
- return InvocationResponse.CONTINUE;
- } else {
- if (log.isWarnEnabled()) {
- log.warn("Failed attempt to access " + serviceName + " by tenant " + tenantId);
- }
- return InvocationResponse.ABORT;
- }
- }
-
- try {
- if (CloudServicesUtil.isCloudServiceActive(serviceName, tenantId)) {
- log.debug("Successful attempt to access " + serviceName + " by tenant " + tenantId);
- ActivationManager.setActivation(tenantId, true);
- TenantAxisUtils.getTenantAxisConfiguration(getTenantDomain(messageContext),
- messageContext.getConfigurationContext());
- log.debug("Loaded Tenant Configuration");
- return InvocationResponse.CONTINUE;
- }
- } catch (Exception e) {
- throw new AxisFault("Failed to determine Activation status.", e);
- }
- log.warn("Failed attempt to access " + serviceName + " by tenant " + tenantId);
- ActivationManager.setActivation(tenantId, false);
- return InvocationResponse.ABORT;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getName() {
- return name;
- }
-
- /**
- * Method to set the name of the activation handler.
- *
- * @param name the name.
- */
- @SuppressWarnings("unused")
- public void setName(String name) {
- this.name = name;
- }
-
- private String getTenantDomain(MessageContext messageContext) {
- //Ideally this should take from thread local carbon context change this temporary
- return PrivilegedCarbonContext.getCurrentContext(messageContext).getTenantDomain();
- }
-
- private int getTenantId(MessageContext messageContext) {
- //Ideally this should take from thread local carbon context change this temporary
- PrivilegedCarbonContext carbonContext =
- PrivilegedCarbonContext.getCurrentContext(messageContext);
- int tenantId = carbonContext.getTenantId();
- if (tenantId > -1 || tenantId == MultitenantConstants.SUPER_TENANT_ID) {
- return tenantId;
- }
- String domain = carbonContext.getTenantDomain();
- if (domain == null) {
- SOAPBody soapBody = messageContext.getEnvelope().getBody();
- if (soapBody != null && soapBody.getFirstElement() != null) {
- OMElement usernameElem = soapBody.getFirstElement().getFirstChildWithName(
- new QName(ServerConstants.AUTHENTICATION_SERVICE_NS,
- ServerConstants.AUTHENTICATION_SERVICE_USERNAME));
- if (usernameElem != null) {
- String userName = usernameElem.getText();
- domain = MultitenantUtils.getTenantDomain(userName);
- }
- }
- }
- if (domain != null) {
- try {
- tenantId = Util.getRealmService().getTenantManager().getTenantId(domain);
- } catch (org.wso2.carbon.user.api.UserStoreException e) {
- log.error("An error occurred while obtaining the tenant id.", e);
- }
- }
- return tenantId;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/module/ActivationModule.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/module/ActivationModule.java b/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/module/ActivationModule.java
deleted file mode 100644
index 9cfbee5..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/module/ActivationModule.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.module;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisDescription;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.modules.Module;
-import org.apache.neethi.Assertion;
-import org.apache.neethi.Policy;
-
-/**
- * Module used to engage the activation handler.
- */
-public class ActivationModule implements Module {
-
- /**
- * {@inheritDoc}
- */
- public void init(ConfigurationContext configurationContext, AxisModule axisModule)
- throws AxisFault {
- }
-
- /**
- * {@inheritDoc}
- */
- public void engageNotify(AxisDescription axisDescription) throws AxisFault {
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean canSupportAssertion(Assertion assertion) {
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- public void applyPolicy(Policy policy, AxisDescription axisDescription) throws AxisFault {
- }
-
- /**
- * {@inheritDoc}
- */
- public void shutdown(ConfigurationContext configurationContext) throws AxisFault {
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/service/ActivationService.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/service/ActivationService.java b/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/service/ActivationService.java
deleted file mode 100644
index e16f2fb..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/service/ActivationService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.service;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.activation.utils.ActivationManager;
-import org.wso2.carbon.activation.utils.Util;
-import org.wso2.carbon.stratos.common.config.CloudServiceConfigParser;
-import org.wso2.carbon.stratos.common.config.CloudServicesDescConfig;
-import org.wso2.carbon.stratos.common.util.CloudServicesUtil;
-import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-
-/**
- * Admin Service to handle activation of cloud services used by tenants.
- */
-public class ActivationService {
-
- private static final Log log = LogFactory.getLog(ActivationService.class);
-
- /**
- * Method to update an activation record.
- *
- * @param tenantId the tenant identifier.
- *
- * @throws Exception if the operation failed.
- */
- public static void updateActivation(int tenantId) throws Exception {
- if (tenantId != 0) {
- String serviceName = Util.getServiceName();
- boolean isActive = CloudServicesUtil.isCloudServiceActive(serviceName, tenantId);
- CloudServicesDescConfig cloudServicesDesc =
- CloudServiceConfigParser.loadCloudServicesConfiguration();
- CloudServicesUtil.setCloudServiceActive(!isActive,
- serviceName,
- tenantId,
- cloudServicesDesc.getCloudServiceConfigs()
- .get(serviceName));
- ActivationManager.setActivation(tenantId, !isActive);
- }
- }
-
- /**
- * Method to determine whether a service is active for the given tenant.
- *
- * @param tenantId tenantId the tenant identifier.
- *
- * @return whether the service is active.
- * @throws Exception if the operation failed.
- */
- public boolean isActive(int tenantId) throws Exception {
- if (tenantId == MultitenantConstants.SUPER_TENANT_ID) {
- return true;
- }
- if (ActivationManager.activationRecorded(tenantId)) {
- return ActivationManager.getActivation(tenantId);
- }
- String serviceName = Util.getServiceName();
- if (CloudServicesUtil.isCloudServiceActive(serviceName, tenantId)) {
- log.debug("Successful attempt to access " + serviceName + " by tenant " + tenantId);
- ActivationManager.setActivation(tenantId, true);
- return true;
- }
- log.warn("Failed attempt to access " + serviceName + " by tenant " + tenantId);
- ActivationManager.setActivation(tenantId, false);
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/utils/ActivationManager.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/utils/ActivationManager.java b/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/utils/ActivationManager.java
deleted file mode 100644
index 41153a8..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/utils/ActivationManager.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.utils;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Manages Activations of Services for Tenants.
- */
-public class ActivationManager {
-
- private static final ConcurrentHashMap<Integer, Boolean> activations =
- new ConcurrentHashMap<Integer, Boolean>();
- private static Timer timer = null;
-
- /**
- * Starts cleaning up cached activation records at periodic intervals.
- */
- public static void startCacheCleaner() {
- TimerTask faultyServiceRectifier = new CacheCleaner();
- timer = new Timer();
- // Retry in 1 minute
- long retryIn = 1000 * 60;
- timer.schedule(faultyServiceRectifier, 0, retryIn);
- }
-
- /**
- * Stops cleaning up cached activation records.
- */
- public static void stopCacheCleaner() {
- timer.cancel();
- timer = null;
- }
-
- /**
- * Method to set an activation record.
- *
- * @param tenantId the tenant identifier.
- * @param status true if the service is active or false if not.
- */
- public static void setActivation(int tenantId, boolean status) {
- ActivationManager.activations.put(tenantId, status);
- }
-
- /**
- * Method to check whether an activation record exists for the given tenant.
- *
- * @param tenantId the tenant identifier.
- *
- * @return true if a record exists.
- */
- public static boolean activationRecorded(int tenantId) {
- return ActivationManager.activations.get(tenantId) != null;
- }
-
- /**
- * Method to retrieve an activation record.
- *
- * @param tenantId the tenant identifier.
- *
- * @return true if the service is active or false if not.
- */
- public static boolean getActivation(int tenantId) {
- return ActivationManager.activations.get(tenantId) != null &&
- ActivationManager.activations.get(tenantId);
- }
-
- private static class CacheCleaner extends TimerTask {
-
- /**
- * {@inheritDoc}
- */
- public void run() {
- ActivationManager.activations.clear();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/utils/Util.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/utils/Util.java b/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/utils/Util.java
deleted file mode 100644
index 9f01045..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/java/org/wso2/carbon/activation/utils/Util.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2005-2009, 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.
- *
- */
-package org.wso2.carbon.activation.utils;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.base.ServerConfiguration;
-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.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Utilities for the Service Activation Module for Tenants.
- */
-public class Util {
-
- private static RegistryService registryService = null;
- private static RealmService realmService = null;
- private static String serviceName = null;
- private static final Log log = LogFactory.getLog(Util.class);
-
- private static boolean cloudServiceInfoPathSanityChecked = false;
-
- /**
- * Stores an instance of the Registry Service that can be used to access the registry.
- *
- * @param service the Registry Service instance.
- */
- public static synchronized void setRegistryService(RegistryService service) {
- if (registryService == null) {
- registryService = service;
- }
- }
-
- /**
- * Method to retrieve the Registry Service instance.
- *
- * @return the Registry Service instance if it has been stored or null if not.
- */
- @SuppressWarnings("unused")
- public static RegistryService getRegistryService() {
- return registryService;
- }
-
- /**
- * Stores an instance of the Realm Service that can be used to access the user realm.
- *
- * @param service the Realm Service instance.
- */
- public static synchronized void setRealmService(RealmService service) {
- if (realmService == null) {
- realmService = service;
- }
- }
-
- /**
- * Method to retrieve the Realm Service instance.
- *
- * @return the Realm Service instance if it has been stored or null if not.
- */
- public static RealmService getRealmService() {
- return realmService;
- }
-
- private static UserRegistry getSuperTenantGovernanceSystemRegistry() throws RegistryException {
- return registryService.getGovernanceSystemRegistry();
- }
-
-// /**
-// * Method to determine whether the given cloud service is active.
-// *
-// * @param cloudServiceName the name of the cloud service.
-// * @param tenantId the tenant identifier.
-// * @param systemRegistry the super tenant's governance system registry
-// *
-// * @return true if the service is active or false if not.
-// * @throws Exception if the operation failed.
-// */
-// public static boolean isCloudServiceActive(String cloudServiceName,
-// int tenantId, UserRegistry systemRegistry)
-// throws Exception {
-// // The cloud manager is always active
-// if (StratosConstants.CLOUD_MANAGER_SERVICE.equals(cloudServiceName)) {
-// return true;
-// }
-//
-// if(!cloudServiceInfoPathSanityChecked) {
-// if(!systemRegistry.resourceExists(StratosConstants.CLOUD_SERVICE_INFO_STORE_PATH)) {
-// throw new RuntimeException("Cloud services list resource " +
-// StratosConstants.CLOUD_SERVICE_INFO_STORE_PATH + " does not exist");
-// }
-// cloudServiceInfoPathSanityChecked = true;
-// }
-//
-// String cloudServiceInfoPath = StratosConstants.CLOUD_SERVICE_INFO_STORE_PATH +
-// RegistryConstants.PATH_SEPARATOR + tenantId +
-// RegistryConstants.PATH_SEPARATOR + cloudServiceName;
-// Resource cloudServiceInfoResource;
-// if (systemRegistry.resourceExists(cloudServiceInfoPath)) {
-// cloudServiceInfoResource = systemRegistry.get(cloudServiceInfoPath);
-// String isActiveStr =
-// cloudServiceInfoResource.getProperty(StratosConstants.CLOUD_SERVICE_IS_ACTIVE_PROP_KEY);
-// return Boolean.toString(true).equals(isActiveStr);
-// }
-// return false;
-// }
-//
-
- /**
- * Method to obtain the name of the cloud service in which this module is running.
- *
- * @return the name of the service as defined in the server configuration.
- */
- public static String getServiceName() {
- if (serviceName == null) {
- serviceName = ServerConfiguration.getInstance().getFirstProperty("Name");
- }
- return serviceName;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/resources/META-INF/module.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/resources/META-INF/module.xml b/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/resources/META-INF/module.xml
deleted file mode 100644
index b92b725..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/resources/META-INF/module.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, 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.
- -->
-<module name="activation" class="org.wso2.carbon.activation.module.ActivationModule">
- <InFlow>
- <handler name="InFlowActivationHandler"
- class="org.wso2.carbon.activation.module.ActivationHandler">
- <order phase="Validation" phaseFirst="true"/>
- </handler>
- </InFlow>
-
- <InFaultFlow>
- <handler name="FaultInFlowActivationHandler"
- class="org.wso2.carbon.activation.module.ActivationHandler">
- <order phase="Validation" phaseFirst="true"/>
- </handler>
- </InFaultFlow>
- <parameter name="adminModule" locked="true">true</parameter>
-</module>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6be46269/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/resources/META-INF/services.xml b/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/resources/META-INF/services.xml
deleted file mode 100644
index dde74d7..0000000
--- a/components/stratos/org.wso2.carbon.activation/2.1.2/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- !
- ! Copyright (c) 2005-2009, 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.
- !-->
-<serviceGroup>
- <service name="ActivationService" scope="transportsession">
- <transports>
- <transport>https</transport>
- </transports>
- <parameter name="ServiceClass" locked="false">
- org.wso2.carbon.activation.service.ActivationService
- </parameter>
- </service>
- <parameter name="hiddenService" locked="true">true</parameter>
-</serviceGroup>
\ No newline at end of file
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6d1da26a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6d1da26a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6d1da26a
Branch: refs/heads/master
Commit: 6d1da26a2710dd8e9d5cbdfba76c6594bfbc46aa
Parents: 6be4626 3fe8d72
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Fri Jul 12 22:24:32 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Fri Jul 12 22:24:32 2013 +0530
----------------------------------------------------------------------
.../2.1.0/pom.xml | 123 -----
.../ui/clients/PackageInfoServiceClient.java | 79 ---
.../mgt/ui/clients/TenantServiceClient.java | 120 ----
.../tenant/mgt/ui/utils/TenantMgtUtil.java | 217 --------
.../src/main/resources/META-INF/component.xml | 61 ---
.../tenant/mgt/ui/i18n/JSResources.properties | 4 -
.../tenant/mgt/ui/i18n/Resources.properties | 56 --
.../activate_tenant_ajaxprocessor.jsp | 57 --
.../resources/web/tenant-mgt/add_tenant.jsp | 386 -------------
.../check_domain_availability_ajaxprocessor.jsp | 19 -
.../resources/web/tenant-mgt/css/tenant.css | 62 ---
.../web/tenant-mgt/docs/aboutUsagePlans.html | 104 ----
.../web/tenant-mgt/docs/images/add-org.png | Bin 49926 -> 0 bytes
.../web/tenant-mgt/docs/images/add-tenant.png | Bin 28704 -> 0 bytes
.../web/tenant-mgt/docs/images/view-tenants.png | Bin 11896 -> 0 bytes
.../web/tenant-mgt/docs/userguide.html | 56 --
.../get_package_info_ajaxprocessor.jsp | 39 --
.../web/tenant-mgt/images/multi_tenancy.png | Bin 768 -> 0 bytes
.../web/tenant-mgt/images/services.gif | Bin 604 -> 0 bytes
.../web/tenant-mgt/images/services1.gif | Bin 608 -> 0 bytes
.../web/tenant-mgt/js/tenant_config.js | 218 --------
.../web/tenant-mgt/js/theme_resource_util.js | 0
.../tenant-mgt/submit_tenant_ajaxprocessor.jsp | 84 ---
.../resources/web/tenant-mgt/view_tenants.jsp | 236 --------
.../org.apache.stratos.tenant.mgt.ui/pom.xml | 123 +++++
.../ui/clients/PackageInfoServiceClient.java | 79 +++
.../mgt/ui/clients/TenantServiceClient.java | 120 ++++
.../tenant/mgt/ui/utils/TenantMgtUtil.java | 217 ++++++++
.../src/main/resources/META-INF/component.xml | 61 +++
.../tenant/mgt/ui/i18n/JSResources.properties | 4 +
.../tenant/mgt/ui/i18n/Resources.properties | 56 ++
.../activate_tenant_ajaxprocessor.jsp | 57 ++
.../resources/web/tenant-mgt/add_tenant.jsp | 386 +++++++++++++
.../check_domain_availability_ajaxprocessor.jsp | 19 +
.../resources/web/tenant-mgt/css/tenant.css | 62 +++
.../web/tenant-mgt/docs/aboutUsagePlans.html | 104 ++++
.../web/tenant-mgt/docs/images/add-org.png | Bin 0 -> 49926 bytes
.../web/tenant-mgt/docs/images/add-tenant.png | Bin 0 -> 28704 bytes
.../web/tenant-mgt/docs/images/view-tenants.png | Bin 0 -> 11896 bytes
.../web/tenant-mgt/docs/userguide.html | 56 ++
.../get_package_info_ajaxprocessor.jsp | 39 ++
.../web/tenant-mgt/images/multi_tenancy.png | Bin 0 -> 768 bytes
.../web/tenant-mgt/images/services.gif | Bin 0 -> 604 bytes
.../web/tenant-mgt/images/services1.gif | Bin 0 -> 608 bytes
.../web/tenant-mgt/js/tenant_config.js | 218 ++++++++
.../web/tenant-mgt/js/theme_resource_util.js | 0
.../tenant-mgt/submit_tenant_ajaxprocessor.jsp | 84 +++
.../resources/web/tenant-mgt/view_tenants.jsp | 236 ++++++++
.../org.apache.stratos.throttling.agent/pom.xml | 20 +-
.../MultitenancyThrottlingServiceClient.java | 2 +-
.../org.apache.stratos.throttling.ui/pom.xml | 16 +-
.../ui/clients/ThrottlingRuleEditorClient.java | 2 +-
components/org.apache.stratos.usage.ui/pom.xml | 16 +-
.../usage/ui/clients/UsageServiceClient.java | 10 +-
.../usage/ui/report/AllTenantUsageReport.java | 2 +-
.../stratos/usage/ui/report/UsageReport.java | 6 +-
.../stratos/usage/ui/utils/UsageUtil.java | 251 ---------
.../carbon/usage/ui/i18n/JSResources.properties | 2 -
.../carbon/usage/ui/i18n/Resources.properties | 57 --
.../tenant-usage/all_tenant_instance_usage.jsp | 14 +-
.../web/tenant-usage/all_tenant_usage.jsp | 18 +-
.../tenant-usage/all_tenant_usage_report.jsp | 2 +-
.../web/tenant-usage/any_tenant_usage.jsp | 16 +-
.../resources/web/tenant-usage/tenant_usage.jsp | 18 +-
.../resources/web/tenant-usage/usage_report.jsp | 4 +-
components/pom.xml | 31 +-
.../pom.xml | 116 ++++
.../MultitenancyThrottlingService.wsdl | 82 +++
.../org.apache.stratos.throttling.stub/pom.xml | 118 ++++
.../resources/ThrottlingRuleEditorService.wsdl | 148 +++++
.../org.apache.stratos.usage.stub/pom.xml | 121 +++++
.../src/main/resources/UsageService.wsdl | 542 +++++++++++++++++++
.../4.1.0/pom.xml | 113 ----
.../MultitenancyThrottlingService.wsdl | 82 ---
.../4.1.0/pom.xml | 114 ----
.../resources/ThrottlingRuleEditorService.wsdl | 148 -----
.../org.wso2.carbon.usage.stub/4.1.0/pom.xml | 118 ----
.../4.1.0/src/main/resources/UsageService.wsdl | 540 ------------------
.../org.wso2.carbon.usage.stub/4.1.1/pom.xml | 118 ----
.../4.1.1/src/main/resources/UsageService.wsdl | 533 ------------------
.../org.wso2.carbon.usage.stub/4.1.2/pom.xml | 118 ----
.../4.1.2/src/main/resources/UsageService.wsdl | 533 ------------------
.../org.wso2.carbon.usage.stub/4.1.3/pom.xml | 118 ----
.../4.1.3/src/main/resources/UsageService.wsdl | 542 -------------------
84 files changed, 3149 insertions(+), 5384 deletions(-)
----------------------------------------------------------------------