Repository: stratos
Updated Branches:
  refs/heads/docker-grouping-merge ceae5f211 -> 7743fc814


http://git-wip-us.apache.org/repos/asf/stratos/blob/d1bddc40/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
 
b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
deleted file mode 100644
index ddae5c1..0000000
--- 
a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";>
-    <xs:element name="tenantInfoBean">
-        <xs:complexType>
-            <xs:all>
-                <xs:element name="admin" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="firstname" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="lastname" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="adminPassword" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="tenantDomain" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="email" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="active" type="xs:boolean" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-            </xs:all>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="userInfoBean">
-        <xs:complexType>
-            <xs:all>
-                <xs:element name="userName" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="credential" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="role" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="firstName" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="lastName" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="email" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="profileName" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-            </xs:all>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="partition">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="id" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="description" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="true"/>
-                <xs:element name="isPublic" type="xs:boolean" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="provider" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="property" minOccurs="1" 
maxOccurs="unbounded">
-                    <xs:complexType>
-                        <xs:all>
-                            <xs:element name="name" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="value" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                        </xs:all>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="autoscalePolicy">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="id" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="description" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="true"/>
-                <xs:element name="isPublic" type="xs:boolean" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="loadThresholds" minOccurs="1" maxOccurs="1" 
nillable="false">
-                    <xs:complexType>
-                        <xs:all>
-                            <xs:element name="requestsInFlight" 
type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="memoryConsumption" 
type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="loadAverage" 
type="thresholdValues" minOccurs="1" maxOccurs="1" nillable="false"/>
-                        </xs:all>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="deploymentPolicy">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="id" type="xs:string" maxOccurs="1" 
minOccurs="1" nillable="false"/>
-                <xs:element name="description" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="true"/>
-                <xs:element name="isPublic" type="xs:boolean" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="partitionGroup">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="id" type="xs:string" 
maxOccurs="1" minOccurs="1" nillable="false"/>
-                            <xs:element name="partitionAlgo" minOccurs="1" 
maxOccurs="1" nillable="false">
-                                <xs:simpleType>
-                                    <xs:restriction base="xs:string">
-                                        <xs:enumeration value="round-robin"/>
-                                        <xs:enumeration 
value="one-after-another"/>
-                                    </xs:restriction>
-                                </xs:simpleType>
-                            </xs:element>
-                            <xs:element name="partition" minOccurs="1" 
maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:all>
-                                        <xs:element name="id" type="xs:string" 
maxOccurs="1" minOccurs="1" nillable="false"/>
-                                        <xs:element name="description" 
type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                        <xs:element name="partitionMax" 
type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="partitionMin" 
type="xs:int" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                    </xs:all>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="cartridgeDefinitionBean">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="type" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="isPublic" type="xs:boolean" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="provider" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="host" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="displayName" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="description" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="version" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="defaultAutoscalingPolicy" type="xs:string" 
minOccurs="0" maxOccurs="1" nillable="false"/>
-                <xs:element name="multiTenant" type="xs:boolean" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="deployerType" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="portMapping" minOccurs="1" 
maxOccurs="unbounded">
-                    <xs:complexType>
-                        <xs:all>
-                            <xs:element name="protocol" type="xs:string" 
maxOccurs="1" minOccurs="1" nillable="false"/>
-                            <xs:element name="port" type="xs:int" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="proxyPort" type="xs:int" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                        </xs:all>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="iaasProvider" minOccurs="0" 
maxOccurs="unbounded">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="type" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="imageId" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="maxInstanceLimit" type="xs:int" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="property" minOccurs="0" 
maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:all>
-                                        <xs:element name="name" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="value" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                    </xs:all>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="networkInterfaces" minOccurs="0" 
maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:all>
-                                        <xs:element name="networkUuid" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                    </xs:all>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="container" minOccurs="0" 
maxOccurs="unbounded">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="imageName" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="dockerfileRepo" type="xs:string" 
minOccurs="0" maxOccurs="1" nillable="false"/>
-                            <xs:element name="property" minOccurs="0" 
maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:all>
-                                        <xs:element name="name" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="value" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                    </xs:all>
-                                </xs:complexType>
-                            </xs:element>                            
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="loadBalancer" minOccurs="0" maxOccurs="1" 
nillable="true">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="type" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="property" minOccurs="1" 
maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:all>
-                                        <xs:element name="name" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="value" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                    </xs:all>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="persistence" minOccurs="0" maxOccurs="1" 
nillable="true">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="isRequired" type="xs:boolean" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="volume" minOccurs="1" 
maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:all>
-                                        <xs:element name="device" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="mappingPath" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="size" type="xs:int" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                                        <xs:element name="removeOnTermination" 
type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
-                                    </xs:all>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="property" minOccurs="0" 
maxOccurs="unbounded">
-                    <xs:complexType>
-                        <xs:all>
-                            <xs:element name="name" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                            <xs:element name="value" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                        </xs:all>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:element name="cartridgeInfoBean">
-        <xs:complexType>
-            <xs:all>
-                <xs:element name="cartridgeType" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="alias" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="repoURL" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="privateRepo" type="xs:boolean" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="repoUsername" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="repoPassword" type="xs:string" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="commitsEnabled" type="xs:boolean" 
minOccurs="0" maxOccurs="1" nillable="false"/>
-                <xs:element name="autoscalePolicy" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="deploymentPolicy" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="persistanceRequired" type="xs:string" 
minOccurs="0" maxOccurs="1" nillable="false"/>
-                <xs:element name="size" type="xs:int" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="removeOnTermination" type="xs:boolean" 
minOccurs="0" maxOccurs="1" nillable="false"/>
-            </xs:all>
-        </xs:complexType>
-    </xs:element>
-
-
-    <xs:element name="serviceDefinitionBean">
-        <xs:complexType>
-            <xs:all>
-                <xs:element name="serviceName" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="isPublic" type="xs:boolean" minOccurs="0" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="cartridgeType" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="deploymentPolicyName" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="autoscalingPolicyName" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="clusterDomain" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="clusterSubDomain" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-                <xs:element name="tenantRange" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            </xs:all>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="serviceGroup">
-        <xs:complexType>
-               <xs:sequence>
-               <xs:element name="name" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-               <xs:element name="subGroups" type="xs:string" minOccurs="0" 
maxOccurs="unbounded" nillable="false"/>
-               <xs:element name="cartridges" type="xs:string" minOccurs="1" 
maxOccurs="unbounded" nillable="false"/>
-               <xs:element name="dependencies" type="tdependencies" 
minOccurs="0" maxOccurs="1"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="compositeAppDefinition">
-        <xs:complexType>
-               <xs:sequence>
-               <xs:element name="applicationId" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-               <xs:element name="alias" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-               <xs:element name="components" minOccurs="0" maxOccurs="1">
-                       <xs:complexType>
-                               <xs:sequence>
-                               <xs:element name="groups" type="tgroups" 
minOccurs="0" maxOccurs="unbounded"/>
-                               <xs:element name="subscribables" 
type="tsubscribables" minOccurs="0" maxOccurs="unbounded"/>
-                               <xs:element name="dependencies" 
type="tdependencies" minOccurs="0" maxOccurs="1"/>
-                       </xs:sequence>
-                       </xs:complexType>   
-                </xs:element> 
-                <xs:element name="subscribableInfo" type="tsubscribableInfo" 
minOccurs="0" maxOccurs="unbounded" nillable="false"/>    
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:complexType name="tsubscribableInfo">
-        <xs:all>
-            <xs:element name="alias" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            <xs:element name="deploymentPolicy" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            <xs:element name="autoscalingPolicy" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-            <xs:element name="repoURL" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            <xs:element name="privateRepo" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            <xs:element name="repoUsername" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            <xs:element name="repoPassword" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-        </xs:all>
-    </xs:complexType>
-    
-    <xs:complexType name="tdependencies">
-       <xs:sequence>
-                       <xs:element name="terminationBehaviour" 
type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
-                       <xs:element name="startupOrders" type="xs:string" 
minOccurs="0" maxOccurs="unbounded" nillable="false"/>            
-       </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="tgroups">
-        <xs:sequence>
-            <xs:element name="name" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            <xs:element name="alias" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            <xs:element name="deploymentPolicy" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-            <xs:element name="autoscalingPolicy" type="xs:string" 
minOccurs="1" maxOccurs="1" nillable="false"/>
-            <xs:element name="subscribables" type="tsubscribables" 
minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="subGroups" type="tgroups" minOccurs="0" 
maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="tsubscribables">
-               <xs:all>
-               <xs:element name="type" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-               <xs:element name="alias" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-           </xs:all>
-       </xs:complexType>
-
-    <xs:element name="subscriptionDomainRequest">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="domains" type="subscriptionDomain" 
minOccurs="1" maxOccurs="unbounded" nillable="false"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-
-    <xs:complexType name="subscriptionDomain">
-        <xs:all>
-                <xs:element name="domainName" type="xs:string" minOccurs="1" 
maxOccurs="1" nillable="false"/>
-                <xs:element name="applicationContext" type="xs:string" 
minOccurs="0" maxOccurs="1" nillable="true"/>
-        </xs:all>
-    </xs:complexType>
-
-    <xs:complexType name="thresholdValues">
-        <xs:all>
-            <xs:element name="upperLimit" type="xs:float" minOccurs="1" 
maxOccurs="1"/>
-            <xs:element name="lowerLimit" type="xs:float" minOccurs="1" 
maxOccurs="1"/>            
-        </xs:all>
-    </xs:complexType>
-</xs:schema>

http://git-wip-us.apache.org/repos/asf/stratos/blob/d1bddc40/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/web.xml
 
b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/web.xml
deleted file mode 100644
index 7cef351..0000000
--- 
a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/web.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee";
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-         http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
-
-    <display-name>S2 Admin Endpoint</display-name>
-
-    <servlet>
-        <servlet-name>StratosAdminEndpoint</servlet-name>
-        
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>StratosAdminEndpoint</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-</web-app>
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/d1bddc40/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
 
b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
index fd8457b..cbc7100 100644
--- 
a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
+++ 
b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
@@ -276,7 +276,7 @@
                                     <type>war</type>
                                     <overWrite>true</overWrite>
                                     
<outputDirectory>${project.build.directory}/web-app/web-app</outputDirectory>
-                                    <destFileName>stratos.war</destFileName>
+                                    <destFileName>api.war</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/d1bddc40/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git 
a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
 
b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
index 91fef8c..1681c1a 100644
--- 
a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
+++ 
b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
@@ -17,7 +17,7 @@
 
 instructions.configure = \
 
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/cxf,target:${installFolder}/../../../lib/runtimes/cxf,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/web-app/stratos.war,target:${installFolder}/../../deployment/server/webapps/stratos.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/web-app/api.war,target:${installFolder}/../../deployment/server/webapps/api.war,overwrite:true);\
 
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading.xml,overwrite:true);\
 
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\
 
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/context.xml,target:${installFolder}/../../conf/tomcat/context.xml,overwrite:true);\

http://git-wip-us.apache.org/repos/asf/stratos/blob/d1bddc40/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml 
b/products/stratos/modules/distribution/src/assembly/bin.xml
index 7be2534..58b20db 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -907,7 +907,7 @@
         </file>
         <!-- REST endpoint webapp -->
         <file>
-            
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/stratos.war</source>
+            
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/api.war</source>
             
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
             <fileMode>644</fileMode>
         </file>

Reply via email to