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/07 07:39:32 UTC
[17/17] git commit: removing billing,
payment and sso-mgt components since they are not going to use Apache
Stratos
removing billing, payment and sso-mgt components since they are not going to use Apache 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/45ae532f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/45ae532f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/45ae532f
Branch: refs/heads/master
Commit: 45ae532f3d238dc719ed3437990b33840eec78cb
Parents: 7037d35
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Sun Jul 7 11:08:44 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Sun Jul 7 11:08:44 2013 +0530
----------------------------------------------------------------------
.../2.1.3/pom.xml | 140 -
.../carbon/billing/core/BillingConstants.java | 56 -
.../wso2/carbon/billing/core/BillingEngine.java | 466 ----
.../billing/core/BillingEngineContext.java | 62 -
.../carbon/billing/core/BillingException.java | 27 -
.../carbon/billing/core/BillingHandler.java | 30 -
.../carbon/billing/core/BillingManager.java | 83 -
.../core/BillingTenantMgtListenerImpl.java | 203 --
.../carbon/billing/core/DataAccessManager.java | 244 --
.../core/beans/OutstandingBalanceInfoBean.java | 89 -
.../core/beans/PaginatedBalanceInfoBean.java | 52 -
.../billing/core/conf/BillingConfiguration.java | 185 --
.../core/conf/BillingTaskConfiguration.java | 251 --
.../carbon/billing/core/dataobjects/Cash.java | 304 ---
.../billing/core/dataobjects/Customer.java | 152 --
.../billing/core/dataobjects/Discount.java | 88 -
.../billing/core/dataobjects/Invoice.java | 129 -
.../carbon/billing/core/dataobjects/Item.java | 161 --
.../billing/core/dataobjects/Payment.java | 92 -
.../billing/core/dataobjects/Subscription.java | 125 -
.../core/handlers/DefaultFinalizingHandler.java | 91 -
.../DefaultSubscriptionFeedingHandler.java | 147 -
.../core/handlers/EmailSendingHandler.java | 311 ---
.../handlers/InvoiceCalculationHandler.java | 240 --
.../billing/core/handlers/RuleHandler.java | 142 -
.../SubscriptionTreeBuildingHandler.java | 132 -
.../core/internal/BillingServiceComponent.java | 171 --
.../wso2/carbon/billing/core/internal/Util.java | 132 -
.../billing/core/jdbc/DataAccessObject.java | 2557 ------------------
.../carbon/billing/core/jdbc/Transaction.java | 113 -
.../billing/core/scheduler/BillingJob.java | 63 -
.../core/scheduler/BillingScheduler.java | 74 -
.../billing/core/scheduler/ScheduleHelper.java | 26 -
.../core/scheduler/SchedulerContext.java | 33 -
.../scheduleHelpers/MonthlyScheduleHelper.java | 55 -
.../scheduleHelpers/OneTimeScheduleHelper.java | 33 -
.../billing/core/utilities/CustomerUtils.java | 136 -
.../core/utilities/DataSourceHolder.java | 34 -
.../carbon/billing/test/CarbonHome1Test.java | 242 --
.../org/wso2/carbon/billing/test/CashTest.java | 101 -
.../test/FiveSecondTriggerCalculator.java | 44 -
.../billing/test/FiveSecondTriggerTester.java | 38 -
.../carbon/billing/test/InvoiceMsgTest.java | 217 --
.../test/MonthlyTriggerCalculatorTest.java | 106 -
.../org/wso2/carbon/billing/test/RuleTest.java | 213 --
.../org/wso2/carbon/billing/test/TestUtils.java | 83 -
.../wso2/carbon/billing/test/TriggerTest.java | 226 --
.../repository/conf/billing-config.xml | 83 -
.../repository/conf/billing-rules1.drl | 15 -
.../conf/email-registration-complete.xml | 31 -
.../repository/conf/email-registration.xml | 33 -
.../repository/conf/email-update.xml | 34 -
.../conf/multitenancy-billing-rule.xml | 41 -
.../repository/conf/multitenancy-packages.xml | 88 -
.../repository/conf/notification.xml | 23 -
.../repository/conf/billing-config.xml | 86 -
.../repository/conf/billing-rules1.drl | 15 -
.../conf/email-registration-complete.xml | 31 -
.../repository/conf/email-registration.xml | 33 -
.../repository/conf/email-update.xml | 34 -
.../conf/multitenancy-billing-rule.xml | 41 -
.../repository/conf/multitenancy-packages.xml | 88 -
.../repository/conf/notification.xml | 23 -
.../2.1.0/pom.xml | 117 -
.../mgt/ui/clients/BillingServiceClient.java | 122 -
.../billing/mgt/ui/utils/BillingUtil.java | 182 --
.../src/main/resources/META-INF/component.xml | 100 -
.../billing/mgt/ui/i18n/JSResources.properties | 1 -
.../billing/mgt/ui/i18n/Resources.properties | 52 -
.../add_discount_ajaxprocessor.jsp | 66 -
.../add_payment-ajaxprocessor.jsp | 56 -
.../add_registration_payment-ajaxprocessor.jsp | 79 -
.../web/tenant-billing/adjustments.jsp | 196 --
.../resources/web/tenant-billing/css/billing.cs | 7 -
.../web/tenant-billing/css/billing.css | 58 -
.../resources/web/tenant-billing/discounts.jsp | 182 --
.../web/tenant-billing/docs/images/add-org.png | Bin 49926 -> 0 bytes
.../web/tenant-billing/docs/images/billing.png | Bin 4264 -> 0 bytes
.../web/tenant-billing/docs/images/paypal.png | Bin 9298 -> 0 bytes
.../web/tenant-billing/docs/userguide.html | 75 -
.../find_invoices_ajaxprocessor.jsp | 47 -
.../get_invoice_by_id_ajaxprocessor.jsp | 25 -
.../web/tenant-billing/images/logo.png | Bin 5977 -> 0 bytes
.../web/tenant-billing/images/view-invoice.gif | Bin 1014 -> 0 bytes
.../web/tenant-billing/interim_invoice.jsp | 355 ---
.../make_adjustment_ajaxprocessor.jsp | 49 -
.../web/tenant-billing/past_invoice.jsp | 470 ----
.../prepare_checkout_ajaxprocessor.jsp | 28 -
.../web/tenant-billing/view_balance.jsp | 171 --
.../2.1.3/pom.xml | 117 -
.../billing/mgt/api/DefaultTenantBilling.java | 201 --
.../mgt/api/MultitenancyBillingInfo.java | 178 --
.../carbon/billing/mgt/beans/BilledEntry.java | 41 -
.../carbon/billing/mgt/beans/BillingPeriod.java | 60 -
.../billing/mgt/beans/MultitenancyInvoice.java | 121 -
.../mgt/beans/MultitenancyPurchaseOrder.java | 60 -
.../mgt/beans/MultitenancySubscription.java | 67 -
.../mgt/dataobjects/MultitenancyCustomer.java | 135 -
.../mgt/dataobjects/MultitenancyPackage.java | 152 --
.../dataobjects/MultitenancyPackageSubItem.java | 22 -
.../MultitenancySubscriptionFeedingHandler.java | 234 --
.../MultitenancyBillingServiceComponent.java | 109 -
.../mgt/services/BillingDataAccessService.java | 281 --
.../billing/mgt/services/BillingService.java | 606 -----
.../org/wso2/carbon/billing/mgt/util/Util.java | 173 --
.../src/main/resources/META-INF/component.xml | 29 -
.../src/main/resources/META-INF/services.xml | 96 -
components/stratos/billing/pom.xml | 42 -
.../2.1.0/pom.xml | 65 -
.../wso2/carbon/payment/paypal/dto/Address.java | 101 -
.../payment/paypal/dto/ECDetailResponse.java | 51 -
.../carbon/payment/paypal/dto/ECResponse.java | 69 -
.../wso2/carbon/payment/paypal/dto/Payer.java | 90 -
.../carbon/payment/paypal/dto/PaypalError.java | 52 -
.../payment/paypal/dto/TransactionResponse.java | 60 -
.../internal/PaymentServiceComponent.java | 63 -
.../payment/paypal/services/PaypalService.java | 161 --
.../payment/paypal/util/PaymentConstants.java | 30 -
.../payment/paypal/util/ResponsePopulator.java | 156 --
.../src/main/resources/META-INF/services.xml | 12 -
.../2.1.0/src/main/resources/paypal.properties | 5 -
.../org.wso2.carbon.payment.ui/2.1.0/pom.xml | 71 -
.../payment/ui/client/PaymentServiceClient.java | 85 -
.../src/main/resources/StratosPayment.wsdl | 308 ---
.../carbon/payment/ui/i18n/Resources.properties | 3 -
.../main/resources/web/payment/completed.jsp | 155 --
.../main/resources/web/payment/css/billing.css | 58 -
.../web/payment/doEC-ajaxprocessor.jsp | 58 -
.../main/resources/web/payment/images/logo.png | Bin 5977 -> 0 bytes
.../print_payment_completed_ajaxprocessor.jsp | 132 -
.../web/payment/registration_payment.jsp | 172 --
.../payment/registration_payment_completed.jsp | 147 -
.../web/payment/setEC-ajaxprocessor.jsp | 54 -
.../src/main/resources/web/payment/success.jsp | 165 --
...de_registration_usage_plan_ajaxprocessor.jsp | 59 -
components/stratos/payment/pom.xml | 41 -
.../2.1.0/pom.xml | 122 -
.../saml2/sso/mgt/ui/SSOLoginPageFilter.java | 51 -
.../saml2/sso/mgt/ui/SSORedirectPageFilter.java | 57 -
.../stratos/identity/saml2/sso/mgt/ui/Util.java | 155 --
.../StratosSSOMgtUIServiceComponent.java | 108 -
.../src/main/resources/META-INF/component.xml | 31 -
.../saml2/sso/mgt/ui/i18n/Resources.properties | 36 -
.../web/stratos-as/css/stratos-loginpage.css | 265 --
.../resources/web/stratos-as/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-as/images/feature-01-icon.gif | Bin 3412 -> 0 bytes
.../web/stratos-as/images/feature-02-icon.gif | Bin 3253 -> 0 bytes
.../web/stratos-as/images/feature-03-icon.gif | Bin 3374 -> 0 bytes
.../web/stratos-as/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-as/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-as/images/login-bg.gif | Bin 56861 -> 0 bytes
.../web/stratos-as/images/paas-login-1pix.gif | Bin 43 -> 0 bytes
.../web/stratos-as/images/powered-logo.gif | Bin 1574 -> 0 bytes
.../web/stratos-as/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-as/images/reg-button.gif | Bin 3852 -> 0 bytes
.../stratos-as/images/stratos-login-v3_06.gif | Bin 3412 -> 0 bytes
.../web/stratos-as/login_ajaxprocessor.jsp | 244 --
.../web/stratos-bam/css/stratos-loginpage.css | 265 --
.../web/stratos-bam/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-bam/images/feature-01-icon.gif | Bin 2856 -> 0 bytes
.../web/stratos-bam/images/feature-02-icon.gif | Bin 2738 -> 0 bytes
.../web/stratos-bam/images/feature-03-icon.gif | Bin 3511 -> 0 bytes
.../stratos-bam/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-bam/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-bam/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-bam/images/login-bg.gif | Bin 51582 -> 0 bytes
.../stratos-bam/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-bam/images/powered-logo.gif | Bin 1808 -> 0 bytes
.../web/stratos-bam/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-bam/images/reg-button.gif | Bin 3852 -> 0 bytes
.../stratos-bam/images/stratos-login-v3_06.gif | Bin 3201 -> 0 bytes
.../web/stratos-bam/login_ajaxprocessor.jsp | 244 --
.../web/stratos-bps/css/stratos-loginpage.css | 265 --
.../web/stratos-bps/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-bps/images/feature-01-icon.gif | Bin 2860 -> 0 bytes
.../web/stratos-bps/images/feature-02-icon.gif | Bin 3044 -> 0 bytes
.../web/stratos-bps/images/feature-03-icon.gif | Bin 3159 -> 0 bytes
.../stratos-bps/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-bps/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-bps/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-bps/images/login-bg.gif | Bin 55359 -> 0 bytes
.../stratos-bps/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-bps/images/powered-logo.gif | Bin 1725 -> 0 bytes
.../web/stratos-bps/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-bps/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-bps/login_ajaxprocessor.jsp | 244 --
.../web/stratos-brs/css/stratos-loginpage.css | 265 --
.../web/stratos-brs/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-brs/images/feature-01-icon.gif | Bin 3371 -> 0 bytes
.../web/stratos-brs/images/feature-02-icon.gif | Bin 3018 -> 0 bytes
.../web/stratos-brs/images/feature-03-icon.gif | Bin 3205 -> 0 bytes
.../stratos-brs/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-brs/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-brs/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-brs/images/login-bg.gif | Bin 54810 -> 0 bytes
.../stratos-brs/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-brs/images/powered-logo.gif | Bin 1683 -> 0 bytes
.../web/stratos-brs/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-brs/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-brs/login_ajaxprocessor.jsp | 245 --
.../web/stratos-cep/css/stratos-loginpage.css | 271 --
.../web/stratos-cep/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-cep/images/feature-01-icon.gif | Bin 2240 -> 0 bytes
.../web/stratos-cep/images/feature-02-icon.gif | Bin 4258 -> 0 bytes
.../web/stratos-cep/images/feature-03-icon.gif | Bin 6022 -> 0 bytes
.../stratos-cep/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-cep/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-cep/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-cep/images/login-bg.gif | Bin 58190 -> 0 bytes
.../stratos-cep/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-cep/images/powered-logo.gif | Bin 2995 -> 0 bytes
.../web/stratos-cep/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-cep/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-cep/login_ajaxprocessor.jsp | 245 --
.../web/stratos-csg/css/stratos-loginpage.css | 265 --
.../web/stratos-csg/images/body-bg.gif | Bin 1366 -> 0 bytes
.../web/stratos-csg/images/feature-01-icon.gif | Bin 2418 -> 0 bytes
.../web/stratos-csg/images/feature-02-icon.gif | Bin 3021 -> 0 bytes
.../web/stratos-csg/images/feature-03-icon.gif | Bin 2926 -> 0 bytes
.../stratos-csg/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-csg/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-csg/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-csg/images/login-bg.gif | Bin 31262 -> 0 bytes
.../stratos-csg/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-csg/images/powered-logo.gif | Bin 1492 -> 0 bytes
.../web/stratos-csg/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-csg/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-csg/login_ajaxprocessor.jsp | 244 --
.../web/stratos-dss/css/stratos-loginpage.css | 265 --
.../web/stratos-dss/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-dss/images/feature-01-icon.gif | Bin 3394 -> 0 bytes
.../web/stratos-dss/images/feature-02-icon.gif | Bin 2981 -> 0 bytes
.../web/stratos-dss/images/feature-03-icon.gif | Bin 3291 -> 0 bytes
.../stratos-dss/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-dss/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-dss/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-dss/images/login-bg.gif | Bin 56380 -> 0 bytes
.../stratos-dss/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-dss/images/powered-logo.gif | Bin 1686 -> 0 bytes
.../web/stratos-dss/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-dss/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-dss/login_ajaxprocessor.jsp | 243 --
.../web/stratos-esb/css/stratos-loginpage.css | 265 --
.../web/stratos-esb/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-esb/images/feature-01-icon.gif | Bin 3121 -> 0 bytes
.../web/stratos-esb/images/feature-02-icon.gif | Bin 2462 -> 0 bytes
.../web/stratos-esb/images/feature-03-icon.gif | Bin 1834 -> 0 bytes
.../stratos-esb/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-esb/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-esb/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-esb/images/login-bg.gif | Bin 54491 -> 0 bytes
.../stratos-esb/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-esb/images/powered-logo.gif | Bin 1714 -> 0 bytes
.../web/stratos-esb/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-esb/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-esb/login_ajaxprocessor.jsp | 244 --
.../web/stratos-gov/css/stratos-loginpage.css | 265 --
.../web/stratos-gov/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-gov/images/feature-01-icon.gif | Bin 2587 -> 0 bytes
.../web/stratos-gov/images/feature-02-icon.gif | Bin 3125 -> 0 bytes
.../web/stratos-gov/images/feature-03-icon.gif | Bin 2844 -> 0 bytes
.../stratos-gov/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-gov/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-gov/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-gov/images/login-bg.gif | Bin 54800 -> 0 bytes
.../stratos-gov/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-gov/images/powered-logo.gif | Bin 1657 -> 0 bytes
.../web/stratos-gov/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-gov/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-gov/login_ajaxprocessor.jsp | 244 --
.../web/stratos-gs/css/stratos-loginpage.css | 265 --
.../resources/web/stratos-gs/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-gs/images/feature-01-icon.gif | Bin 3400 -> 0 bytes
.../web/stratos-gs/images/feature-02-icon.gif | Bin 2879 -> 0 bytes
.../web/stratos-gs/images/feature-03-icon.gif | Bin 3273 -> 0 bytes
.../web/stratos-gs/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-gs/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-gs/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-gs/images/login-bg.gif | Bin 47812 -> 0 bytes
.../web/stratos-gs/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-gs/images/powered-logo.gif | Bin 1556 -> 0 bytes
.../web/stratos-gs/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-gs/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-gs/login_ajaxprocessor.jsp | 244 --
.../web/stratos-is/css/stratos-loginpage.css | 265 --
.../resources/web/stratos-is/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-is/images/feature-01-icon.gif | Bin 2576 -> 0 bytes
.../web/stratos-is/images/feature-02-icon.gif | Bin 914 -> 0 bytes
.../web/stratos-is/images/feature-03-icon.gif | Bin 2653 -> 0 bytes
.../web/stratos-is/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-is/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-is/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-is/images/login-bg.gif | Bin 46601 -> 0 bytes
.../web/stratos-is/images/paas-login-1pix.gif | Bin 43 -> 0 bytes
.../web/stratos-is/images/powered-logo.gif | Bin 1499 -> 0 bytes
.../web/stratos-is/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-is/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-is/login_ajaxprocessor.jsp | 253 --
.../web/stratos-mb/css/stratos-loginpage.css | 265 --
.../resources/web/stratos-mb/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-mb/images/feature-01-icon.gif | Bin 2768 -> 0 bytes
.../web/stratos-mb/images/feature-02-icon.gif | Bin 2240 -> 0 bytes
.../web/stratos-mb/images/feature-03-icon.gif | Bin 2259 -> 0 bytes
.../web/stratos-mb/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-mb/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-mb/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-mb/images/login-bg.gif | Bin 57103 -> 0 bytes
.../web/stratos-mb/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-mb/images/powered-logo.gif | Bin 2535 -> 0 bytes
.../web/stratos-mb/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-mb/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-mb/login_ajaxprocessor.jsp | 244 --
.../web/stratos-ms/css/stratos-loginpage.css | 265 --
.../resources/web/stratos-ms/images/body-bg.gif | Bin 923 -> 0 bytes
.../web/stratos-ms/images/feature-01-icon.gif | Bin 3148 -> 0 bytes
.../web/stratos-ms/images/feature-02-icon.gif | Bin 3159 -> 0 bytes
.../web/stratos-ms/images/feature-03-icon.gif | Bin 2580 -> 0 bytes
.../web/stratos-ms/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-ms/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-ms/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-ms/images/login-bg.gif | Bin 52737 -> 0 bytes
.../web/stratos-ms/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-ms/images/powered-logo.gif | Bin 1508 -> 0 bytes
.../web/stratos-ms/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-ms/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-ms/login_ajaxprocessor.jsp | 243 --
.../web/stratos-ss/css/stratos-loginpage.css | 265 --
.../resources/web/stratos-ss/images/body-bg.gif | Bin 1950 -> 0 bytes
.../web/stratos-ss/images/feature-01-icon.gif | Bin 3146 -> 0 bytes
.../web/stratos-ss/images/feature-02-icon.gif | Bin 3498 -> 0 bytes
.../web/stratos-ss/images/feature-03-icon.gif | Bin 3202 -> 0 bytes
.../web/stratos-ss/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-ss/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-ss/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-ss/images/login-bg.gif | Bin 30216 -> 0 bytes
.../web/stratos-ss/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-ss/images/powered-logo.gif | Bin 2274 -> 0 bytes
.../web/stratos-ss/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-ss/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-ss/login_ajaxprocessor.jsp | 243 --
.../web/stratos-sso/css/stratos-loginpage.css | 265 --
.../docs/images/sign-in-no-domain.png | Bin 10682 -> 0 bytes
.../docs/images/sign-in-with-domain.png | Bin 8233 -> 0 bytes
.../web/stratos-sso/docs/userguide.html | 78 -
.../web/stratos-sso/images/body-bg.gif | Bin 923 -> 0 bytes
.../images/cloud-identity-sso-config-ok.png | Bin 38465 -> 0 bytes
.../images/cloud-identity-sso-config.png | Bin 32929 -> 0 bytes
.../web/stratos-sso/images/cloud-sso-config.png | Bin 29222 -> 0 bytes
.../resources/web/stratos-sso/images/delete.gif | Bin 555 -> 0 bytes
.../web/stratos-sso/images/feature-01-icon.gif | Bin 2825 -> 0 bytes
.../web/stratos-sso/images/feature-02-icon.gif | Bin 3361 -> 0 bytes
.../web/stratos-sso/images/feature-03-icon.gif | Bin 3285 -> 0 bytes
.../stratos-sso/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../resources/web/stratos-sso/images/import.gif | Bin 1051 -> 0 bytes
.../web/stratos-sso/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-sso/images/loading.gif | Bin 14367 -> 0 bytes
.../web/stratos-sso/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-sso/images/login-bg.gif | Bin 56795 -> 0 bytes
.../resources/web/stratos-sso/images/logo.gif | Bin 17603 -> 0 bytes
.../stratos-sso/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-sso/images/paas-login-1pix.gif | Bin 43 -> 0 bytes
.../web/stratos-sso/images/paas-login-bg.gif | Bin 65639 -> 0 bytes
.../images/paas-login-register-bg.gif | Bin 5403 -> 0 bytes
.../images/paas-login-register-button.gif | Bin 2617 -> 0 bytes
.../images/paas-login-register-hover.gif | Bin 2697 -> 0 bytes
.../web/stratos-sso/images/paas-sign-in-bg.gif | Bin 4352 -> 0 bytes
.../resources/web/stratos-sso/images/policy.gif | Bin 1017 -> 0 bytes
.../web/stratos-sso/images/powered-logo.gif | Bin 1280 -> 0 bytes
.../web/stratos-sso/images/powered.gif | Bin 1773 -> 0 bytes
.../web/stratos-sso/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-sso/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-sso/images/register.gif | Bin 4099 -> 0 bytes
.../resources/web/stratos-sso/images/sso.gif | Bin 394 -> 0 bytes
.../web/stratos-sso/images/st-login-body-bg.gif | Bin 2215 -> 0 bytes
.../stratos-sso/images/st-login-content-bg.gif | Bin 1060 -> 0 bytes
.../stratos-sso/images/st-login-footer-bg.gif | Bin 749 -> 0 bytes
.../stratos-sso/images/st-login-header-bg.gif | Bin 64503 -> 0 bytes
.../web/stratos-sso/images/stratos_logo_h23.gif | Bin 1280 -> 0 bytes
.../web/stratos-sso/login_ajaxprocessor.jsp | 255 --
.../web/stratos-sso/redirect_ajaxprocessor.jsp | 168 --
.../web/stratos-ts/css/stratos-loginpage.css | 265 --
.../resources/web/stratos-ts/images/body-bg.gif | Bin 1959 -> 0 bytes
.../web/stratos-ts/images/feature-01-icon.gif | Bin 3138 -> 0 bytes
.../web/stratos-ts/images/feature-02-icon.gif | Bin 3033 -> 0 bytes
.../web/stratos-ts/images/feature-03-icon.gif | Bin 2259 -> 0 bytes
.../web/stratos-ts/images/google-apps-login.gif | Bin 4189 -> 0 bytes
.../web/stratos-ts/images/link-icon.gif | Bin 118 -> 0 bytes
.../web/stratos-ts/images/login-ad.gif | Bin 14510 -> 0 bytes
.../web/stratos-ts/images/login-bg.gif | Bin 29105 -> 0 bytes
.../web/stratos-ts/images/paas-login-1pix-1.gif | Bin 43 -> 0 bytes
.../web/stratos-ts/images/powered-logo.gif | Bin 2535 -> 0 bytes
.../web/stratos-ts/images/reg-button-hover.gif | Bin 3824 -> 0 bytes
.../web/stratos-ts/images/reg-button.gif | Bin 3852 -> 0 bytes
.../web/stratos-ts/login_ajaxprocessor.jsp | 244 --
.../2.1.0/pom.xml | 88 -
.../identity/saml2/sso/mgt/SSOMgtConstants.java | 27 -
.../mgt/SSOServiceProviderUpdateManager.java | 129 -
.../internal/StratosSSOMgtServiceComponent.java | 71 -
components/stratos/sso-mgt/pom.xml | 37 -
399 files changed, 26310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/pom.xml b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/pom.xml
deleted file mode 100644
index e7837b0..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/pom.xml
+++ /dev/null
@@ -1,140 +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>billing-parent</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.core</artifactId>
- <version>2.1.3</version>
- <packaging>bundle</packaging>
- <name>WSO2 Carbon - Billing Core</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.billing.core.*,
- </Export-Package>
- <!--<Require-Bundle>
- drools;visibility:=reexport
- </Require-Bundle>-->
- <Import-Package>
- org.wso2.carbon.rule.*,
- org.wso2.carbon.email.sender.api,
- org.quartz.*; version=2.1.1,
- org.apache.synapse.task.*,
- 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>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>-enableassertions</argLine>
- <testFailureIgnore>false</testFailureIgnore>
- <excludes>
- <exclude>**/CashTest.java</exclude>
- <exclude>**/MonthlyTriggerCalculatorTest.java</exclude>
- <exclude>**/RuleTest.java</exclude>
- <exclude>**/CarbonHome1Test.java</exclude>
- <exclude>**/InvoiceMsgTest.java</exclude>
- <exclude>**/TestUtils.java</exclude>
- <exclude>**/TriggerTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.email.sender</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.user.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.synapse</groupId>
- <artifactId>synapse-tasks</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.backend</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.ndatasource.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ndatasource.rdbms</artifactId>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingConstants.java
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingConstants.java b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingConstants.java
deleted file mode 100644
index 6979f65..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingConstants.java
+++ /dev/null
@@ -1,56 +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.billing.core;
-
-public class BillingConstants {
- public static final String GROUP_ID = "BillingTasks";
- public static final String TASK_NAME_KEY = "taskName";
- public static final String SCHEDULER_KEY = "scheduler";
- public static final String SCHEDULER_CONTEXT = "schedulerContext";
- public static final String BILLING_ENGINE_KEY = "billingEngine";
- public static final String BILLING_CONFIG = "billing-config.xml";
- public static final String CONFIG_NS = "http://wso2.com/carbon/multitenancy/billing/config";
- public static final String TRIGGER_CALCULATOR_CLASS_ATTR = "scheduleHelperClass";
- public static final String TRIGGER_CALCULATOR_SERVICE_ATTR = "scheduleHelperService";
- public static final String SCHEDULE_CONF_KEY = "schedule";
- public static final String SCHEDULE_CONF_PARAM_KEY = "parameter";
- public static final String SCHEDULE_CONF_PARAM_NAME_KEY = "name";
- public static final String HANDLER = "handler";
- public static final String HANDLERS = "handlers";
- public static final String HANDLER_CLASS_ATTR = "class";
- public static final String HANDLER_SERVICE_ATTR = "service";
- public static final String SUBSCRIPTION_FILTER_KEY = "subscriptionFilter";
- public static final String DB_CONFIG = "dbConfig";
- public static final String TASKS = "tasks";
- public static final String ATTR_ID = "id";
- public static final String NS_PREFIX = "";
- public static final String DBCONFIG_VALIDATION_QUERY = "validationQuery";
- public static final String DBCONFIG_MAX_WAIT = "maxWait";
- public static final String DBCONFIG_MIN_IDLE = "minIdle";
- public static final String DBCONFIG_MAX_ACTIVE = "maxActive";
- public static final String DBCONFIG_DRIVER_NAME = "driverName";
- public static final String DBCONFIG_PASSWORD = "password";
- public static final String DBCONFIG_USER_NAME = "userName";
- public static final String DBCONFIG_URL = "url";
- public static final String SUBSCRIPTION_SUBITEM = "subscription";
- public static final String BANDWIDTH_SUBITEM = "bwOveruse";
- public static final String STORAGE_SUBITEM = "storageOveruse";
- public static final String CARTRIDGE_SUBITEM = "cartridgeOveruse";
- public static final String PAYMENT_RECEIVED_EMAIL_CUSTOMER_FILE = "email-payment-received-customer.xml";
- public static final String REGISTRATION_PAYMENT_RECEIVED_EMAIL_CUSTOMER_FILE = "email-registration-payment-received-customer.xml";
- public static final String PAYMENT_RECEIVED_EMAIL_WSO2_FILE = "email-payment-received-wso2.xml";
- public static final String WSO2_BILLING_DS = "WSO2BillingDS";
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingEngine.java
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingEngine.java b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingEngine.java
deleted file mode 100644
index b6f8265..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingEngine.java
+++ /dev/null
@@ -1,466 +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.billing.core;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.billing.core.beans.OutstandingBalanceInfoBean;
-import org.wso2.carbon.billing.core.conf.BillingTaskConfiguration;
-import org.wso2.carbon.billing.core.dataobjects.*;
-import org.wso2.carbon.billing.core.internal.Util;
-import org.wso2.carbon.billing.core.jdbc.DataAccessObject;
-import org.wso2.carbon.billing.core.scheduler.BillingScheduler;
-import org.wso2.carbon.billing.core.scheduler.SchedulerContext;
-import org.wso2.carbon.billing.core.utilities.CustomerUtils;
-import org.wso2.carbon.email.sender.api.EmailSender;
-import org.wso2.carbon.email.sender.api.EmailSenderConfiguration;
-import org.wso2.carbon.stratos.common.constants.StratosConstants;
-import org.wso2.carbon.user.api.Tenant;
-import org.wso2.carbon.user.api.TenantManager;
-import org.wso2.carbon.utils.CarbonUtils;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Billing engine work on billing per a seller
- */
-public class BillingEngine {
-
- private static Log log = LogFactory.getLog(BillingEngine.class);
- private BillingTaskConfiguration billingTaskConfig;
- BillingScheduler billingScheduler;
- DataAccessObject dataAccessObject;
-
- public BillingEngine(BillingTaskConfiguration billingTaskConfig,
- DataAccessObject dataAccessObject) {
- this.billingTaskConfig = billingTaskConfig;
- billingScheduler = new BillingScheduler(this, billingTaskConfig);
- this.dataAccessObject = dataAccessObject;
- }
-
- public void scheduleBilling() throws BillingException {
- // the logic to schedule the billing
- SchedulerContext schedulerContext = billingScheduler.createScheduleContext();
- if(schedulerContext.getCronString() != null || !schedulerContext.getCronString().equals("")) {
- billingScheduler.scheduleNextCycle(schedulerContext);
- } else {
- log.debug("Billing is not scheduled : due to undefined cron expression");
- }
- }
-
- public void generateBill() throws BillingException {
- BillingEngineContext billingEngineContext = new BillingEngineContext();
- generateBill(billingEngineContext);
- }
-
- public void generateBill(SchedulerContext schedulerContext) throws BillingException {
- BillingEngineContext billingEngineContext = new BillingEngineContext();
- billingEngineContext.setSchedulerContext(schedulerContext);
- generateBill(billingEngineContext);
- }
-
- public void generateBill(BillingEngineContext billingEngineContext) throws BillingException {
-
- try {
- beginTransaction();
- if (billingEngineContext.getSchedulerContext() == null) {
- SchedulerContext schedulerContext = billingScheduler.createScheduleContext();
- billingEngineContext.setSchedulerContext(schedulerContext);
- }
-
- billingEngineContext.setTaskConfiguration(billingTaskConfig);
-
- // now iterator through all the handlers
- List<BillingHandler> handlers = billingTaskConfig.getBillingHandlers();
- for (BillingHandler handler : handlers) {
- handler.execute(billingEngineContext);
- }
- //commit transaction
- commitTransaction();
- }catch (Exception e){
- String msg = "Error occurred while generating the bill:" + e.getMessage();
- log.error(msg, e);
- //rollback transaction
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
-
- }
-
- public void beginTransaction() throws BillingException {
- dataAccessObject.beginTransaction();
- }
-
- public void commitTransaction() throws BillingException {
- dataAccessObject.commitTransaction();
- }
-
- public void rollbackTransaction() throws BillingException {
- dataAccessObject.rollbackTransaction();
- }
-
- public List<Item> getItemsWithName(String itemName) throws BillingException {
- List<Item> items;
- try {
- beginTransaction();
- items = dataAccessObject.getItemsWithName(itemName);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting item with name: " + itemName +
- " " + e.getMessage();
- log.error(msg);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return items;
- }
-
- public int addItem(Item item) throws BillingException {
- int itemId = 0;
- try {
- beginTransaction();
- itemId = dataAccessObject.addItem(item);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while adding item: " + item.getName() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return itemId;
- }
-
- public Item getItem(int itemId) throws BillingException {
- Item item;
- try {
- beginTransaction();
- item = dataAccessObject.getItem(itemId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting item with id: " + itemId +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return item;
- }
-
- public List<Customer> getCustomersWithName(String customerName) throws BillingException {
- TenantManager tenantManager = Util.getRealmService().getTenantManager();
- List<Customer> customers = new ArrayList<Customer>();
- try{
- int tenantId = tenantManager.getTenantId(customerName);
- Tenant tenant = tenantManager.getTenant(tenantId);
- if(tenant!=null){
- Customer customer = new Customer();
- customer.setId(tenant.getId());
- customer.setName(tenant.getDomain());
- customer.setStartedDate(tenant.getCreatedDate());
- customer.setEmail(tenant.getEmail());
- //customer.setAddress();
- customers.add(customer);
- }
- }catch(Exception e){
- String msg = "Failed to get customers for customers: " + customerName + ".";
- log.error(msg, e);
- throw new BillingException(msg, e);
- }
-
- return customers;
- }
-
- public int addSubscription(Subscription subscription) throws BillingException {
- int subscriptionId = 0;
- try {
- beginTransaction();
- subscriptionId =
- dataAccessObject.addSubscription(subscription,
- subscription.getSubscriptionPlan());
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while adding subscription: " + subscription.getSubscriptionPlan()+
- " for the customer " + subscription.getCustomer().getName() + " " + e.getMessage() ;
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return subscriptionId;
- }
-
- public int addPayment(Payment payment) throws BillingException {
- int paymentId = 0;
- try {
- beginTransaction();
- paymentId = dataAccessObject.addPayment(payment);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while adding payment record (transaction id): " + payment.getDescription() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return paymentId;
- }
-
- public int addRegistrationPayment(Payment payment, String usagePlan) throws BillingException {
- int paymentId = 0;
- try {
- beginTransaction();
- paymentId = dataAccessObject.addRegistrationPayment(payment, usagePlan);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while adding registration payment record (transaction id): " + payment.getDescription() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return paymentId;
- }
-
- public Invoice getLastInvoice(Customer customer) throws BillingException {
- Invoice invoice = null;
- try {
- beginTransaction();
- invoice = dataAccessObject.getLastInvoice(customer);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting last invoice for customer: " + customer.getId() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return invoice;
- }
-
- public List<Invoice> getAllInvoices(Customer customer) throws BillingException {
- List<Invoice> invoices = null;
- try {
- beginTransaction();
- invoices = dataAccessObject.getAllInvoices(customer);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting all invoices for customer: " + customer.getId() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return invoices;
- }
-
- public List<Subscription> getActiveSubscriptions(Customer customer) throws BillingException {
- List<Subscription> subscriptions;
- try {
- beginTransaction();
- subscriptions =
- dataAccessObject.getFilteredActiveSubscriptionsForCustomer(
- null, customer);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting active subscriptions for customer: " + customer.getId() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return subscriptions;
- }
-
- public Subscription getActiveSubscriptionOfCustomer(int customerId) throws BillingException {
- Subscription subscription;
- try {
- beginTransaction();
- subscription =
- dataAccessObject.getActiveSubscriptionOfCustomer(customerId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting active subscription for customer: " + customerId +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return subscription;
- }
-
- public List<Invoice> getInvoices(Customer customer) throws BillingException {
- List<Invoice> invoices;
- try {
- beginTransaction();
- invoices = dataAccessObject.getInvoices(customer);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting invoices for customer: " + customer.getId() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return invoices;
- }
-
- public Invoice getInvoice(int invoiceId) throws BillingException {
- Invoice invoice = null;
- try {
- beginTransaction();
- invoice = dataAccessObject.getInvoice(invoiceId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting invoice with id: " + invoiceId +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return invoice;
- }
-
- public List<Item> getBilledItems(Subscription subscription) throws BillingException {
- List<Item> billedItems;
- try {
- beginTransaction();
- billedItems = dataAccessObject.getBilledItems(subscription);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting billed items for subscription: " + subscription.getId() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return billedItems;
- }
-
- public List<Subscription> getInvoiceSubscriptions(int invoiceId) throws BillingException {
- List<Subscription> subscriptions;
- try {
- beginTransaction();
- subscriptions = dataAccessObject.getInvoiceSubscriptions(invoiceId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting invoice subscriptions for invoice id: " + invoiceId +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return subscriptions;
- }
-
- public Payment getLastPayment(Customer customer) throws BillingException {
- Payment payment;
- try {
- beginTransaction();
- payment = dataAccessObject.getLastPayment(customer);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting the last payment for customer: " + customer.getId() +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return payment;
- }
-
- public List<Customer> getAllCustomers() throws BillingException {
- return CustomerUtils.getAllCustomers();
- }
-
- public List<OutstandingBalanceInfoBean> getAllOutstandingBalanceInfoBeans(String tenantDomain)
- throws BillingException {
- if(tenantDomain==null || "".equals(tenantDomain)){
- return getAllOutstandingBalances(null);
- }else{
- List<Customer> customers = getCustomersWithName(tenantDomain);
- if(customers!=null && customers.size()>0){
- return getAllOutstandingBalances(customers.get(0));
- }else{
- return new ArrayList<OutstandingBalanceInfoBean>();
- }
- }
- }
-
- public List<OutstandingBalanceInfoBean> getAllOutstandingBalances(Customer preferredCustomer) throws BillingException{
- List<Customer> customers;// = getAllCustomers();
- List<OutstandingBalanceInfoBean> outstandingBalances = new ArrayList<OutstandingBalanceInfoBean>();
- if(preferredCustomer!=null){
- customers = new ArrayList<Customer>();
- customers.add(preferredCustomer);
- }else{
- customers = getAllCustomers();
- }
- for(Customer customer : customers){
- OutstandingBalanceInfoBean balanceBean = new OutstandingBalanceInfoBean();
- balanceBean.setCustomerName(customer.getName());
- Invoice invoice = getLastInvoice(customer);
- if(invoice!=null){
- balanceBean.setCarriedForward(invoice.getCarriedForward().toString());
- balanceBean.setLastInvoiceDate(invoice.getDate());
- }
- //setting the active usage plan
- Subscription subscription = getActiveSubscriptionOfCustomer(customer.getId());
- if(subscription!=null){
- balanceBean.setSubscription(subscription.getSubscriptionPlan());
- }else{
- balanceBean.setSubscription("Not Available");
- }
-
- Payment payment = getLastPayment(customer);
- if(payment!=null){
- balanceBean.setLastPaidAmount(payment.getAmount().toString());
- balanceBean.setLastPaymentDate(payment.getDate());
- }
- outstandingBalances.add(balanceBean);
- }
- return outstandingBalances;
- }
-
- public void sendPaymentReceivedEmail(String toAddress, String emailFile,
- Map<String,String> mailParameters) throws Exception {
- String emailTemplateFile = CarbonUtils.getCarbonConfigDirPath()+ File.separator
- + StratosConstants.EMAIL_CONFIG + File.separator + emailFile;
- EmailSenderConfiguration senderConfiguration =
- EmailSenderConfiguration.loadEmailSenderConfiguration(emailTemplateFile);
- EmailSender sender = new EmailSender(senderConfiguration);
- sender.sendEmail(toAddress, mailParameters);
- }
-
- public boolean addDiscount(Discount discount) throws Exception {
- boolean added = false;
- try {
- beginTransaction();
- added = dataAccessObject.addDiscount(discount);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while adding the discount for tenant: " + discount.getTenantId()+
- ". " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
-
- return added;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingEngineContext.java
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingEngineContext.java b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingEngineContext.java
deleted file mode 100644
index 8d97dc1..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingEngineContext.java
+++ /dev/null
@@ -1,62 +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.billing.core;
-
-import org.wso2.carbon.billing.core.conf.BillingTaskConfiguration;
-import org.wso2.carbon.billing.core.dataobjects.Customer;
-import org.wso2.carbon.billing.core.dataobjects.Subscription;
-import org.wso2.carbon.billing.core.scheduler.SchedulerContext;
-
-import java.util.List;
-
-public class BillingEngineContext {
- List<Subscription> subscriptions;
- SchedulerContext schedulerContext;
- Customer customer;
- BillingTaskConfiguration taskConfiguration;
-
- public List<Subscription> getSubscriptions() {
- return subscriptions;
- }
-
- public void setSubscriptions(List<Subscription> subscriptions) {
- this.subscriptions = subscriptions;
- }
-
- public SchedulerContext getSchedulerContext() {
- return schedulerContext;
- }
-
- public void setSchedulerContext(SchedulerContext schedulerContext) {
- this.schedulerContext = schedulerContext;
- }
-
- public Customer getCustomer() {
- return customer;
- }
-
- public void setCustomer(Customer customer) {
- this.customer = customer;
- }
-
- public BillingTaskConfiguration getTaskConfiguration() {
- return taskConfiguration;
- }
-
- public void setTaskConfiguration(BillingTaskConfiguration taskConfiguration) {
- this.taskConfiguration = taskConfiguration;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingException.java
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingException.java b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingException.java
deleted file mode 100644
index 2aae5a4..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingException.java
+++ /dev/null
@@ -1,27 +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.billing.core;
-
-@SuppressWarnings("serial")
-public class BillingException extends Exception {
- public BillingException(String msg, Exception e) {
- super(msg, e);
- }
-
- public BillingException(String msg) {
- super(msg);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingHandler.java
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingHandler.java b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingHandler.java
deleted file mode 100644
index 2e7e0fc..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingHandler.java
+++ /dev/null
@@ -1,30 +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.billing.core;
-
-import java.util.Map;
-
-public interface BillingHandler {
- public void init(Map<String, String> handlerConfig) throws BillingException;
-
- /**
- * Performs the tasks needed to generate bill, sending bills, etc.
- *
- * @param handlerContext
- * @throws BillingException
- */
- public void execute(BillingEngineContext handlerContext) throws BillingException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingManager.java
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingManager.java b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingManager.java
deleted file mode 100644
index a523b60..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingManager.java
+++ /dev/null
@@ -1,83 +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.billing.core;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.billing.core.conf.BillingConfiguration;
-import org.wso2.carbon.billing.core.conf.BillingTaskConfiguration;
-import org.wso2.carbon.billing.core.jdbc.DataAccessObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A class to handle multiple billing engines
- */
-public class BillingManager {
- private static final Log log = LogFactory.getLog(BillingManager.class);
- private static BillingManager billingManager;
- private BillingConfiguration billingConfiguration;
- private DataAccessObject dataAccessObject;
- private Map<String, BillingEngine> billingEngines = new HashMap<String, BillingEngine>();
-
- public static BillingManager getInstance() throws BillingException {
- if (billingManager == null) {
- String msg = "Billing Manager is not initialized.";
- log.error(msg);
- throw new BillingException(msg);
- }
- return billingManager;
- }
-
- public static void destroyInstance() {
- billingManager = null;
- }
-
- public BillingManager(BillingConfiguration billingConfiguration) throws BillingException {
- if (billingManager != null) {
- String msg = "Billing Manager should not be initialized twice";
- log.error(msg);
- throw new BillingException(msg);
- }
-
- this.billingConfiguration = billingConfiguration;
- this.dataAccessObject = new DataAccessObject(billingConfiguration.getDataSource());
- //Create billing engine corresponds to given billingTaskConfigurations
- Map<String, BillingTaskConfiguration> billingTaskConfigs =
- billingConfiguration.getBillingTaskConfigs();
- for (Map.Entry<String, BillingTaskConfiguration> entry : billingTaskConfigs.entrySet()) {
- String billingTaskName = entry.getKey();
- BillingTaskConfiguration billingTaskConfiguration = entry.getValue();
- BillingEngine billingEngine =
- new BillingEngine(billingTaskConfiguration, dataAccessObject);
- billingEngines.put(billingTaskName, billingEngine);
- }
- billingManager = this;
- }
-
- public BillingConfiguration getBillingConfiguration() {
- return billingConfiguration;
- }
-
- public DataAccessObject getDataAccessObject() {
- return dataAccessObject;
- }
-
- public BillingEngine getBillingEngine(String billingTaskName) {
- return billingEngines.get(billingTaskName);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingTenantMgtListenerImpl.java
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingTenantMgtListenerImpl.java b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingTenantMgtListenerImpl.java
deleted file mode 100644
index 403938f..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/BillingTenantMgtListenerImpl.java
+++ /dev/null
@@ -1,203 +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.billing.core;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.billing.core.dataobjects.Customer;
-import org.wso2.carbon.billing.core.dataobjects.Item;
-import org.wso2.carbon.billing.core.dataobjects.Subscription;
-import org.wso2.carbon.billing.core.internal.Util;
-import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
-import org.wso2.carbon.stratos.common.exception.StratosException;
-import org.wso2.carbon.stratos.common.internal.CloudCommonServiceComponent;
-import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
-import org.wso2.carbon.user.api.Tenant;
-import org.wso2.carbon.user.api.TenantManager;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-
-public class BillingTenantMgtListenerImpl implements TenantMgtListener{
-
- private static Log log = LogFactory.getLog(BillingTenantMgtListenerImpl.class);
- /**
- * Adds the subscription entry when the tenant is created
- * @param tenantInfo Tenant information
- * @throws StratosException if adding subscription failed
- */
- public void onTenantCreate(TenantInfoBean tenantInfo) throws StratosException {
- Customer customer = new Customer();
- customer.setName(tenantInfo.getTenantDomain());
- customer.setEmail(tenantInfo.getEmail());
- customer.setStartedDate(new Date(tenantInfo.getCreatedDate().getTimeInMillis()));
- customer.setFullName(tenantInfo.getFirstname() + " " + tenantInfo.getLastname());
-
- customer.setId(tenantInfo.getTenantId());
- Subscription subscription = new Subscription();
- subscription.setCustomer(customer);
- subscription.setActive(false);
- subscription.setActiveSince(Calendar.getInstance().getTime());
- subscription.setItem(new Item());
- subscription.setSubscriptionPlan(tenantInfo.getUsagePlan());
- try {
- Util.getDataAccessManager().addSubscription(subscription);
- } catch (Exception e) {
- String msg = "Could not add new subscription for tenant: " +tenantInfo.getTenantDomain();
- log.error( msg + e.getMessage(), e);
- throw new StratosException(msg, e);
- }
- }
-
- public void onTenantUpdate(TenantInfoBean tenantInfo) throws StratosException {
- try {
- if (tenantInfo.getUsagePlan() == null) {
- return;
- }
- Subscription currentSubscription = Util.getDataAccessManager().
- getActiveSubscriptionOfCustomer(tenantInfo.getTenantId());
- if (currentSubscription != null && currentSubscription.getSubscriptionPlan() != null) {
- if (!currentSubscription.getSubscriptionPlan().equals(tenantInfo.getUsagePlan())) {
- boolean updated = Util.getDataAccessManager().
- changeSubscription(tenantInfo.getTenantId(), tenantInfo.getUsagePlan());
- if (updated) {
- log.info("Usage plan was changed successfully from " + currentSubscription.getSubscriptionPlan() +
- " to " + tenantInfo.getUsagePlan());
- }
- }
- }else{
- //tenant does not have an active subscription. First we have to check whether the tenant
- //is active. If he is active only we will add a new usage plan. Otherwise it is useless
- //to add a usage plan to an inactive tenant
- TenantManager tenantManager = CloudCommonServiceComponent.getTenantManager();
- Tenant tenant = tenantManager.getTenant(tenantInfo.getTenantId());
- if(tenant.isActive()){
- //we add a new subscription
- Subscription subscription = new Subscription();
- subscription.setActive(true);
- subscription.setSubscriptionPlan(tenantInfo.getUsagePlan());
- subscription.setActiveSince(null);
- subscription.setActiveUntil(null);
- Customer customer = new Customer();
- customer.setName(tenantInfo.getTenantDomain());
- customer.setId(tenantInfo.getTenantId());
- subscription.setCustomer(customer);
-
- int subsId = Util.getDataAccessManager().addSubscription(subscription);
- if(subsId>0){
- log.info("Added a new " + subscription.getSubscriptionPlan() + " usage plan for the tenant " +
- tenantInfo.getTenantDomain());
- }
- }
- }
- } catch (Exception e) {
- String msg = "Error occurred while changing the subscription plan for tenant: " + tenantInfo.getTenantDomain();
- log.error(msg, e);
- throw new StratosException(msg, e);
- }
- }
-
- public void onTenantRename(int tenantId, String oldDomainName, String newDomainName) throws StratosException {
- //Nothing to be done
- }
-
- public void onTenantInitialActivation(int tenantId) throws StratosException {
- onTenantActivation(tenantId);
- }
-
- public void onTenantActivation(int tenantId) throws StratosException {
- //On tenant activation we need to activate the subscription
-
- try {
-
- Subscription subscription = Util.getDataAccessManager().getActiveSubscriptionOfCustomer(tenantId);
-
- if (subscription != null) {
- String msg = "Unable to activate the subscription for tenant: " + tenantId +
- ". An active subscription already exists";
- log.info(msg);
- } else {
- List<Subscription> inactiveSubscriptions = Util.getDataAccessManager().getInactiveSubscriptionsOfCustomer(tenantId);
- if (inactiveSubscriptions.size() == 1) {
- //This is the scenario where the tenant has registered, but not activated yet
- subscription = inactiveSubscriptions.get(0);
- boolean activated = Util.getDataAccessManager().activateSubscription(subscription.getId());
- if (activated) {
- log.info("Subscription was activated for tenant: " + tenantId);
- }
- }else if(inactiveSubscriptions.size() > 1){
- //this is the scenario where the tenant has been deactivated by admin and
- //again activated. Here, I am adding a new active subscription which is similar to the
- //last existed one
- //inactiveSubscriptions.get(0) gives the latest inactive subscription
- Subscription subscriptionToAdd = inactiveSubscriptions.get(0);
- subscriptionToAdd.setActive(true);
- subscriptionToAdd.setActiveSince(null);
- subscriptionToAdd.setActiveUntil(null);
-
- int subsId = Util.getDataAccessManager().addSubscription(subscriptionToAdd);
- if(subsId>0){
- log.info("New subscription: " + subscriptionToAdd.getSubscriptionPlan() +
- " added and it was activated for tenant: " + tenantId);
- }
- }else{
- //this means there are no subscriptions. Lets handle this later
- }
- }
- } catch (Exception e) {
- String msg = "Error occurred while activating the subscription for tenant: " +
- tenantId;
- log.error(msg, e);
- throw new StratosException(msg, e);
- }
- }
-
- public void onTenantDeactivation(int tenantId) throws StratosException {
- try{
- Subscription currentActiveSubscription = Util.getDataAccessManager().getActiveSubscriptionOfCustomer(tenantId);
- if(currentActiveSubscription==null){
- String msg = "There is no active subscription to deactivate for tenant: " +
- tenantId + " on tenant deactivation";
- log.info(msg);
- }else {
- boolean deactivated = Util.getDataAccessManager().deactivateActiveSubscription(tenantId);
- if(deactivated){
- log.info("Subscription deactivated on tenant deactivation");
- }else{
- log.info("Subscription was not deactivated on tenant deactivation");
- }
- }
- } catch (Exception e){
- String msg = "Error occurred while deactivating the active subscription for tenant: " + tenantId;
- log.error(msg, e);
- throw new StratosException(msg, e);
- }
- }
-
- public void onSubscriptionPlanChange(int tenentId, String oldPlan, String newPlan) throws StratosException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public int getListenerOrder() {
- return 0; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/DataAccessManager.java
----------------------------------------------------------------------
diff --git a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/DataAccessManager.java b/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/DataAccessManager.java
deleted file mode 100644
index 89cce4c..0000000
--- a/components/stratos/billing/org.apache.stratos.billing.core/2.1.3/src/main/java/org/wso2/carbon/billing/core/DataAccessManager.java
+++ /dev/null
@@ -1,244 +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.billing.core;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.billing.core.dataobjects.Customer;
-import org.wso2.carbon.billing.core.dataobjects.Subscription;
-import org.wso2.carbon.billing.core.internal.Util;
-import org.wso2.carbon.billing.core.jdbc.DataAccessObject;
-import org.wso2.carbon.stratos.common.exception.StratosException;
-import org.wso2.carbon.user.api.Tenant;
-import org.wso2.carbon.user.api.TenantManager;
-
-import javax.sql.DataSource;
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class DataAccessManager {
-
- private static Log log = LogFactory.getLog(DataAccessManager.class);
- private DataAccessObject dataAccessObject = null;
-
- public DataAccessManager(DataSource dataSource) {
- this.dataAccessObject = new DataAccessObject(dataSource);
- }
-
- public DataAccessManager(DataAccessObject dao){
- this.dataAccessObject = dao;
- }
-
- public void beginTransaction() throws BillingException {
- dataAccessObject.beginTransaction();
- }
-
- public void commitTransaction() throws BillingException {
- dataAccessObject.commitTransaction();
- }
-
- public void rollbackTransaction() throws BillingException {
- dataAccessObject.rollbackTransaction();
- }
-
- public int addSubscription(Subscription subscription) throws BillingException {
- int subscriptionId = 0;
- try {
- beginTransaction();
- subscriptionId = dataAccessObject.addSubscription(subscription,
- subscription.getSubscriptionPlan());
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while adding subscription: " + subscription.getSubscriptionPlan()+
- " for the customer " + subscription.getCustomer().getName() + " " + e.getMessage() ;
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return subscriptionId;
- }
-
- public void deleteBillingData(int tenantId) throws BillingException {
- try {
- beginTransaction();
- dataAccessObject.deleteBillingData(tenantId);
- commitTransaction();
- } catch (Exception e) {
- rollbackTransaction();
- String msg = "Error occurred while deleting subscription for tenant id: " + tenantId ;
- log.error(msg, e);
- throw new BillingException(msg, e);
- }
- }
-
- public List<Customer> getCustomersWithName(String customerName) throws BillingException {
- TenantManager tenantManager = Util.getRealmService().getTenantManager();
- List<Customer> customers = new ArrayList<Customer>();
- try {
- int tenantId = tenantManager.getTenantId(customerName);
- Tenant tenant = tenantManager.getTenant(tenantId);
- if (tenant != null) {
- Customer customer = new Customer();
- customer.setId(tenant.getId());
- customer.setName(tenant.getDomain());
- customer.setStartedDate(tenant.getCreatedDate());
- customer.setEmail(tenant.getEmail());
- //customer.setAddress();
- customers.add(customer);
- }
- } catch (Exception e) {
- String msg = "Failed to get customers for customers: " + customerName + ".";
- log.error(msg, e);
- throw new BillingException(msg, e);
- }
-
- return customers;
- }
-
- public Subscription getSubscription(int subscriptionId) throws BillingException {
- Subscription subscription = null;
- try {
- beginTransaction();
- subscription = dataAccessObject.getSubscription(subscriptionId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting subscription with id: " + subscriptionId +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return subscription;
- }
-
- public Subscription getActiveSubscriptionOfCustomer(int customerId) throws BillingException {
- Subscription subscription;
- try {
- beginTransaction();
- subscription = dataAccessObject.getActiveSubscriptionOfCustomer(customerId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting active subscription for customer: "
- + customerId + " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return subscription;
- }
-
- public int getItemIdWithName(String name, int parentId) throws BillingException {
- int itemId;
- try {
- beginTransaction();
- itemId = dataAccessObject.getItemId(name, parentId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting item id for item name: " + name +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return itemId;
- }
-
- public boolean changeSubscription(int customerId, String subscriptionPlan) throws BillingException {
- boolean changed = false;
- String oldSubscriptionPlan = null;
-
- try {
- beginTransaction();
- Subscription oldSubscription = getActiveSubscriptionOfCustomer(customerId);
- if(oldSubscription!=null){
- oldSubscriptionPlan = oldSubscription.getSubscriptionPlan();
- }
- changed = dataAccessObject.changeSubscription(customerId, subscriptionPlan);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while changing subscription to: " + subscriptionPlan +
- " for customer: " + customerId + " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
-
- try {
- // Notify Listeners about the subscription change
- Util.alertTenantSubscriptionPlanChange(
- customerId, oldSubscriptionPlan, subscriptionPlan);
- } catch (StratosException e) {
- log.error(e.getMessage(), e);
- throw new BillingException(e.getMessage(), e);
- }
-
- return changed;
- }
-
- public List<Subscription> getInactiveSubscriptionsOfCustomer(int customerId) throws BillingException {
- List<Subscription> subscriptions;
- try {
- beginTransaction();
- subscriptions = dataAccessObject.getInactiveSubscriptionsOfCustomer(customerId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while getting inactive subscriptions of customer: " +
- customerId + " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return subscriptions;
-
- }
-
- public boolean activateSubscription(int subscriptionId) throws BillingException {
- boolean activated = false;
- try {
- beginTransaction();
- activated = dataAccessObject.activateSubscription(subscriptionId);
- commitTransaction();
- } catch(Exception e){
- String msg = "Error occurred while activating subscription with id: " + subscriptionId +
- " " + e.getMessage();
- log.error(msg, e);
- rollbackTransaction();
- throw new BillingException(msg, e);
- }
- return activated;
- }
-
- public boolean deactivateActiveSubscription(int tenantId) throws BillingException {
- boolean deactivated = false;
- try{
- beginTransaction();
- deactivated = dataAccessObject.deactivateCurrentSubscriptoin(tenantId);
- commitTransaction();
- }catch(Exception e){
- rollbackTransaction();
- String msg = "Error occurred while deactivating the active subscription of customer: " +
- tenantId;
- log.error(msg, e);
- throw new BillingException(msg, e);
- }
-
- return deactivated;
- }
-
-
-
-}