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:23 UTC

[08/17] removing billing, payment and sso-mgt components since they are not going to use Apache Stratos

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/pom.xml b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/pom.xml
deleted file mode 100644
index a29e87b..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<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/xsd/maven-4.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>
-  <version>2.1.0</version>
-  <artifactId>org.wso2.carbon.payment.ui</artifactId>
-  <packaging>bundle</packaging>
-  <name>WSO2 Stratos - Payment UI</name>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.wso2.carbon</groupId>
-      <artifactId>org.wso2.carbon.ui</artifactId>
-      <version>${wso2carbon.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.json.wso2</groupId>
-      <artifactId>json</artifactId>
-      <version>1.0.0.wso2v1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.wso2.carbon</groupId>
-      <artifactId>org.wso2.carbon.payment.stub</artifactId>
-      <version>${wso2carbon.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.wso2.carbon</groupId>
-      <artifactId>org.wso2.carbon.account.mgt.stub</artifactId>
-      <version>${wso2carbon.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.wso2.carbon</groupId>
-      <artifactId>org.wso2.carbon.stratos.common</artifactId>
-    </dependency>
-  </dependencies>
-
-<build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            org.wso2.carbon.payment.ui.*
-                        </Export-Package>
-			<Import-Package>
-			    org.wso2.carbon.payment.stub.*; version="${carbon.platform.package.import.version.range}",	
-			    *;resolution:=optional,
-			</Import-Package>
-                        <Carbon-Component>UIBundle</Carbon-Component>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/java/org/wso2/carbon/payment/ui/client/PaymentServiceClient.java
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/java/org/wso2/carbon/payment/ui/client/PaymentServiceClient.java b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/java/org/wso2/carbon/payment/ui/client/PaymentServiceClient.java
deleted file mode 100644
index 84ef6bb..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/java/org/wso2/carbon/payment/ui/client/PaymentServiceClient.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- *  Copyright (c) 2009, 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.payment.ui.client;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.payment.stub.StratosPaymentStub;
-import org.wso2.carbon.payment.stub.dto.ECDetailResponse;
-import org.wso2.carbon.payment.stub.dto.ECResponse;
-import org.wso2.carbon.payment.stub.dto.TransactionResponse;
-
-
-public class PaymentServiceClient {
-
-    private StratosPaymentStub stub;
-
-    private static final Log log = LogFactory.getLog(PaymentServiceClient.class);
-
-    public PaymentServiceClient(ConfigurationContext configCtx, String backendServerURL,
-                                String cookie) throws AxisFault{
-
-        String serviceURL = backendServerURL + "StratosPayment";
-        stub = new StratosPaymentStub(configCtx, serviceURL);
-        ServiceClient client = stub._getServiceClient();
-        Options option = client.getOptions();
-        option.setManageSession(true);
-        option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-    }
-
-    public ECResponse initExpressCheckout(String amount, String successUrl, String cancelUrl){
-        ECResponse response = null;
-        try {
-            response = stub.initExpressCheckout(amount, successUrl, cancelUrl);
-        } catch (Exception e) {
-            log.error("Error occurred while initiating express checkout transaction: " +
-                        e.getMessage());
-        }
-        return response;
-    }
-
-    public ECDetailResponse getExpressCheckoutDetails(String token) throws Exception{
-        ECDetailResponse detailResponse = null;
-
-        try{
-            detailResponse = stub.getExpressCheckoutDetails(token);
-        }catch (Exception e){
-            log.error("Error occurred while getting express checkout details " +
-                        e.getMessage());
-            throw e;
-        }
-        return detailResponse;
-    }
-
-    public TransactionResponse doExpressCheckout(String token, String payerId, String amount,
-                                  String tenantDomain) throws Exception{
-        TransactionResponse tr = new TransactionResponse();
-        try{
-            tr = stub.doExpressCheckout(token, payerId, amount, tenantDomain);
-        }catch (Exception e){
-            log.error("Error occurred while DoExpressCheckout operation: " + e.getMessage());
-            throw e;
-        }
-
-        return tr;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/StratosPayment.wsdl
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/StratosPayment.wsdl b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/StratosPayment.wsdl
deleted file mode 100644
index cfffa35..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/StratosPayment.wsdl
+++ /dev/null
@@ -1,308 +0,0 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax2308="http://exceptions.sdk.paypal.com/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://services.paypal.payment.carbon.wso2.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax2310="http://dto.paypal.payment.carbon.wso2.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://services.paypal.payment.carbon.wso2.org">
-    <wsdl:documentation>StratosPayment</wsdl:documentation>
-    <wsdl:types>
-        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exceptions.sdk.paypal.com/xsd">
-            <xs:complexType name="PayPalException">
-                <xs:sequence />
-            </xs:complexType>
-        </xs:schema>
-        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://dto.paypal.payment.carbon.wso2.org/xsd">
-            <xs:complexType name="ECResponse">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="ack" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="error" nillable="true" type="ax2310:PaypalError" />
-                    <xs:element minOccurs="0" name="timestamp" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="token" nillable="true" type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType name="PaypalError">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="errorCode" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="longMessage" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="shortMessage" nillable="true" type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType name="ECDetailResponse">
-                <xs:complexContent>
-                    <xs:extension base="ax2310:ECResponse">
-                        <xs:sequence>
-                            <xs:element minOccurs="0" name="address" nillable="true" type="ax2310:Address" />
-                            <xs:element minOccurs="0" name="orderTotal" nillable="true" type="xs:string" />
-                            <xs:element minOccurs="0" name="payer" nillable="true" type="ax2310:Payer" />
-                        </xs:sequence>
-                    </xs:extension>
-                </xs:complexContent>
-            </xs:complexType>
-            <xs:complexType name="Address">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="city" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="country" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="name" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="phone" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="postalCode" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="state" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="street1" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="street2" nillable="true" type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType name="Payer">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="address" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="business" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="email" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="firstName" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="lastName" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="payerId" nillable="true" type="xs:string" />
-                    <xs:element minOccurs="0" name="payerStatus" nillable="true" type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:complexType name="TransactionResponse">
-                <xs:complexContent>
-                    <xs:extension base="ax2310:ECResponse">
-                        <xs:sequence>
-                            <xs:element minOccurs="0" name="amount" nillable="true" type="xs:string" />
-                            <xs:element minOccurs="0" name="paymentStatus" nillable="true" type="xs:string" />
-                            <xs:element minOccurs="0" name="pendingReason" nillable="true" type="xs:string" />
-                            <xs:element minOccurs="0" name="transactionId" nillable="true" type="xs:string" />
-                        </xs:sequence>
-                    </xs:extension>
-                </xs:complexContent>
-            </xs:complexType>
-        </xs:schema>
-        <xs:schema xmlns:ax2311="http://dto.paypal.payment.carbon.wso2.org/xsd" xmlns:ax2309="http://exceptions.sdk.paypal.com/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://services.paypal.payment.carbon.wso2.org">
-            <xs:import namespace="http://exceptions.sdk.paypal.com/xsd" />
-            <xs:import namespace="http://dto.paypal.payment.carbon.wso2.org/xsd" />
-            <xs:element name="initExpressCheckoutPayPalException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="PayPalException" nillable="true" type="ax2309:PayPalException" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="initExpressCheckout">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="amount" nillable="true" type="xs:string" />
-                        <xs:element minOccurs="0" name="successReturnUrl" nillable="true" type="xs:string" />
-                        <xs:element minOccurs="0" name="cancelReturnUrl" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="initExpressCheckoutResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax2310:ECResponse" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getExpressCheckoutDetailsPayPalException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="PayPalException" nillable="true" type="ax2309:PayPalException" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getExpressCheckoutDetails">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="token" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="getExpressCheckoutDetailsResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax2310:ECDetailResponse" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="doExpressCheckoutPayPalException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="PayPalException" nillable="true" type="ax2309:PayPalException" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="doExpressCheckout">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="token" nillable="true" type="xs:string" />
-                        <xs:element minOccurs="0" name="payerId" nillable="true" type="xs:string" />
-                        <xs:element minOccurs="0" name="amount" nillable="true" type="xs:string" />
-                        <xs:element minOccurs="0" name="paymentAction" nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="doExpressCheckoutResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax2310:TransactionResponse" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="initExpressCheckoutRequest">
-        <wsdl:part name="parameters" element="ns:initExpressCheckout" />
-    </wsdl:message>
-    <wsdl:message name="initExpressCheckoutResponse">
-        <wsdl:part name="parameters" element="ns:initExpressCheckoutResponse" />
-    </wsdl:message>
-    <wsdl:message name="initExpressCheckoutPayPalException">
-        <wsdl:part name="parameters" element="ns:initExpressCheckoutPayPalException" />
-    </wsdl:message>
-    <wsdl:message name="doExpressCheckoutRequest">
-        <wsdl:part name="parameters" element="ns:doExpressCheckout" />
-    </wsdl:message>
-    <wsdl:message name="doExpressCheckoutResponse">
-        <wsdl:part name="parameters" element="ns:doExpressCheckoutResponse" />
-    </wsdl:message>
-    <wsdl:message name="doExpressCheckoutPayPalException">
-        <wsdl:part name="parameters" element="ns:doExpressCheckoutPayPalException" />
-    </wsdl:message>
-    <wsdl:message name="getExpressCheckoutDetailsRequest">
-        <wsdl:part name="parameters" element="ns:getExpressCheckoutDetails" />
-    </wsdl:message>
-    <wsdl:message name="getExpressCheckoutDetailsResponse">
-        <wsdl:part name="parameters" element="ns:getExpressCheckoutDetailsResponse" />
-    </wsdl:message>
-    <wsdl:message name="getExpressCheckoutDetailsPayPalException">
-        <wsdl:part name="parameters" element="ns:getExpressCheckoutDetailsPayPalException" />
-    </wsdl:message>
-    <wsdl:portType name="StratosPaymentPortType">
-        <wsdl:operation name="initExpressCheckout">
-            <wsdl:input message="ns:initExpressCheckoutRequest" wsaw:Action="urn:initExpressCheckout" />
-            <wsdl:output message="ns:initExpressCheckoutResponse" wsaw:Action="urn:initExpressCheckoutResponse" />
-            <wsdl:fault message="ns:initExpressCheckoutPayPalException" name="initExpressCheckoutPayPalException" wsaw:Action="urn:initExpressCheckoutinitExpressCheckoutPayPalException" />
-        </wsdl:operation>
-        <wsdl:operation name="doExpressCheckout">
-            <wsdl:input message="ns:doExpressCheckoutRequest" wsaw:Action="urn:doExpressCheckout" />
-            <wsdl:output message="ns:doExpressCheckoutResponse" wsaw:Action="urn:doExpressCheckoutResponse" />
-            <wsdl:fault message="ns:doExpressCheckoutPayPalException" name="doExpressCheckoutPayPalException" wsaw:Action="urn:doExpressCheckoutdoExpressCheckoutPayPalException" />
-        </wsdl:operation>
-        <wsdl:operation name="getExpressCheckoutDetails">
-            <wsdl:input message="ns:getExpressCheckoutDetailsRequest" wsaw:Action="urn:getExpressCheckoutDetails" />
-            <wsdl:output message="ns:getExpressCheckoutDetailsResponse" wsaw:Action="urn:getExpressCheckoutDetailsResponse" />
-            <wsdl:fault message="ns:getExpressCheckoutDetailsPayPalException" name="getExpressCheckoutDetailsPayPalException" wsaw:Action="urn:getExpressCheckoutDetailsgetExpressCheckoutDetailsPayPalException" />
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="StratosPaymentSoap11Binding" type="ns:StratosPaymentPortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-        <wsdl:operation name="initExpressCheckout">
-            <soap:operation soapAction="urn:initExpressCheckout" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="initExpressCheckoutPayPalException">
-                <soap:fault use="literal" name="initExpressCheckoutPayPalException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="doExpressCheckout">
-            <soap:operation soapAction="urn:doExpressCheckout" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="doExpressCheckoutPayPalException">
-                <soap:fault use="literal" name="doExpressCheckoutPayPalException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="getExpressCheckoutDetails">
-            <soap:operation soapAction="urn:getExpressCheckoutDetails" style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="getExpressCheckoutDetailsPayPalException">
-                <soap:fault use="literal" name="getExpressCheckoutDetailsPayPalException" />
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="StratosPaymentSoap12Binding" type="ns:StratosPaymentPortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-        <wsdl:operation name="initExpressCheckout">
-            <soap12:operation soapAction="urn:initExpressCheckout" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="initExpressCheckoutPayPalException">
-                <soap12:fault use="literal" name="initExpressCheckoutPayPalException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="doExpressCheckout">
-            <soap12:operation soapAction="urn:doExpressCheckout" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="doExpressCheckoutPayPalException">
-                <soap12:fault use="literal" name="doExpressCheckoutPayPalException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="getExpressCheckoutDetails">
-            <soap12:operation soapAction="urn:getExpressCheckoutDetails" style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="getExpressCheckoutDetailsPayPalException">
-                <soap12:fault use="literal" name="getExpressCheckoutDetailsPayPalException" />
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="StratosPaymentHttpBinding" type="ns:StratosPaymentPortType">
-        <http:binding verb="POST" />
-        <wsdl:operation name="initExpressCheckout">
-            <http:operation location="initExpressCheckout" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="doExpressCheckout">
-            <http:operation location="doExpressCheckout" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="getExpressCheckoutDetails">
-            <http:operation location="getExpressCheckoutDetails" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="StratosPayment">
-        <wsdl:port name="StratosPaymentHttpsSoap11Endpoint" binding="ns:StratosPaymentSoap11Binding">
-            <soap:address location="https://10.100.0.30:9443/services/StratosPayment.StratosPaymentHttpsSoap11Endpoint/" />
-        </wsdl:port>
-        <wsdl:port name="StratosPaymentHttpsSoap12Endpoint" binding="ns:StratosPaymentSoap12Binding">
-            <soap12:address location="https://10.100.0.30:9443/services/StratosPayment.StratosPaymentHttpsSoap12Endpoint/" />
-        </wsdl:port>
-        <wsdl:port name="StratosPaymentHttpsEndpoint" binding="ns:StratosPaymentHttpBinding">
-            <http:address location="https://10.100.0.30:9443/services/StratosPayment.StratosPaymentHttpsEndpoint/" />
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/org/wso2/carbon/payment/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/org/wso2/carbon/payment/ui/i18n/Resources.properties b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/org/wso2/carbon/payment/ui/i18n/Resources.properties
deleted file mode 100644
index 9591640..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/org/wso2/carbon/payment/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-payment.continued=Continuing from Paypal site
-payment.action=Sale
-payment.process.continued=Payment Process Continued...
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/completed.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/completed.jsp b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/completed.jsp
deleted file mode 100644
index 14e4835..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/completed.jsp
+++ /dev/null
@@ -1,155 +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.
-  --%>
-
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<%
-    String paymentStatus = request.getParameter("paymentStatus");
-    String transactionID = request.getParameter("transactionID");
-    String pendingReason = request.getParameter("pendingReason");
-    String print = request.getParameter("print");
-    String amount = request.getParameter("amount");
-    String invoiceId = request.getParameter("invoiceId");
-    /*int invoiceId =  (Integer) session.getAttribute("invoiceId");
-    session.removeAttribute("invoiceId");
-    */
-
-%>
-<link href="../payment/css/billing.css" rel="stylesheet" type="text/css" media="all"/>
-<fmt:bundle basename="org.wso2.carbon.payment.ui.i18n.Resources">
-
-<carbon:breadcrumb
-        label="payment.completed"
-        resourceBundle="org.wso2.carbon.payment.ui.i18n.Resources"
-        topPage="true"
-        request="<%=request%>"/>
-
-<div id="middle">
-    <h2><fmt:message key="payment.process.continued"/></h2>
-    <br/>
-    <div id="workArea">
-        <div style="border:solid 1px #ccc;margin-top:20px;padding:15px !important">
-            <table style="width:600px;" class="invoiceTable">
-                <tr>
-                    <td>
-                        <img alt="WSO2" src="images/logo.png" align="top" style="display:block;"/>
-                        <div style="margin-top:10px;">Federal Tax ID 87-0750575</div>
-
-                    </td>
-                    <td>
-                        <div class="invoice-heading"></div>
-                        <div class="invoice-sub-heading"></div>
-                        <div class="invoice-sub-heading"></div>
-
-                    </td>
-                </tr>
-                <tr>
-                    <td> <ul class="invoice-inside-listing">
-                            <li>800 West El Camino Real Suite 180,
-                            </li>
-                            <li>Mountain View, CA 94040
-                            </li>
-                            <li>Tel: (408) 754 7388
-                            </li>
-                            <li>Fax: (408) 689 4328
-                            </li>
-                            <li>Email: billing@wso2.com
-                            </li>
-                        </ul>
-					</td>
-                    <td>
-
-
-                        <ul class="invoice-inside-listing">
-                            <li></li>
-                            <li></li>
-                            <li></li>
-                         </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                              <table class="styledLeft">
-                            <!--<thead>
-                                <tr>
-                                    <th colspan="2">Payment Status</th>
-                                </tr>
-                            </thead>-->
-                            <tbody>
-                                <%
-                                    if("Completed".equals(paymentStatus)){
-                                %>
-                                    <tr>
-                                        <td colspan="2">Thank you. Your payment was completed successfully.</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Transaction ID</td>
-                                        <td><%=transactionID%></td>
-                                    </tr>
-                                    <tr>
-                                        <td>Invoice ID</td>
-                                        <td><%=invoiceId%></td>
-                                    </tr>
-                                    <tr>
-                                        <td>Amount</td>
-                                        <td><%=amount%> USD</td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="2"></td>
-                                    </tr>
-                                    <%
-                                        }else{
-                                    %>
-                                    <td>We are sorry. Your payment was not successful</td>
-                                    <%
-                                        }
-                                    %>
-                                </tr>
-                            </tbody>
-                        </table><br/>
-                        <form action="print_payment_completed_ajaxprocessor.jsp" name="printForm">
-                            <input type="hidden" name="paymentStatus" value="<%=paymentStatus%>"/>
-                            <input type="hidden" name="transactionID" value="<%=transactionID%>"/>
-                            <input type="hidden" name="pendingReason" value="<%=pendingReason%>"/>
-                            <input type="hidden" name="amount" value="<%=amount%>"/>
-                            <input type="hidden" name="invoiceId" value="<%=invoiceId%>"/>
-                            <input type="hidden" name="print" value="yes"/>
-                        </form>
-                        <%if("Completed".equals(paymentStatus)){%>
-                        <a class="button" target="_blank" href="#" onclick="javascript:document.printForm.submit();">Print</a>
-                        <%
-                            }
-                        %>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        
-
-
-
-
-
-
-
-
-
-    </div>
-
-</div>
-</fmt:bundle>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/css/billing.css
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/css/billing.css b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/css/billing.css
deleted file mode 100644
index 62e0509..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/css/billing.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/*td.packageCol {
-    border-bottom: 1 solid #CCC !important;
-}
-
-div#exp {
-    color: #0f0;
-}*/
-.invoice-header td{
-    background-color:#e7e7e7;
-    font-weight:bold;
-}
-.invoiceTable{
-    border-collapse:collapse;
-}
-.invice-data-table{
-    border-collapse:collapse;
-    border-top:solid 1px #e7e7e7;
-    border-right:solid 1px #e7e7e7;
-    width:100%;
-}
-.invice-data-table tr.invoice-content-row td{
-    border-bottom:solid 1px #e7e7e7;
-    border-left:solid 1px #e7e7e7;
-}
-.invoiceTable tr td{
-    padding:5px !important;    
-}
-.name-field{
-    font-weight:bold;
-}
-.invoice-heading{
-    text-transform:uppercase;
-    font-size:30px;
-    font-weight:bold;
-    line-height:40px;
-}
-.invoice-sub-heading{
-    text-transform:uppercase;
-    font-size:20px;
-    font-weight:bold;
-    line-height:40px;    
-}
-ul.invoice-inside-listing{
-    margin-top:10px;
-}
-ul.invoice-inside-listing li{
-    height:25px;
-    letter-spacing:1.2px;
-}
-.terms-section-header{
-    font-weight:bold;
-}
-.terms-section{
-    width:200px;
-    text-align:justify;
-    color: #666666;
-    margin-left:20px;
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/doEC-ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/doEC-ajaxprocessor.jsp b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/doEC-ajaxprocessor.jsp
deleted file mode 100644
index 1287612..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/doEC-ajaxprocessor.jsp
+++ /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.
-  --%>
-<%@page contentType="text/html" pageEncoding="UTF-8"
-        import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.json.JSONObject" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.payment.stub.dto.TransactionResponse" %>
-<%@ page import="org.wso2.carbon.payment.ui.client.PaymentServiceClient" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<%
-    String serverURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-    ConfigurationContext configContext = (ConfigurationContext) config.getServletContext().
-            getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-    PaymentServiceClient paymentService = new PaymentServiceClient(configContext, serverURL, cookie);
-
-    String token = request.getParameter("token");
-    String payerId = request.getParameter("payerId");
-    String amount = request.getParameter("amount");
-    String tenantDomain = request.getParameter("tenantDomain");
-
-    TransactionResponse tr = new TransactionResponse();
-    try{
-        tr = paymentService.doExpressCheckout(token, payerId, amount, tenantDomain);
-    }catch (Exception e){
-        System.out.println("Error occurred while getting the transaction response: " + e.getMessage());
-        e.printStackTrace();
-    }
-
-    JSONObject obj = new JSONObject();
-    obj.put("ack", tr.getAck());
-    obj.put("token", tr.getToken());
-    obj.put("transactionID", tr.getTransactionId());
-    obj.put("paymentStatus", tr.getPaymentStatus());
-    obj.put("pendingReason", tr.getPendingReason());
-    if(tr.getError()!=null){
-        obj.put("error", tr.getError().getLongMessage());
-    }
-    out.write(obj.toString());
-    
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/images/logo.png
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/images/logo.png b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/images/logo.png
deleted file mode 100644
index f21abdb..0000000
Binary files a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/images/logo.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/print_payment_completed_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/print_payment_completed_ajaxprocessor.jsp b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/print_payment_completed_ajaxprocessor.jsp
deleted file mode 100644
index 98f73b7..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/print_payment_completed_ajaxprocessor.jsp
+++ /dev/null
@@ -1,132 +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.
-  --%>
-
-<%
-    String paymentStatus = request.getParameter("paymentStatus");
-    String transactionID = request.getParameter("transactionID");
-    String pendingReason = request.getParameter("pendingReason");
-    String print = request.getParameter("print");
-    String amount = request.getParameter("amount");
-    String invoiceId = request.getParameter("invoiceId");
-    /*int invoiceId =  (Integer) session.getAttribute("invoiceId");
-    session.removeAttribute("invoiceId");
-    */
-
-%>
-<link href="../payment/css/billing.css" rel="stylesheet" type="text/css" media="all"/>
-<style type="text/css">
-    ul {
-        list-style: none;
-        margin: 0px;
-        padding: 0px;
-    }
-    ul li{
-        list-style: none;
-        margin: 0px;
-        padding: 0px;
-    }
-
-</style>
-<div style="border:solid 1px #ccc;margin-top:20px;padding:15px !important">
-            <table style="width:600px;" class="invoiceTable">
-                <tr>
-                    <td>
-                        <img alt="WSO2" src="images/logo.png" align="top" style="display:block;"/>
-                        <div style="margin-top:10px;">Federal Tax ID 87-0750575</div>
-
-                    </td>
-                    <td>
-                        <div class="invoice-heading"></div>
-                        <div class="invoice-sub-heading"></div>
-                        <div class="invoice-sub-heading"></div>
-
-                    </td>
-                </tr>
-                <tr>
-                    <td> <ul class="invoice-inside-listing">
-                            <li>4131, El Camino Real Suite 200,
-                            </li>
-                            <li>Palo Alto, CA 94306
-                            </li>
-                            <li>Tel: (408) 754 7388
-                            </li>
-                            <li>Fax: (408) 689 4328
-                            </li>
-                            <li>Email: billing@wso2.com
-                            </li>
-                        </ul>
-					</td>
-                    <td>
-
-
-                        <ul class="invoice-inside-listing">
-                            <li></li>
-                            <li></li>
-                            <li></li>
-                         </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                        <table class="styledLeft">
-                                <!--<thead>
-                                    <tr>
-                                        <th colspan="2">Payment Status</th>
-                                    </tr>
-                                </thead>-->
-                                <tbody>
-                                    <%
-                                        if("Completed".equals(paymentStatus)){
-                                    %>
-                                        <tr>
-                                            <td colspan="2">Thank you. Your payment was completed successfully.</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Transaction ID</td>
-                                            <td><%=transactionID%></td>
-                                        </tr>
-                                        <tr>
-                                            <td>Invoice ID</td>
-                                            <td><%=invoiceId%></td>
-                                        </tr>
-                                        <tr>
-                                            <td>Amount</td>
-                                            <td><%=amount%> USD</td>
-                                        </tr>
-                                        <tr>
-                                            <td colspan="2"></td>
-                                        </tr>
-                                        <%
-                                            }else{
-                                        %>
-                                        <td>We are sorry. Your payment was not successful</td>
-                                        <%
-                                            }
-                                        %>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-            <%
-                if(print!=null && "yes".equals(print)){
-                    %>
-            <script type="text/javascript">
-                window.print();
-            </script>
-            <%
-                }
-            %>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/registration_payment.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/registration_payment.jsp b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/registration_payment.jsp
deleted file mode 100755
index 8a6d015..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/registration_payment.jsp
+++ /dev/null
@@ -1,172 +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.
-  --%>
-
-<%@page contentType="text/html" pageEncoding="UTF-8"
-        import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.payment.stub.dto.Address" %>
-<%@ page import="org.wso2.carbon.payment.stub.dto.ECDetailResponse" %>
-<%@ page import="org.wso2.carbon.payment.stub.dto.Payer" %>
-<%@ page import="org.wso2.carbon.payment.ui.client.PaymentServiceClient" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="java.util.Enumeration" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Map" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<%
-    String regTenantDomain = session.getAttribute("regTenantDomain").toString(); 
-    String usagePlanName = session.getAttribute("selectedUsagePlan").toString();
-    String token = request.getParameter("token");
-
-    String serverURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-    ConfigurationContext configContext = (ConfigurationContext) config.getServletContext().
-            getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-    PaymentServiceClient registrationPaymentClient = new PaymentServiceClient(configContext, serverURL, cookie);
-    
-    String adminConsoleURL = CarbonUIUtil.getAdminConsoleURL(request);
-    adminConsoleURL = adminConsoleURL.substring(0, adminConsoleURL.indexOf("carbon"));
-    String cancelUrl = adminConsoleURL +  "carbon/login.jsp";
-
-    ECDetailResponse ecdResponse = registrationPaymentClient.getExpressCheckoutDetails(token);
-    Payer payer = ecdResponse.getPayer();
-%>
-
-
-<fmt:bundle basename="org.wso2.carbon.payment.ui.i18n.Resources">
-
-<carbon:breadcrumb
-        label="payment.continued"
-        resourceBundle="org.wso2.carbon.payment.ui.i18n.Resources"
-        topPage="true"
-        request="<%=request%>"/>
-
-<script type="text/javascript">
-
-    var updatePaymentTableResponse;
-
-    function doPayment() {
-        var token = '<%= ecdResponse.getToken()%>';
-        var payerId = '<%= ecdResponse.getPayer().getPayerId()%>';
-        var amount = '<%= ecdResponse.getOrderTotal()%>';
-        var tenantDomain = '<%= regTenantDomain%>';
-        var selectedUsagePlan = '<%= usagePlanName%>';
-        var regTenantDomain = '<%= regTenantDomain%>';
-        document.getElementById('messageTd').style.display='';
-        jQuery.ajax({
-            type: 'POST',
-            url: 'doEC-ajaxprocessor.jsp',
-            data: 'token=' + token + '&payerId=' + payerId + '&amount=' + amount
-                    + '&tenantDomain=' + tenantDomain,
-            async: false,
-            success: function(msg) {
-                var resp = eval('(' + msg + ')');
-                if (resp.ack == 'Success') {
-                    // Upgrade the usage plan if the payment is successful
-                    jQuery.ajax({
-                        type: 'POST',
-                        url: 'upgrade_registration_usage_plan_ajaxprocessor.jsp',
-                        data: {selectedUsagePlan: selectedUsagePlan, regTenantDomain: regTenantDomain},
-                        async: false,
-                        success: function(msg) {
-                        }});
-                    updatePaymentTable(resp, amount, selectedUsagePlan);
-                    location.href = 'registration_payment_completed.jsp?paymentStatus=' + resp.paymentStatus + '&transactionID=' +
-                                    resp.transactionID + '&pendingReason=' + resp.pendingReason +
-                                    '&amount=' + amount + '&invoiceId=' ;
-
-                }else if(resp.ack=='Failure'){
-                    CARBON.showErrorDialog('Transaction was not completed. ' + resp.error);
-                    document.getElementById('messageTd').style.display='none';
-                }
-            }
-        });
-    }
-
-    function updatePaymentTable(paymentresponse, amount, usagePlan){
-        var transactionId = paymentresponse.transactionID;
-        jQuery.ajax({
-            type: 'GET',
-            url: '../tenant-billing/add_registration_payment-ajaxprocessor.jsp',
-            data: 'transactionId=' + transactionId + '&amount=' + amount + '&usagePlan=' + usagePlan,
-            async: false,
-            success: function(msg) {
-                updatePaymentTableResponse = eval('(' + msg + ')');
-            },
-            error:function (error) {
-                CARBON.showErrorDialog('Your payment was done. But we could not update our database due to a failure.' +
-                        'Please contact WSO2 cloud Service with your transaction ID: ' + transactionId);
-            }
-        });
-    }
-
-    function cancelAndGoBack(){
-        location.href = '<%=cancelUrl%>';
-    }
-
-</script>
-
-<div id="middle">
-    <h2><fmt:message key="payment.process.continued"/></h2>
-    <br/>
-    <div id="workArea">
-        <table class="styledLeft" width="50%" cellpadding="1" id="paymentDetails">
-            <thead>
-                <tr>
-                    <th colspan="2">Payment Details</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td>PayerId</td>
-                    <td><%=payer.getPayerId()%></td>
-                </tr>
-                <tr>
-                    <td>First name</td>
-                    <td><%=payer.getFirstName()%></td>
-                </tr>
-                <tr>
-                    <td>Last Name</td>
-                    <td><%=payer.getLastName()%></td>
-                </tr>
-                <tr>
-                    <td>Amount</td>
-                    <td><%=ecdResponse.getOrderTotal()%> USD</td>
-                </tr>
-            </tbody>
-        </table>
-        <br/>
-        <table cellpadding="1">
-            <tr><td colspan="2">Please click Confirm to confirm your payment or Cancel to go back to the invoice page</td></tr>
-            <tr><td colspan="2"><br/></td></tr>
-            <tr><td colspan="2"><input type="button" class="button" onclick="doPayment();" value="Confirm"/>
-                <input type="button" class="button" onclick="cancelAndGoBack();" value="Cancel"/></td>
-            </tr>
-        </table>
-        <div style="color:#494949; display:none;" id="messageTd">Please wait. Your transaction is in progress <img src="../admin/images/loading-small.gif" /></div>
-        <form name="paymentComplete">
-            <input type="hidden" name="payedAmount"/>
-            <input type="hidden" name="transactionId"/>
-            <input type="hidden" name="invoiceId"/>
-        </form>
-    </div>
-</div>
-</fmt:bundle>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/registration_payment_completed.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/registration_payment_completed.jsp b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/registration_payment_completed.jsp
deleted file mode 100755
index 887c870..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/registration_payment_completed.jsp
+++ /dev/null
@@ -1,147 +0,0 @@
-<%@ page import="org.wso2.carbon.register.ui.utils.TenantConfigUtil" %>
-<%@ page import="org.wso2.carbon.stratos.common.beans.TenantInfoBean" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="java.util.Enumeration" %>
-<%@ page import="java.util.List" %>
-<%--
-~  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.
---%>
-
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<%
-    String paymentStatus = request.getParameter("paymentStatus");
-    String transactionID = request.getParameter("transactionID");
-    String pendingReason = request.getParameter("pendingReason");
-    String print = request.getParameter("print");
-    String amount = request.getParameter("amount");
-    String invoiceId = request.getParameter("invoiceId");
-%>
-
-<link href="../payment/css/billing.css" rel="stylesheet" type="text/css" media="all"/>
-<fmt:bundle basename="org.wso2.carbon.payment.ui.i18n.Resources">
-
-<carbon:breadcrumb
-        label="payment.completed"
-        resourceBundle="org.wso2.carbon.payment.ui.i18n.Resources"
-        topPage="true"
-        request="<%=request%>"/>
-<script type="text/javascript">
-    function proceedRegistration(){
-        location.href = "../tenant-register/success_register.jsp";
-    }
-</script>
-<div id="middle">
-    <h2><fmt:message key="payment.process.continued"/></h2>
-    <br/>
-    <div id="workArea">
-        <div style="border:solid 1px #ccc;margin-top:20px;padding:15px !important">
-            <table style="width:600px;" class="invoiceTable">
-                <tr>
-                    <td>
-                        <img alt="WSO2" src="images/logo.png" align="top" style="display:block;"/>
-                        <div style="margin-top:10px;">Federal Tax ID 87-0750575</div>
-
-                    </td>
-                    <td>
-                        <div class="invoice-heading"></div>
-                        <div class="invoice-sub-heading"></div>
-                        <div class="invoice-sub-heading"></div>
-
-                    </td>
-                </tr>
-                <tr>
-                    <td> <ul class="invoice-inside-listing">
-                            <li>800 West El Camino Real Suite 180,
-                            </li>
-                            <li>Mountain View, CA 94040
-                            </li>
-                            <li>Tel: (408) 754 7388
-                            </li>
-                            <li>Fax: (408) 689 4328
-                            </li>
-                            <li>Email: billing@wso2.com
-                            </li>
-                        </ul>
-					</td>
-                    <td>
-
-
-                        <ul class="invoice-inside-listing">
-                            <li></li>
-                            <li></li>
-                            <li></li>
-                         </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                              <table class="styledLeft">
-                            <!--<thead>
-                                <tr>
-                                    <th colspan="2">Payment Status</th>
-                                </tr>
-                            </thead>-->
-                            <tbody>
-                                <%
-                                    if("Completed".equals(paymentStatus)){
-                                %>
-                                    <tr>
-                                        <td colspan="2">Thank you. Your payment was completed successfully.</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Transaction ID</td>
-                                        <td><%=transactionID%></td>
-                                    </tr>
-                                    <tr>
-                                        <td>Amount</td>
-                                        <td><%=amount%> USD</td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="2"></td>
-                                    </tr>
-                                    <%
-                                        }else{
-                                    %>
-                                    <td>We are sorry. Your payment was not successful</td>
-                                    <%
-                                        }
-                                    %>
-                                </tr>
-                            </tbody>
-                        </table><br/>
-                        <form action="print_payment_completed_ajaxprocessor.jsp" name="printForm">
-                            <input type="hidden" name="paymentStatus" value="<%=paymentStatus%>"/>
-                            <input type="hidden" name="transactionID" value="<%=transactionID%>"/>
-                            <input type="hidden" name="pendingReason" value="<%=pendingReason%>"/>
-                            <input type="hidden" name="amount" value="<%=amount%>"/>
-                            <input type="hidden" name="invoiceId" value="<%=invoiceId%>"/>
-                            <input type="hidden" name="print" value="yes"/>
-                        </form>
-                        <%if("Completed".equals(paymentStatus)){%>
-                        <a class="button" target="_blank" href="#" onclick="javascript:document.printForm.submit();">Print</a>
-                        <a class="button" target="_self" href="#" onclick="javascript:proceedRegistration();">Proceed Registration</a>
-                        <%
-                            }
-                        %>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-    </div>
-</div>
-</fmt:bundle>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/setEC-ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/setEC-ajaxprocessor.jsp b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/setEC-ajaxprocessor.jsp
deleted file mode 100644
index d1c318b..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/setEC-ajaxprocessor.jsp
+++ /dev/null
@@ -1,54 +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.
-  --%>
-<%@page contentType="text/html" pageEncoding="UTF-8"
-        import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.json.JSONObject" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.payment.stub.dto.ECResponse" %>
-<%@ page import="org.wso2.carbon.payment.ui.client.PaymentServiceClient" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-<%
-    String serverURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-    ConfigurationContext configContext = (ConfigurationContext) config.getServletContext().
-            getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-    PaymentServiceClient paymentService = new PaymentServiceClient(configContext, serverURL, cookie);
-    String successUrl = request.getParameter("successUrl");
-    String cancelUrl = request.getParameter("cancelUrl");
-    String amount = request.getParameter("amount");
-
-    try{
-        ECResponse resp = paymentService.initExpressCheckout(amount, successUrl, cancelUrl);
-
-        String token = resp.getToken();
-
-        JSONObject obj = new JSONObject();
-        obj.put("ack", resp.getAck());
-        obj.put("token", resp.getToken());
-        if(resp.getError()!=null){
-            obj.put("error", resp.getError().getLongMessage());
-        }
-        out.write(obj.toString());
-    }catch (Exception e){
-        System.out.println("Error occurred while trying to init the payment process: " + e.getMessage());
-        e.printStackTrace();
-    }
-
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/success.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/success.jsp b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/success.jsp
deleted file mode 100644
index 725fab5..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/success.jsp
+++ /dev/null
@@ -1,165 +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.
-  --%>
-
-<%@page contentType="text/html" pageEncoding="UTF-8"
-        import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.payment.stub.dto.Address" %>
-<%@ page import="org.wso2.carbon.payment.stub.dto.ECDetailResponse" %>
-<%@ page import="org.wso2.carbon.payment.stub.dto.Payer" %>
-<%@ page import="org.wso2.carbon.payment.ui.client.PaymentServiceClient" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
-
-
-
-<%
-    String serverURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-    ConfigurationContext configContext = (ConfigurationContext) config.getServletContext().
-            getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-    PaymentServiceClient paymentService = new PaymentServiceClient(configContext, serverURL, cookie);
-
-    String token = request.getParameter("token");
-
-    String adminConsoleURL = CarbonUIUtil.getAdminConsoleURL(request);
-    adminConsoleURL = adminConsoleURL.substring(0, adminConsoleURL.indexOf("carbon"));
-    String tenantDomain = (String) session.getAttribute("tenantDomain");
-    String cancelUrl = adminConsoleURL + "t/" + tenantDomain + "/carbon/tenant-billing/past_invoice.jsp";
-
-    ECDetailResponse ecdResponse = paymentService.getExpressCheckoutDetails(token);
-    Payer payer = ecdResponse.getPayer();
-    Address address = ecdResponse.getAddress();
-
-    //this is necessary when updating the payment table
-    int invoiceId =  (Integer) session.getAttribute("invoiceId");
-    session.removeAttribute("invoiceId");
-
-%>
-
-
-<fmt:bundle basename="org.wso2.carbon.payment.ui.i18n.Resources">
-
-<carbon:breadcrumb
-        label="payment.continued"
-        resourceBundle="org.wso2.carbon.payment.ui.i18n.Resources"
-        topPage="true"
-        request="<%=request%>"/>
-
-<script type="text/javascript">
-
-    var updatePaymentTableResponse;
-
-    function doPayment() {
-        var token = '<%=ecdResponse.getToken()%>';
-        var payerId = '<%=ecdResponse.getPayer().getPayerId()%>';
-        var amount = '<%=ecdResponse.getOrderTotal()%>';
-        var tenantDomain = '<%=tenantDomain%>';
-        document.getElementById('messageTd').style.display='';
-        jQuery.ajax({
-            type: 'POST',
-            url: 'doEC-ajaxprocessor.jsp',
-            data: 'token=' + token + '&payerId=' + payerId + '&amount=' + amount
-                    + '&tenantDomain=' + tenantDomain,
-            async: false,
-            success: function(msg) {
-                var resp = eval('(' + msg + ')');
-                if(resp.ack=='Success'){
-                    updatePaymentTable(resp, amount);
-                    if(updatePaymentTableResponse.status=='success'){
-                        location.href = 'completed.jsp?paymentStatus=' + resp.paymentStatus + '&transactionID=' +
-                                    resp.transactionID + '&pendingReason=' + resp.pendingReason +
-                                    '&amount=' + amount + '&invoiceId=' + updatePaymentTableResponse.invoiceId;
-                    }
-                }else if(resp.ack=='Failure'){
-                    CARBON.showErrorDialog('Transaction was not completed. ' + resp.error);
-                    document.getElementById('messageTd').style.display='none';
-                }
-            }
-        });
-    }
-
-    function updatePaymentTable(paymentresponse, amount){
-        var transactionId = paymentresponse.transactionID;
-        jQuery.ajax({
-            type: 'GET',
-            url: '../tenant-billing/add_payment-ajaxprocessor.jsp',
-            data: 'transactionId=' + transactionId + '&amount=' + amount + '&invoiceId=' + <%=invoiceId%>,
-            async: false,
-            success: function(msg) {
-                updatePaymentTableResponse = eval('(' + msg + ')');
-            },
-            error:function (error) {
-                CARBON.showErrorDialog('Your payment was done. But we could not update our database due to a failure.' +
-                        'Please contact WSO2 cloud Service with your transaction ID: ' + transactionId);
-            }
-        });
-    }
-
-    function cancelAndGoBack(){
-        location.href = '<%=cancelUrl%>';
-    }
-
-</script>
-
-<div id="middle">
-    <h2><fmt:message key="payment.process.continued"/></h2>
-    <br/>
-    <div id="workArea">
-        <table class="styledLeft" width="50%" cellpadding="1" id="paymentDetails">
-            <thead>
-                <tr>
-                    <th colspan="2">Payment Details</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td>PayerId</td>
-                    <td><%=payer.getPayerId()%></td>
-                </tr>
-                <tr>
-                    <td>First name</td>
-                    <td><%=payer.getFirstName()%></td>
-                </tr>
-                <tr>
-                    <td>Last Name</td>
-                    <td><%=payer.getLastName()%></td>
-                </tr>
-                <tr>
-                    <td>Amount</td>
-                    <td><%=ecdResponse.getOrderTotal()%> USD</td>
-                </tr>
-            </tbody>
-        </table>
-        <br/>
-        <table cellpadding="1">
-            <tr><td colspan="2">Please click Confirm to confirm your payment or Cancel to go back to the invoice page</td></tr>
-            <tr><td colspan="2"><br/></td></tr>
-            <tr><td colspan="2"><input type="button" class="button" onclick="doPayment();" value="Confirm"/>
-                <input type="button" class="button" onclick="cancelAndGoBack();" value="Cancel"/></td>
-            </tr>
-        </table>
-        <div style="color:#494949; display:none;" id="messageTd">Please wait. Your transaction is in progress <img src="../admin/images/loading-small.gif" /></div>
-        <form name="paymentComplete">
-            <input type="hidden" name="payedAmount"/>
-            <input type="hidden" name="transactionId"/>
-            <input type="hidden" name="invoiceId"/>
-        </form>
-    </div>
-</div>
-</fmt:bundle>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/upgrade_registration_usage_plan_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/upgrade_registration_usage_plan_ajaxprocessor.jsp b/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/upgrade_registration_usage_plan_ajaxprocessor.jsp
deleted file mode 100644
index b5dbd6c..0000000
--- a/components/stratos/payment/org.wso2.carbon.payment.ui/2.1.0/src/main/resources/web/payment/upgrade_registration_usage_plan_ajaxprocessor.jsp
+++ /dev/null
@@ -1,59 +0,0 @@
-<%--
-~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. licenses this file to you under the Apache License,
-~ Version 2.0 (the "License"); you may not use this file except
-~ in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~    http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing,
-~ software distributed under the License is distributed on an
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~ KIND, either express or implied.  See the License for the
-~ specific language governing permissions and limitations
-~ under the License.
---%>
-<%@ page import="org.apache.stratos.account.mgt.UsagePlanClient" %>
-<%@ page import="org.wso2.carbon.utils.CarbonUtils" %>
-<%@ page import="org.apache.stratos.account.mgt.BillingDataAccessServiceStub" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.apache.axis2.client.ServiceClient" %>
-<%@ page import="org.apache.axis2.client.Options" %>
-<%@ page import="org.apache.axis2.AxisFault" %>
-<%@ page import="org.wso2.carbon.registry.core.exceptions.RegistryException" %>
-<%@ page import="org.wso2.carbon.stratos.common.util.CommonUtil" %>
-
-<%
-    String usagePlan = request.getParameter("selectedUsagePlan");
-    String regTenantDomain = request.getParameter("regTenantDomain");
-    String adminUserName = CommonUtil.getAdminUserName();
-    String adminPassword = CommonUtil.getAdminPassword();
-
-    BillingDataAccessServiceStub stub;
-    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-    String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
-    ConfigurationContext configContext = (ConfigurationContext) config.
-            getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-    String epr = backendServerURL + "BillingDataAccessService";
-
-    try {
-        stub = new BillingDataAccessServiceStub(configContext, epr);
-        ServiceClient client = stub._getServiceClient();
-        Options option = client.getOptions();
-        option.setManageSession(true);
-        option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, cookie);
-        CarbonUtils.setBasicAccessSecurityHeaders(adminUserName, adminPassword, client);
-        stub.changeSubscriptionForTenant(usagePlan, regTenantDomain);
-
-    } catch (AxisFault axisFault) {
-        String msg = "Failed to upgrade the usage plan for tenant " + regTenantDomain +
-                     " to " + usagePlan + " during registration. " + axisFault.getMessage();
-        throw new Exception(msg, axisFault);
-    }
-
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/payment/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/payment/pom.xml b/components/stratos/payment/pom.xml
deleted file mode 100644
index 17da0ab..0000000
--- a/components/stratos/payment/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>stratos-components</artifactId>
-        <version>2.1.0</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>payment-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Payment Parent Module</name>
-    <description>WSO2 Stratos Payment Parent Module</description>
-    <url>http://wso2.org</url>
-
-    <modules>
-        <module>org.wso2.carbon.payment.paypal/2.1.0</module>
-        <module>org.wso2.carbon.payment.ui/2.1.0</module>
-    </modules>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui/2.1.0/pom.xml b/components/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui/2.1.0/pom.xml
deleted file mode 100644
index 3baaa01..0000000
--- a/components/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui/2.1.0/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-# Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-    	<groupId>org.wso2.carbon</groupId>
-        <artifactId>stratos-sso-mgt</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.stratos.identity.saml2.sso.mgt.ui</artifactId>
-    <version>2.1.0</version> 
-   <packaging>bundle</packaging>
-    <name>WSO2 Stratos - SAML2 SSO Management FE Component</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.core</artifactId>
-            <version>4.1.0</version>            
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2.wso2</groupId>
-            <artifactId>axis2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-            <artifactId>axiom</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ui</artifactId>
-            <version>4.1.0</version>            
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.identity.core</artifactId>
-            <version>4.1.0</version>            
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.identity.sso.saml</artifactId>
-            <version>4.1.0</version>           
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.identity.sso.saml.ui</artifactId>
-            <version>4.1.0</version>            
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.identity.base</artifactId>
-            <version>4.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.common</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-                <version>1.0.10</version>
-                <executions>
-                    <execution>
-                        <id>generate-scr-scrdescriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Private-Package>org.wso2.stratos.identity.saml2.sso.mgt.internal
-                        </Private-Package>
-                        <Export-Package>
-                            !org.wso2.stratos.identity.saml2.sso.mgt.internal,
-                            org.wso2.stratos.identity.saml2.sso.mgt.*
-                        </Export-Package>
-                        <Import-Package>
-                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
-                            javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
-                            org.apache.lucene.*,
-                            *;resolution:=optional
-                        </Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                        <Carbon-Component>UIBundle</Carbon-Component>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/45ae532f/components/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui/2.1.0/src/main/java/org/wso2/stratos/identity/saml2/sso/mgt/ui/SSOLoginPageFilter.java
----------------------------------------------------------------------
diff --git a/components/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui/2.1.0/src/main/java/org/wso2/stratos/identity/saml2/sso/mgt/ui/SSOLoginPageFilter.java b/components/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui/2.1.0/src/main/java/org/wso2/stratos/identity/saml2/sso/mgt/ui/SSOLoginPageFilter.java
deleted file mode 100644
index bd643e5..0000000
--- a/components/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui/2.1.0/src/main/java/org/wso2/stratos/identity/saml2/sso/mgt/ui/SSOLoginPageFilter.java
+++ /dev/null
@@ -1,51 +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.stratos.identity.saml2.sso.mgt.ui;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-public class SSOLoginPageFilter implements Filter {
-
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
-                         FilterChain filterChain) throws IOException, ServletException {
-        if (!(servletRequest instanceof HttpServletRequest)) {
-            return;
-        }
-        String url = ((HttpServletRequest) servletRequest).getRequestURI();
-        url = url.replace("sso-saml/login.jsp", "stratos-sso/login_ajaxprocessor.jsp");
-        RequestDispatcher requestDispatcher =
-                servletRequest.getRequestDispatcher(url);
-        requestDispatcher.forward(servletRequest, servletResponse);
-    }
-
-    public void destroy() {
-        // unimplemented method
-    }
-
-    public void init(FilterConfig filterConfig) throws ServletException {
-       // unimplemented method
-    }
-}