You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/06 18:53:16 UTC
[4/7] refactoring org.apache.stratos.common component
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/java/org/wso2/carbon/stratos/common/util/MeteringAccessValidationUtils.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/java/org/wso2/carbon/stratos/common/util/MeteringAccessValidationUtils.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/java/org/wso2/carbon/stratos/common/util/MeteringAccessValidationUtils.java
deleted file mode 100644
index 7f9e8c3..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/java/org/wso2/carbon/stratos/common/util/MeteringAccessValidationUtils.java
+++ /dev/null
@@ -1,51 +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.
- */
-package org.wso2.carbon.stratos.common.util;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-public class MeteringAccessValidationUtils {
-
- public static final String ERROR_MSG_PROPERTY_KEY_POST_FIX = "error_msg";
- public static final String IS_BLOCKED_PROPERTY_KEY_POST_FIX = "is_blocked";
-
- public static String generateIsBlockedPropertyKey(String action) {
- return action + "_" + IS_BLOCKED_PROPERTY_KEY_POST_FIX;
- }
-
- public static String generateErrorMsgPropertyKey(String action) {
- return action + "_" + ERROR_MSG_PROPERTY_KEY_POST_FIX;
- }
-
- public static Set<String> getAvailableActions(Properties properties) {
- Set propertyKeys = properties.keySet();
- Set<String> actions = new HashSet<String>();
- for (Object propertyKeyObj : propertyKeys) {
- String propertyKey = (String) propertyKeyObj;
- if (propertyKey.endsWith(IS_BLOCKED_PROPERTY_KEY_POST_FIX)) {
- // -1 for the length of the '_'
- String action =
- propertyKey.substring(0, propertyKey.length() -
- IS_BLOCKED_PROPERTY_KEY_POST_FIX.length() - 1);
- actions.add(action);
- }
- }
- return actions;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/java/org/wso2/carbon/stratos/common/util/StratosConfiguration.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/java/org/wso2/carbon/stratos/common/util/StratosConfiguration.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/java/org/wso2/carbon/stratos/common/util/StratosConfiguration.java
deleted file mode 100644
index 611158f..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/java/org/wso2/carbon/stratos/common/util/StratosConfiguration.java
+++ /dev/null
@@ -1,319 +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.common.util;
-
-import java.lang.String;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Class for the stratos specific parameters configuration
- */
-public class StratosConfiguration {
-
- // By default email sending is disabled. Changed according to the configuration file.
- private boolean emailsDisabled = true;
-
- private boolean emailValidationRequired = false;
- private boolean isPublicCloudSetup = true;
- private boolean isTenantActivationModerated = false;
- private boolean chargeOnRegistration = false;
- private String SuperAdminEmail = "";
- private String paypalUrl = "";
- private String paypalAPIUsername = "";
- private String paypalAPIPassword = "";
- private String paypalAPISignature = "";
- private String paypalEnvironment="";
- private String usagePlanURL = "";
- private String paidJIRAUrl = "";
- private String paidJIRAProject = "";
- private String forumUrl = "";
- private String paidUserGroup = "";
- private String nonpaidUserGroup = "";
- private String supportInfoUrl = "";
- private String incidentCustomFieldId = ""; // todo this is a custom field id of JIRA, this need to be dynamically get in jira reporting component
- private String incidentImpactCustomFieldId = "";
- private String stratosEventListenerName ="";
- private Map<String, String> stratosEventProperties = new HashMap<String, String>();
- private String googleAnalyticsURL;
- private String managerServiceUrl = "";
- private String adminUserName = "";
- private String adminPassword = "";
- private String ssoLoadingMessage="";
-
- /**
- * @return Stratos Manager service url
- */
- public String getManagerServiceUrl() {
- return managerServiceUrl;
- }
-
- public void setManagerServiceUrl(String managerServiceUrl) {
- this.managerServiceUrl = managerServiceUrl;
- }
-
- /**
- * @return Super admin User name
- */
- public String getAdminUserName() {
- return adminUserName;
- }
-
- public void setAdminUserName(String adminUserName) {
- this.adminUserName = adminUserName;
- }
-
- /**
- * @return super admin password
- */
- public String getAdminPassword() {
- return adminPassword;
- }
-
- public void setAdminPassword(String adminPassword) {
- this.adminPassword = adminPassword;
- }
-
- //This parameter used to skip usage summary generator
- private boolean skipSummaryGenerator = false;
-
- public boolean isSkipSummaryGenerator() {
- return skipSummaryGenerator;
- }
-
- public void setSkipSummaryGenerator(boolean skipSummaryGenerator) {
- this.skipSummaryGenerator = skipSummaryGenerator;
- }
- //This is the url that we pointed users when they need to aware about usage plans
-
- public String getUsagePlanURL() {
- return usagePlanURL;
- }
-
- public void setUsagePlanURL(String usagePlanURL) {
- this.usagePlanURL = usagePlanURL;
- }
-
- //Email address for general notifications
- private String notificationEmail = "";
- //Email address for finance related notifications
- private String financeNotificationEmail = "";
-
- public boolean isTenantActivationModerated() {
- return isTenantActivationModerated;
- }
-
- public void setTenantActivationModerated(boolean tenantActivationModerated) {
- isTenantActivationModerated = tenantActivationModerated;
- }
-
- public String getSuperAdminEmail() {
- return SuperAdminEmail;
- }
-
- public void setSuperAdminEmail(String superAdminEmail) {
- SuperAdminEmail = superAdminEmail;
- }
-
- public boolean getEmailValidationRequired() {
- return emailValidationRequired;
- }
-
- public String getPaypalUrl() {
- return paypalUrl;
- }
-
- public void setPaypalUrl(String paypalUrl) {
- this.paypalUrl = paypalUrl;
- }
-
- public void setEmailValidationRequired(boolean emailValidationRequired) {
- this.emailValidationRequired = emailValidationRequired;
- }
-
- public boolean isPublicCloudSetup() {
- return isPublicCloudSetup;
- }
-
- public void setPublicCloudSetup(boolean publicCloudSetup) {
- isPublicCloudSetup = publicCloudSetup;
- }
-
- public String getNotificationEmail() {
- return notificationEmail;
- }
-
- public void setNotificationEmail(String notificationEmail) {
- this.notificationEmail = notificationEmail;
- }
-
- public String getPaypalAPIUsername() {
- return paypalAPIUsername;
- }
-
- public void setPaypalAPIUsername(String paypalAPIUsername) {
- this.paypalAPIUsername = paypalAPIUsername;
- }
-
- public String getPaypalAPIPassword() {
- return paypalAPIPassword;
- }
-
- public void setPaypalAPIPassword(String paypalAPIPassword) {
- this.paypalAPIPassword = paypalAPIPassword;
- }
-
- public String getPaypalAPISignature() {
- return paypalAPISignature;
- }
-
- public void setPaypalAPISignature(String paypalAPISignature) {
- this.paypalAPISignature = paypalAPISignature;
- }
-
- public String getFinanceNotificationEmail() {
- return financeNotificationEmail;
- }
-
- public void setFinanceNotificationEmail(String financeNotificationEmail) {
- this.financeNotificationEmail = financeNotificationEmail;
- }
-
- public String getPaidJIRAUrl() {
- return paidJIRAUrl;
- }
-
- public void setPaidJIRAUrl(String paidJIRAUrl) {
- this.paidJIRAUrl = paidJIRAUrl;
- }
-
- public String getPaidJIRAProject() {
- return paidJIRAProject;
- }
-
- public void setPaidJIRAProject(String paidJIRAProject) {
- this.paidJIRAProject = paidJIRAProject;
- }
-
- public String getForumUrl() {
- return forumUrl;
- }
-
- public void setForumUrl(String forumUrl) {
- this.forumUrl = forumUrl;
- }
-
- public String getPaidUserGroup() {
- return paidUserGroup;
- }
-
- public void setPaidUserGroup(String paidUserGroup) {
- this.paidUserGroup = paidUserGroup;
- }
-
- public String getNonpaidUserGroup() {
- return nonpaidUserGroup;
- }
-
- public void setNonpaidUserGroup(String nonpaidUserGroup) {
- this.nonpaidUserGroup = nonpaidUserGroup;
- }
-
- public String getSupportInfoUrl() {
- return supportInfoUrl;
- }
-
- public void setSupportInfoUrl(String supportInfoUrl) {
- this.supportInfoUrl = supportInfoUrl;
- }
-
- public String getIncidentCustomFieldId() {
- return incidentCustomFieldId;
- }
-
- public void setIncidentCustomFieldId(String incidentCustomFieldId) {
- this.incidentCustomFieldId = incidentCustomFieldId;
- }
-
- public String getIncidentImpactCustomFieldId() {
- return incidentImpactCustomFieldId;
- }
-
- public void setIncidentImpactCustomFieldId(String incidentImpactCustomFieldId) {
- this.incidentImpactCustomFieldId = incidentImpactCustomFieldId;
- }
-
- public String getStratosEventListenerName() {
- return stratosEventListenerName;
- }
-
- public void setStratosEventListenerName(String stratosEventListenerName) {
- this.stratosEventListenerName = stratosEventListenerName;
- }
-
- public String getStratosEventListenerPropertyValue(String key) {
- return stratosEventProperties.get(key);
- }
-
- public void setStratosEventListenerProperty(String key, String value) {
- stratosEventProperties.put(key, value);
- }
-
- public String getPaypalEnvironment() {
- return paypalEnvironment;
- }
-
- public void setPaypalEnvironment(String paypalEnvironment) {
- this.paypalEnvironment = paypalEnvironment;
- }
-
- public String getGoogleAnalyticsURL() {
- return googleAnalyticsURL;
- }
-
- public void setGoogleAnalyticsURL(String googleAnalyticsURL) {
- this.googleAnalyticsURL = googleAnalyticsURL;
- }
-
- public boolean isEmailsDisabled() {
- return emailsDisabled;
- }
-
- public void setEmailsDisabled(boolean emailsDisabled) {
- this.emailsDisabled = emailsDisabled;
- }
-
- public boolean isChargeOnRegistration() {
- return chargeOnRegistration;
- }
-
- public void setChargeOnRegistration(boolean chargeOnRegistration) {
- this.chargeOnRegistration = chargeOnRegistration;
- }
-
- public String getSsoLoadingMessage() {
- return ssoLoadingMessage;
- }
-
- public void setSsoLoadingMessage(String ssoLoadingMessage) {
- this.ssoLoadingMessage = ssoLoadingMessage;
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/resources/META-INF/services.xml b/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/resources/META-INF/services.xml
deleted file mode 100644
index 89198d2..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/resources/META-INF/services.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- !
- ! Copyright 2006 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.
- !-->
-<serviceGroup>
-
- <service name="PackageInfoService" scope="transportsession">
- <transports>
- <transport>https</transport>
- </transports>
- <parameter name="ServiceClass" locked="false">
- org.wso2.carbon.stratos.common.services.PackageInfoService
- </parameter>
- <parameter name="adminService" locked="ture">false</parameter>
- </service>
-
- <parameter name="hiddenService" locked="ture">true</parameter>
-
-</serviceGroup>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/resources/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/resources/cloud-services-desc.xml b/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/resources/cloud-services-desc.xml
deleted file mode 100644
index 15fb4b9..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/main/resources/cloud-services-desc.xml
+++ /dev/null
@@ -1,109 +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.
- -->
-<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
- <cloudService name="WSO2 Stratos Manager">
- </cloudService>
- <cloudService name="WSO2 Enterprise Service Bus" default="true">
- <label>Enterprise Service Bus</label>
- <link>https://esb.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/esb.gif
- </icon>
- <description>Enterprise Service Bus in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Application Server" default="true">
- <label>Application Server</label>
- <link>https://appserver.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/appserver.gif
- </icon>
- <description>Application Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Data Services Server" default="true">
- <label>Data Services Server</label>
- <link>https://dss.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/ds.gif
- </icon>
- <description>Data Services Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Governance" default="true">
- <label>Governance</label>
- <link>https://governance.stratoslive.wso2.com</link>
- <description>Governance in the cloud.</description>
- <icon>
- https://localhost:9443/cloud-services-icons/governance.gif
- </icon>
- </cloudService>
- <cloudService name="WSO2 Identity" default="true">
- <label>Identity</label>
- <link>https://identity.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/identity.gif
- </icon>
- <description>Identity in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Business Activity Monitor" default="true">
- <label>Business Activity Monitor</label>
- <link>https://bam.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/bam.gif
- </icon>
- <description>Business Activity Monitor in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Business Process Server" default="true">
- <label>Business Process Server</label>
- <link>https://bps.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/bps.gif
- </icon>
- <description>Business Process Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Business Rule Server" default="true">
- <label>Business Rule Server</label>
- <link>https://brs.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/brs.gif
- </icon>
- <description>Business Rule Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Mashup Server" default="true">
- <label>Mashup Server</label>
- <link>https://mashup.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/mashup.gif
- </icon>
- <description>Mashup Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Gadgets" default="true">
- <label>Gadgets</label>
- <link>https://gadget.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/gadget.gif
- </icon>
- <description>Gadgets in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Cloud Services Gateway" default="true">
- <label>Cloud Gateway</label>
- <link>https://csg.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/csg.gif
- </icon>
- <description>WSO2 Cloud Services Gateway in the cloud.</description>
- </cloudService>
-</cloudServices>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/test/java/org/wso2/carbon/common/test/CommonTest.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/test/java/org/wso2/carbon/common/test/CommonTest.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/test/java/org/wso2/carbon/common/test/CommonTest.java
deleted file mode 100644
index aca6d41..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.0/src/test/java/org/wso2/carbon/common/test/CommonTest.java
+++ /dev/null
@@ -1,48 +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.common.test;
-
-import junit.framework.TestCase;
-import org.wso2.carbon.stratos.common.util.CommonUtil;
-
-public class CommonTest extends TestCase {
- public void testEmailValidation() throws Exception {
- try {
- CommonUtil.validateEmail("damn@right.com");
- assertTrue(true);
- } catch (Exception e) {
- assertTrue(false);
- }
-
- try {
- CommonUtil.validateEmail("damn@right].com");
- assertTrue(false);
- } catch (Exception e) {
- assertTrue(true);
- assertEquals("Wrong characters in the email.", e.getMessage());
- }
-
- try {
- CommonUtil.validateEmail("damn@right@wrong.com");
- assertTrue(false);
- } catch (Exception e) {
- assertTrue(true);
- assertEquals("Invalid email address is provided.", e.getMessage());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/pom.xml b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/pom.xml
deleted file mode 100644
index cff9c0a..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/pom.xml
+++ /dev/null
@@ -1,87 +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.stratos.common</artifactId>
- <version>2.1.1</version>
- <packaging>bundle</packaging>
- <name>WSO2 Stratos - Common</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>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- org.wso2.carbon.stratos.common.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.registry.core.*;version=1.0.1,
- org.wso2.carbon.user.core.*,
- 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.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.core</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.mgt</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/TenantBillingService.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/TenantBillingService.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/TenantBillingService.java
deleted file mode 100644
index e2bff75..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/TenantBillingService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.wso2.carbon.stratos.common;
-
-import org.wso2.carbon.stratos.common.exception.StratosException;
-import org.wso2.carbon.user.api.Tenant;
-
-/**
- * The OSGI service interface that enables tenant related billing actions.
- */
-public interface TenantBillingService {
-
- public void addUsagePlan(Tenant tenant, String usagePlan) throws StratosException;
-
- public String getActiveUsagePlan(String tenantDomain) throws StratosException;
-
- public void updateUsagePlan(String tenantDomain, String usagePlan) throws StratosException;
-
- public void activateUsagePlan(String tenantDomain) throws StratosException;
-
- public void deactivateActiveUsagePlan(String tenantDomain) throws StratosException;
-
- public void deleteBillingData(int tenantId) throws StratosException;
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/beans/TenantInfoBean.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/beans/TenantInfoBean.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/beans/TenantInfoBean.java
deleted file mode 100755
index 8470a39..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/beans/TenantInfoBean.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2005-2008, 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.common.beans;
-
-import java.util.Calendar;
-
-/**
- * Bean class for Tenant Information
- */
-public class TenantInfoBean {
-
- private String admin; //admin's user name
- private String firstname;
- private String lastname;
- private String adminPassword;
- private String tenantDomain;
- private int tenantId;
- private String email;
- private boolean active;
- private String successKey;
- Calendar createdDate;
- private String originatedService;
- private String usagePlan;
-
- public String getFirstname() {
- return firstname;
- }
-
- public void setFirstname(String firstname) {
- this.firstname = firstname;
- }
-
- public String getLastname() {
- return lastname;
- }
-
- public void setLastname(String lastname) {
- this.lastname = lastname;
- }
-
- public String getEmail() {
-
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public int getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(int tenantId) {
- this.tenantId = tenantId;
- }
-
- public String getTenantDomain() {
- return tenantDomain;
- }
-
- public void setTenantDomain(String tenantDomain) {
- this.tenantDomain = tenantDomain;
- }
-
- public String getAdmin() {
- return admin;
- }
-
- public void setAdmin(String admin) {
- this.admin = admin;
- }
-
- public String getAdminPassword() {
- return adminPassword;
- }
-
- public void setAdminPassword(String adminPassword) {
- this.adminPassword = adminPassword;
- }
-
- public boolean isActive() {
- return active;
- }
-
- public void setActive(boolean active) {
- this.active = active;
- }
-
- public String getSuccessKey() {
- return successKey;
- }
-
- public void setSuccessKey(String successKey) {
- this.successKey = successKey;
- }
-
- public Calendar getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Calendar createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getOriginatedService() {
- return originatedService;
- }
-
- public void setOriginatedService(String originatedService) {
- this.originatedService = originatedService;
- }
-
- public String getUsagePlan() {
- return usagePlan;
- }
-
- public void setUsagePlan(String usagePlan) {
- this.usagePlan = usagePlan;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServiceConfig.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServiceConfig.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServiceConfig.java
deleted file mode 100644
index a776bf2..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServiceConfig.java
+++ /dev/null
@@ -1,163 +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.
- */
-package org.wso2.carbon.stratos.common.config;
-
-import org.apache.axiom.om.OMElement;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class CloudServiceConfig {
- private static final String CONFIG_NS = "http://wso2.com/carbon/cloud/mgt/services";
-
- private static final String NAME_ATTR_NAME = "name";
- private static final String DEFAULT_ATTR_NAME = "default";
- private static final String LABEL_ELEMENT_NAME = "label";
- private static final String LINK_ELEMENT_NAME = "link";
- private static final String ICON_ELEMENT_NAME = "icon";
- private static final String DESCRIPTION_ELEMENT_NAME = "description";
- private static final String PERMISSIONS_ELEMENT_NAME = "permissions";
- private static final String PERMISSION_ELEMENT_NAME = "permission";
- private static final String PRODUCT_PAGE_URL_ELEMENT_NAME = "productPageURL";
-
- private String name;
- private String label;
- private String link;
- private String icon;
- private String description;
- private List<PermissionConfig> permissionConfigs;
- boolean defaultActive;
- private String productPageURL;
-
- public CloudServiceConfig(OMElement configEle) {
- permissionConfigs = new ArrayList<PermissionConfig>();
- serialize(configEle);
- }
-
- public void serialize(OMElement configEle) {
- Iterator cloudServiceChildIt = configEle.getChildElements();
- name = configEle.getAttributeValue(new QName(null, NAME_ATTR_NAME));
- defaultActive = "true".equals(configEle.
- getAttributeValue(new QName(null, DEFAULT_ATTR_NAME)));
- while (cloudServiceChildIt.hasNext()) {
- Object cloudServiceChildObj = cloudServiceChildIt.next();
- if (!(cloudServiceChildObj instanceof OMElement)) {
- continue;
- }
- OMElement cloudServiceChildEle = (OMElement) cloudServiceChildObj;
- if (new QName(CONFIG_NS, LABEL_ELEMENT_NAME, "").
- equals(cloudServiceChildEle.getQName())) {
- label = cloudServiceChildEle.getText();
- } else if (new QName(CONFIG_NS, ICON_ELEMENT_NAME, "").
- equals(cloudServiceChildEle.getQName())) {
- icon = cloudServiceChildEle.getText();
- } else if (new QName(CONFIG_NS, LINK_ELEMENT_NAME, "").
- equals(cloudServiceChildEle.getQName())) {
- link = cloudServiceChildEle.getText();
- } else if (new QName(CONFIG_NS, PRODUCT_PAGE_URL_ELEMENT_NAME, "").
- equals(cloudServiceChildEle.getQName())) {
- productPageURL = cloudServiceChildEle.getText();
- } else if (new QName(CONFIG_NS, DESCRIPTION_ELEMENT_NAME, "").
- equals(cloudServiceChildEle.getQName())) {
- description = cloudServiceChildEle.getText();
- } else if (new QName(CONFIG_NS, PERMISSIONS_ELEMENT_NAME, "").
- equals(cloudServiceChildEle.getQName())) {
- Iterator permissionChildIt = cloudServiceChildEle.getChildElements();
- while (permissionChildIt.hasNext()) {
- Object permissionChildObj = permissionChildIt.next();
- if (!(permissionChildObj instanceof OMElement)) {
- continue;
- }
- OMElement permissionChildEle = (OMElement) permissionChildObj;
-
- if (new QName(CONFIG_NS, PERMISSION_ELEMENT_NAME, "").
- equals(permissionChildEle.getQName())) {
- PermissionConfig permissionConfig =
- new PermissionConfig(permissionChildEle);
- permissionConfigs.add(permissionConfig);
- }
- }
- }
-
- }
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public String getLink() {
- return link;
- }
-
- public void setLink(String link) {
- this.link = link;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public List<PermissionConfig> getPermissionConfigs() {
- return permissionConfigs;
- }
-
- public void setPermissionConfigs(List<PermissionConfig> permissionConfigs) {
- this.permissionConfigs = permissionConfigs;
- }
-
- public boolean isDefaultActive() {
- return defaultActive;
- }
-
- public void setDefaultActive(boolean defaultActive) {
- this.defaultActive = defaultActive;
- }
-
- public String getProductPageURL() {
- return productPageURL;
- }
-
- public void setProductPageURL(String productPageURL) {
- this.productPageURL = productPageURL;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServiceConfigParser.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServiceConfigParser.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServiceConfigParser.java
deleted file mode 100644
index b01a385..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServiceConfigParser.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.wso2.carbon.stratos.common.config;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.stratos.common.constants.StratosConstants;
-import org.wso2.carbon.stratos.common.util.CommonUtil;
-import org.wso2.carbon.utils.CarbonUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-
-public class CloudServiceConfigParser {
-
- private static Log log = LogFactory.getLog(CloudServiceConfigParser.class);
-
- private static class SynchronizingClass {
- }
-
- private static final SynchronizingClass loadlock = new SynchronizingClass();
-
- private static CloudServicesDescConfig cloudServicesDescConfig = null;
-
- private static final String CONFIG_FILENAME = "cloud-services-desc.xml";
-
- public static CloudServicesDescConfig loadCloudServicesConfiguration() throws Exception {
- if (cloudServicesDescConfig != null) {
- return cloudServicesDescConfig;
- }
-
- synchronized (loadlock) {
- if (cloudServicesDescConfig == null) {
- try {
- String configFileName = CarbonUtils.getCarbonConfigDirPath() + File.separator +
- StratosConstants.MULTITENANCY_CONFIG_FOLDER + File.separator + CONFIG_FILENAME;
- OMElement configElement = CommonUtil.buildOMElement(new FileInputStream(configFileName));
- cloudServicesDescConfig = new CloudServicesDescConfig(configElement);
- } catch (Exception e) {
- String msg = "Error in building the cloud service configuration.";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- }
- }
- return cloudServicesDescConfig;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServicesDescConfig.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServicesDescConfig.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServicesDescConfig.java
deleted file mode 100644
index 27d3f9e..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/CloudServicesDescConfig.java
+++ /dev/null
@@ -1,58 +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.
- */
-package org.wso2.carbon.stratos.common.config;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import java.util.*;
-
-public class CloudServicesDescConfig {
- private static final Log log = LogFactory.getLog(CloudServicesDescConfig.class);
- private static final String CONFIG_NS = "http://wso2.com/carbon/cloud/mgt/services";
- private static final String CLOUD_SERVICE_ELEMENT_NAME = "cloudService";
-
- Map<String, CloudServiceConfig> cloudServiceConfigs;
-
- public CloudServicesDescConfig(OMElement configEle) {
- // as the cloud service configs are kept in an order, we use an ordered map.
- cloudServiceConfigs = new LinkedHashMap<String, CloudServiceConfig>();
- serialize(configEle);
- }
-
- public void serialize(OMElement configEle) {
- Iterator configChildIt = configEle.getChildElements();
- while (configChildIt.hasNext()) {
- Object configChildObj = configChildIt.next();
- if (!( configChildObj instanceof OMElement)) {
- continue;
- }
- OMElement configChildEle = (OMElement)configChildObj;
- if (new QName(CONFIG_NS, CLOUD_SERVICE_ELEMENT_NAME, "").
- equals(configChildEle.getQName())) {
- CloudServiceConfig cloudServiceConfig = new CloudServiceConfig(configChildEle);
- String name = cloudServiceConfig.getName();
- cloudServiceConfigs.put(name, cloudServiceConfig);
- }
- }
- }
-
- public Map<String, CloudServiceConfig> getCloudServiceConfigs() {
- return cloudServiceConfigs;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/PermissionConfig.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/PermissionConfig.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/PermissionConfig.java
deleted file mode 100644
index 5171019..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/config/PermissionConfig.java
+++ /dev/null
@@ -1,68 +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.
- */
-package org.wso2.carbon.stratos.common.config;
-
-import org.apache.axiom.om.OMElement;
-
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
-public class PermissionConfig {
- private static final String CONFIG_NS = "http://wso2.com/carbon/cloud/mgt/services";
- private static final String PATH = "path";
- private static final String NAME = "name";
- String name;
- String path;
-
- public PermissionConfig(OMElement configEle) {
- serialize(configEle);
- }
-
- public void serialize(OMElement configEle) {
-
- Iterator configChildIt = configEle.getChildElements();
- while (configChildIt.hasNext()) {
- Object configChildObj = configChildIt.next();
- if (!( configChildObj instanceof OMElement)) {
- continue;
- }
- OMElement configChildEle = (OMElement)configChildObj;
- if (new QName(CONFIG_NS, NAME, "").
- equals(configChildEle.getQName())) {
- name = configChildEle.getText();
- } else if (new QName(CONFIG_NS, PATH, "").
- equals(configChildEle.getQName())) {
- path = configChildEle.getText();
- }
- }
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/constants/StratosConstants.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/constants/StratosConstants.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/constants/StratosConstants.java
deleted file mode 100644
index bbc3dd9..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/constants/StratosConstants.java
+++ /dev/null
@@ -1,143 +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.common.constants;
-
-import java.io.File;
-
-public class StratosConstants {
-
- public static final String CLOUD_SERVICE_IS_ACTIVE_PROP_KEY = "active";
-
- public static final String CLOUD_SERVICE_INFO_STORE_PATH =
- "/repository/components/org.wso2.stratos/cloud-manager/cloud-services";
-
- public static final String TENANT_USER_VALIDATION_STORE_PATH =
- "/repository/components/org.wso2.carbon.validations";
- public static final String ADMIN_EMAIL_VERIFICATION_FLAG_PATH =
- "/repository/components/org.wso2.carbon.email-confirmation-flag";
- public static final String TENANT_DOMAIN_VERIFICATION_FLAG_PATH =
- "/repository/components/org.wso2.carbon.domain-confirmation-flag";
-
- public static final String DOMAIN_VALIDATOR_INFO_PATH =
- "/repository/components/org.wso2.carbon.domain-validator-info";
-
- public static final String TENANT_CREATION_THEME_PAGE_TOKEN =
- "/repository/components/org.wso2.carbon.theme-page-token";
-
- public static final String TENANT_PACKAGE_INFO_PATH =
- "/repository/components/org.wso2.carbon.package-info";
-
- public static final String ALL_THEMES_PATH =
- "/repository/components/org.wso2.carbon.all-themes";
-
- public static final String THROTTLING_RULES_PATH =
- "/repository/components/org.wso2.carbon.throttling-rules";
-
- public static final String ORIGINATED_SERVICE_PATH =
- "/repository/components/org.wso2.carbon.originated-service";
-
- public static final String PATH_SEPARATOR = "/";
-
- public static final String CLOUD_SERVICE_ICONS_STORE_PATH =
- "/repository/components/org.wso2.carbon.cloud-manager/" +
- "cloud-services-icons";
-
- public static final String VALIDATION_KEY_RESOURCE_NAME = "validation-key";
- public static final String INCOMING_PATH_DIR = "incoming";
- public static final String OUTGOING_PATH_DIR = "outgoing";
- public static final String MULTITENANCY_SCHEDULED_TASK_ID = "multitenancyScheduledTask";
- public static final String MULTITENANCY_VIEWING_TASK_ID = "multitenancyViewingTask";
-
- public static final String INVALID_TENANT = "invalidTenant";
- public static final String INACTIVE_TENANT = "inactiveTenant";
- public static final String ACTIVE_TENANT = "activeTenant";
- public static final String IS_EMAIL_VALIDATED = "isEmailValidated";
- public static final String IS_CREDENTIALS_ALREADY_RESET = "isCredentialsReset";
- public static final String TENANT_ADMIN = "tenantAdminUsername";
-
- public static final String CLOUD_MANAGER_SERVICE = "WSO2 Stratos Manager";
- public static final String CLOUD_IDENTITY_SERVICE = "WSO2 Stratos Identity";
- public static final String CLOUD_GOVERNANCE_SERVICE = "WSO2 Stratos Governance";
- public static final String CLOUD_ESB_SERVICE = "WSO2 Stratos Enterprise Service Bus";
-
- // keystore mgt related Constants
- public static final String TENANT_KS = "/repository/security/key-stores/";
- public static final String TENANT_PUB_KEY = "/repository/security/pub-key";
- public static final String PROP_TENANT_KS_TYPE = "key-store-type";
- public static final String PROP_TENANT_KS_PASSWD = "key-store-password";
- public static final String PROP_TENANT_KS_PRIV_KEY_PASSWD = "priv-key-password";
- public static final String PROP_TENANT_KS_ALIAS = "alias";
-
- // constants related to redirection
-
- public static final String UNVERIFIED_ACCOUNT_DOMAIN_SUFFIX = "-unverified";
- public static final String TENANT_SPECIFIC_URL_RESOLVED = "tenant-sepcific-url-resolved";
- public static final String SUFFIXED_UNVERIFIED_SESSION_FLAG = "temp-suffixed-unverified";
-
- // metering constants
- public static final String THROTTLING_ALL_ACTION = "all_actions";
- public static final String THROTTLING_IN_DATA_ACTION = "in_data_action"; //this covers registry capacity + registry bandwidth
- public static final String THROTTLING_OUT_DATA_ACTION = "out_data_action"; //this covers registry bandwidth
- public static final String THROTTLING_ADD_USER_ACTION = "add_user_action";
- public static final String THROTTLING_SERVICE_IN_BANDWIDTH_ACTION = "service_in_bandwith_action";
- public static final String THROTTLING_SERVICE_OUT_BANDWIDTH_ACTION = "service_out_bandwith_action";
- public static final String THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION = "webapp_in_bandwith_action";
- public static final String THROTTLING_WEBAPP_OUT_BANDWIDTH_ACTION = "webapp_out_bandwith_action";
- public static final String THROTTLING_SERVICE_REQUEST_ACTION = "service_request_action";
- public static final String THROTTLING_SERVICE_RESPONSE_ACTION = "service_response_action";
-
- // the session attribute to keep track whether the registry action validated
- // and the usage persisted
- public static final String REGISTRY_ACTION_VALIDATED_SESSION_ATTR = "registryActionValidated";
- public static final String REGISTRY_USAGE_PERSISTED_SESSION_ATTR = "usagePersited";
-
- // Metering servlet attributes
- public static final String SERVICE_NAME_SERVLET_ATTR = "meteringServiceName";
- public static final String TENANT_ID_SERVLET_ATTR = "tenantId";
- public static final String ADMIN_SERVICE_SERVLET_ATTR = "adminService";
-
- // * as a Service impl related constants
- public static final String ORIGINATED_SERVICE = "originatedService";
-
- // Configuration file name
- public static final String STRATOS_CONF_FILE = "stratos.xml";
- //public static final String STRATOS_CONF_LOC = "repository/conf/";
- //public static final String STRATOS_CONF_FILE_WITH_PATH = STRATOS_CONF_LOC + STRATOS_CONF_FILE;
-
- // EULA location
- public static final String STRATOS_EULA = "eula.xml";
-
- // EULA default text.
- public static final String STRATOS_EULA_DEFAULT_TEXT =
- "Please refer to: " + StratosConstants.STRATOS_TERMS_OF_USAGE +
- " for terms and usage and " + StratosConstants.STRATOS_PRIVACY_POLICY +
- " for privacy policy of WSO2 Stratos.";
-
- // Web location of Terms of Usage and privacy policy
- public static final String STRATOS_TERMS_OF_USAGE =
- "http://wso2.com/cloud/services/terms-of-use/";
- public static final String STRATOS_PRIVACY_POLICY =
- "http://wso2.com/cloud/services/privacy-policy/";
- public static final String MULTITENANCY_FREE_PLAN = "Demo";
- public static final String MULTITENANCY_SMALL_PLAN = "SMB";
- public static final String MULTITENANCY_MEDIUM_PLAN = "Professional";
- public static final String MULTITENANCY_LARGE_PLAN = "Enterprise";
- public static final String EMAIL_CONFIG= "email";
- public static final String MULTITENANCY_CONFIG_FOLDER = "multitenancy";
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/constants/UsageConstants.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/constants/UsageConstants.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/constants/UsageConstants.java
deleted file mode 100644
index e2c521b..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/constants/UsageConstants.java
+++ /dev/null
@@ -1,55 +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.
- */
-package org.wso2.carbon.stratos.common.constants;
-
-public class UsageConstants {
- final public static String ANY_DURATION = "anyDuration";
-
- public static final String SYSTEM_METERING_PATH =
- "/repository/components/org.wso2.carbon.system-metering";
-
- public static final String CUSTOM_METERING_PATH =
- "/repository/components/org.wso2.carbon.system-metering";
-
- // the measurements
- final public static String CAPACITY_USAGE = "capacity-usage";
-
- final public static String SERVICE_REQUEST_COUNT = "serviceRequestCount";
- final public static String SERVICE_RESPONSE_COUNT = "serviceResponseCount";
- final public static String SERVICE_FAULT_COUNT = "serviceFaultCount";
-
- public static final String BANDWIDTH_KEY_PATTERN = "%Bandwidth%";
- public static final String REGISTRY_BANDWIDTH = "RegistryBandwidth";
- public static final String SERVICE_BANDWIDTH = "ServiceBandwidth";
- public static final String WEBAPP_BANDWIDTH = "WebappBandwidth";
- public static final String IN_LABLE = "-In";
- public static final String OUT_LABLE = "-Out";
- public static final String REGISTRY_CONTENT_BANDWIDTH = "ContentBandwidth";
-
- final public static String REGISTRY_INCOMING_BW = REGISTRY_BANDWIDTH + IN_LABLE;
- final public static String REGISTRY_OUTGOING_BW = REGISTRY_BANDWIDTH + OUT_LABLE;
- final public static String REGISTRY_TOTAL_BW = "registry-total-bw-usage";
- final public static String NUMBER_OF_USERS = "number-of-users";
-
- final public static String SERVICE_INCOMING_BW = SERVICE_BANDWIDTH + IN_LABLE;
- final public static String SERVICE_OUTGOING_BW = SERVICE_BANDWIDTH + OUT_LABLE;
- final public static String SERVICE_TOTAL_BW = "serviceRequestTotalBw";
-
- final public static String WEBAPP_INCOMING_BW = WEBAPP_BANDWIDTH + IN_LABLE;
- final public static String WEBAPP_OUTGOING_BW = WEBAPP_BANDWIDTH + OUT_LABLE;
-
- final public static String API_CALL_COUNT = "apiCallCount";
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/exception/StratosException.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/exception/StratosException.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/exception/StratosException.java
deleted file mode 100644
index 678cc63..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/exception/StratosException.java
+++ /dev/null
@@ -1,41 +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.common.exception;
-
-/**
- * This class is defined as the general Exception implementation for Stratos. This can be used
- * within Stratos components when handling exceptions.
- */
-public class StratosException extends Exception{
-
- public StratosException() {
- }
-
- public StratosException(String message) {
- super(message);
- }
-
- public StratosException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public StratosException(Throwable cause) {
- super(cause);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/internal/CloudCommonServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/internal/CloudCommonServiceComponent.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/internal/CloudCommonServiceComponent.java
deleted file mode 100644
index 7549666..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/internal/CloudCommonServiceComponent.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.wso2.carbon.stratos.common.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.stratos.common.packages.PackageInfoHolder;
-import org.wso2.carbon.stratos.common.util.CommonUtil;
-import org.wso2.carbon.stratos.common.util.StratosConfiguration;
-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;
-import org.wso2.carbon.user.core.tenant.TenantManager;
-
-/**
- * @scr.component name="stratos.common" 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"
- */
-public class CloudCommonServiceComponent {
-
- private static Log log = LogFactory.getLog(CloudCommonServiceComponent.class);
-
- private static BundleContext bundleContext;
- private static RealmService realmService;
- private static RegistryService registryService;
- private static PackageInfoHolder packageInfos;
-
- protected void activate(ComponentContext context) {
- try {
- bundleContext = context.getBundleContext();
- if (CommonUtil.getStratosConfig() == null) {
- StratosConfiguration stratosConfig = CommonUtil.loadStratosConfiguration();
- CommonUtil.setStratosConfig(stratosConfig);
- }
-
- // Loading the EULA
- if (CommonUtil.getEula() == null) {
- String eula = CommonUtil.loadTermsOfUsage();
- CommonUtil.setEula(eula);
- }
-
- packageInfos = new PackageInfoHolder();
- context.getBundleContext().registerService(
- PackageInfoHolder.class.getName(), packageInfos, null);
-
- //Register manager configuration OSGI service
- try {
- StratosConfiguration stratosConfiguration = CommonUtil.loadStratosConfiguration();
- bundleContext.registerService(StratosConfiguration.class.getName(), stratosConfiguration, null);
- if (log.isDebugEnabled()) {
- log.debug("******* Cloud Common Service bundle is activated ******* ");
- }
- } catch (Exception ex) {
- String msg = "An error occurred while initializing Cloud Common Service as an OSGi Service";
- log.error(msg, ex);
- }
- } catch (Throwable e) {
- log.error("Error in activating Cloud Common Service Component" + e.toString());
- }
- }
-
- protected void deactivate(ComponentContext context) {
- log.debug("******* Tenant Core bundle is deactivated ******* ");
- }
-
- protected void setRegistryService(RegistryService registryService) {
- CloudCommonServiceComponent.registryService = registryService;
- }
-
- protected void unsetRegistryService(RegistryService registryService) {
- setRegistryService(null);
- }
-
- protected void setRealmService(RealmService realmService) {
- CloudCommonServiceComponent.realmService = realmService;
- }
-
- protected void unsetRealmService(RealmService realmService) {
- setRealmService(null);
- }
-
- public static BundleContext getBundleContext() {
- return bundleContext;
- }
-
- public static RegistryService getRegistryService() {
- return registryService;
- }
-
-
- public static RealmService getRealmService() {
- return realmService;
- }
-
- public static TenantManager getTenantManager() {
- return realmService.getTenantManager();
- }
-
- public static UserRegistry getGovernanceSystemRegistry(int tenantId) throws RegistryException {
- return registryService.getGovernanceSystemRegistry(tenantId);
- }
-
- public static UserRegistry getConfigSystemRegistry(int tenantId) throws RegistryException {
- return registryService.getConfigSystemRegistry(tenantId);
- }
-
- public static PackageInfoHolder getPackageInfos() {
- return packageInfos;
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/listeners/TenantMgtListener.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/listeners/TenantMgtListener.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/listeners/TenantMgtListener.java
deleted file mode 100644
index 49da83e..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/listeners/TenantMgtListener.java
+++ /dev/null
@@ -1,39 +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.
- */
-package org.wso2.carbon.stratos.common.listeners;
-
-import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
-import org.wso2.carbon.stratos.common.exception.StratosException;
-
-public interface TenantMgtListener {
- public void onTenantCreate(TenantInfoBean tenantInfo) throws StratosException;
-
- public void onTenantUpdate(TenantInfoBean tenantInfo) throws StratosException;
-
- public void onTenantRename(int tenantId, String oldDomainName,
- String newDomainName)throws StratosException;
-
- public void onTenantInitialActivation(int tenantId) throws StratosException;
-
- public void onTenantActivation(int tenantId) throws StratosException;
-
- public void onTenantDeactivation(int tenantId) throws StratosException;
-
- public void onSubscriptionPlanChange(int tenentId, String oldPlan,
- String newPlan) throws StratosException;
-
- public int getListenerOrder();
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/packages/PackageInfo.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/packages/PackageInfo.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/packages/PackageInfo.java
deleted file mode 100644
index 869c694..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/packages/PackageInfo.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.wso2.carbon.stratos.common.packages;
-
-/*
- * Deserialize following XML
-<packages xmlns="http://wso2.com/carbon/multitenancy/billing/pacakges">
- <package name="multitenancy-free">
- <!--<subscriptionCharge>0</subscriptionCharge>--> <!-- $ per month -->
- <users>
- <limit>5</limit>
- <charge>0</charge> <!-- charge per month -->
- </users>
- <resourceVolume>
- <limit>10</limit> <!--mb per user -->
- </resourceVolume>
- <bandwidth>
- <limit>1000</limit> <!-- mb per user -->
- <overuseCharge>0</overuseCharge> <!-- $ per user per month -->
- </bandwidth>
- </package>
- <package name="multitenancy-small">
- ...
- </package>
-</packages>
- */
-public class PackageInfo {
-
- private String name;
- private int usersLimit;
- private int subscriptionCharge;
- private int chargePerUser;
- private int resourceVolumeLimit;
- private int bandwidthLimit;
- private int bandwidthOveruseCharge;
-
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getUsersLimit() {
- return usersLimit;
- }
-
- public void setUsersLimit(int usersLimit) {
- this.usersLimit = usersLimit;
- }
-
- public int getSubscriptionCharge() {
- return subscriptionCharge;
- }
-
- public void setSubscriptionCharge(int subscriptionCharge) {
- this.subscriptionCharge = subscriptionCharge;
- }
-
- public int getChargePerUser() {
- return chargePerUser;
- }
-
- public void setChargePerUser(int chargePerUser) {
- this.chargePerUser = chargePerUser;
- }
-
- public int getResourceVolumeLimit() {
- return resourceVolumeLimit;
- }
-
- public void setResourceVolumeLimit(int resourceVolumeLimit) {
- this.resourceVolumeLimit = resourceVolumeLimit;
- }
-
- public int getBandwidthLimit() {
- return bandwidthLimit;
- }
-
- public void setBandwidthLimit(int bandwidthLimit) {
- this.bandwidthLimit = bandwidthLimit;
- }
-
- public int getBandwidthOveruseCharge() {
- return bandwidthOveruseCharge;
- }
-
- public void setBandwidthOveruseCharge(int bandwidthOveruseCharge) {
- this.bandwidthOveruseCharge = bandwidthOveruseCharge;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/packages/PackageInfoHolder.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/packages/PackageInfoHolder.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/packages/PackageInfoHolder.java
deleted file mode 100644
index bf5c1e6..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/packages/PackageInfoHolder.java
+++ /dev/null
@@ -1,161 +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.
- */
-package org.wso2.carbon.stratos.common.packages;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jaxen.JaxenException;
-import org.wso2.carbon.stratos.common.constants.StratosConstants;
-import org.wso2.carbon.stratos.common.exception.StratosException;
-import org.wso2.carbon.stratos.common.util.CommonUtil;
-import org.wso2.carbon.utils.CarbonUtils;
-
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class PackageInfoHolder {
- private static Log log = LogFactory.getLog(PackageInfoHolder.class);
- private static final String PACKAGE_DESCRIPTION_CONFIG = "multitenancy-packages.xml";
- private static final String PACKAGE_DESCRIPTION_CONFIG_NS =
- "http://wso2.com/carbon/multitenancy/billing/pacakges";
-
- List<PackageInfo> multitenancyPackages = new ArrayList<PackageInfo>();
-
- public PackageInfoHolder() throws StratosException {
- multitenancyPackages = deserializePackageDescriptionConfig();
- }
-
- public List<PackageInfo> getMultitenancyPackages() {
- return multitenancyPackages;
- }
-
- /*
- * Deserialize following XML
- <packages xmlns="http://wso2.com/carbon/multitenancy/billing/pacakges">
- <package name="multitenancy-free">
- <!--<subscriptionCharge>0</subscriptionCharge>--> <!-- $ per month -->
- <users>
- <limit>5</limit>
- <charge>0</charge> <!-- charge per month -->
- </users>
- <resourceVolume>
- <limit>10</limit> <!--mb per user -->
- </resourceVolume>
- <bandwidth>
- <limit>1000</limit> <!-- mb per user -->
- <overuseCharge>0</overuseCharge> <!-- $ per user per month -->
- </bandwidth>
- </package>
- <package name="multitenancy-small">
- ...
- </package>
- </packages>
- */
- private List<PackageInfo> deserializePackageDescriptionConfig() throws StratosException {
- String configFilePath = CarbonUtils.getCarbonConfigDirPath() + File.separator +
- StratosConstants.MULTITENANCY_CONFIG_FOLDER + File.separator +
- PACKAGE_DESCRIPTION_CONFIG;
-
- OMElement packageConfigs;
- try {
- packageConfigs = CommonUtil.buildOMElement(new FileInputStream(configFilePath));
- } catch (Exception e) {
- String msg = "Error in deserializing the packageConfigs file: " + configFilePath + ".";
- log.error(msg, e);
- throw new StratosException(msg, e);
- }
-
- @SuppressWarnings("unchecked")
- Iterator<OMElement> packageConfigsChildsIt = packageConfigs.getChildElements();
- while (packageConfigsChildsIt.hasNext()) {
- OMElement packageConfigEle = packageConfigsChildsIt.next();
- if (!new QName(PACKAGE_DESCRIPTION_CONFIG_NS, "package").equals(
- packageConfigEle.getQName())) {
- continue;
- }
-
- PackageInfo multitenancyPackage = new PackageInfo();
- String packageName = packageConfigEle.getAttributeValue(new QName("name"));
- String subscriptionCharge = getPackageConfigValue("subscriptionCharge", packageConfigEle);
- String usersLimit = getPackageConfigValue("users.limit", packageConfigEle);
- String usersCharge = getPackageConfigValue("users.charge", packageConfigEle);
-
- String resourceVolumeLimit =
- getPackageConfigValue("resourceVolume.limit", packageConfigEle);
- String resourceVolumeOveruseCharge =
- getPackageConfigValue("resourceVolume.overuseCharge", packageConfigEle);
- String bandwidthLimit = getPackageConfigValue("bandwidth.limit", packageConfigEle);
- String bandwidthOveruseCharge =
- getPackageConfigValue("bandwidth.overuseCharge", packageConfigEle);
- int usersLimitInt = -1;
- if (!usersLimit.equals("unlimited")) {
- usersLimitInt = Integer.parseInt(usersLimit);
- }
- int resourceVolumeLimitInt = -1;
- if (!resourceVolumeLimit.equals("unlimited")) {
- resourceVolumeLimitInt = Integer.parseInt(resourceVolumeLimit);
- }
- int bandwidthLimitInt = -1;
- if (!bandwidthLimit.equals("unlimited")) {
- bandwidthLimitInt = Integer.parseInt(bandwidthLimit);
- }
-
- multitenancyPackage.setName(packageName);
- //In the PackageInfo class subscriptionCharge, chargeperUser and bandwidthOverUsageCharge
- //are declared as Integers. I think it is better to change them to float. If somebody
- //enters a float value to the conf file it will cause an exception here
- multitenancyPackage.setSubscriptionCharge(Integer.parseInt(subscriptionCharge));
- multitenancyPackage.setUsersLimit(usersLimitInt);
- // multitenancyPackage.setChargePerUser(Integer.parseInt(usersCharge));
- multitenancyPackage.setResourceVolumeLimit(resourceVolumeLimitInt);
- multitenancyPackage.setBandwidthLimit(bandwidthLimitInt);
- // multitenancyPackage.setBandwidthOveruseCharge(Integer.parseInt(bandwidthOveruseCharge));
-
- multitenancyPackages.add(multitenancyPackage);
- }
- return multitenancyPackages;
- }
-
- private String getPackageConfigValue(String key, OMElement packageNode) throws StratosException {
- String qualifiedKey = "ns:" + key.replaceAll("\\.", "/ns:");
- AXIOMXPath xpathExpression;
- try {
- xpathExpression = new AXIOMXPath(qualifiedKey);
- xpathExpression.addNamespace("ns", PACKAGE_DESCRIPTION_CONFIG_NS);
- List valueNodes = xpathExpression.selectNodes(packageNode);
- if (valueNodes.isEmpty()) {
- if (log.isDebugEnabled()) {
- String msg = "No results found parsing package configuration for key: " +
- qualifiedKey + ".";
- log.debug(msg);
- }
- return null;
- }
- OMElement valueNode = (OMElement) valueNodes.get(0);
- return valueNode.getText();
- } catch (JaxenException e) {
- String msg = "Error in retrieving the key: " + qualifiedKey + ".";
- log.error(msg, e);
- throw new StratosException(msg, e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bff2da51/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/services/PackageInfoService.java
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/services/PackageInfoService.java b/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/services/PackageInfoService.java
deleted file mode 100644
index 52ec2e1..0000000
--- a/components/stratos/org.wso2.carbon.stratos.common/2.1.1/src/main/java/org/wso2/carbon/stratos/common/services/PackageInfoService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.wso2.carbon.stratos.common.services;
-
-import java.util.List;
-
-import org.wso2.carbon.stratos.common.internal.CloudCommonServiceComponent;
-import org.wso2.carbon.stratos.common.packages.PackageInfo;
-
-public class PackageInfoService {
-
- public PackageInfo[] getPackageInfos() throws Exception {
- List<PackageInfo> list = CloudCommonServiceComponent.getPackageInfos().
- getMultitenancyPackages();
- PackageInfo[] packageInfos = list.toArray(new PackageInfo[list.size()]);
- return packageInfos;
- }
-}