From 5eeef4fd60233f5ddf33252fb9991d696a35e488 Mon Sep 17 00:00:00 2001
From: Imesh Gunaratne <imesh@wso2.com>
Date: Thu, 25 Jul 2013 16:50:17 +0530
Subject: [PATCH] Corrected package name in manager.dashboard.stub and
 duplicated stratos key word

---
 .../manager/dashboard/ui/clients/CloudManagerServiceClient.java   | 2 +-
 .../org.apache.stratos.adc.topologymgt.service.stub/pom.xml       | 2 +-
 service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml   | 8 ++++----
 .../src/main/resources/CloudManagerService.wsdl                   | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java b/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
index 5359afa..89d7cba 100644
--- a/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
+++ b/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
@@ -30,7 +30,7 @@ import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.ui.CarbonUIUtil;
 import org.wso2.carbon.utils.ServerConstants;
 import org.apache.stratos.manager.dashboard.stub.CloudManagerServiceStub;
-import org.apache.stratos.manager.dashboard.stub.xsd.CloudService;
+import org.apache.stratos.manager.dashboard.services.mgt.beans.xsd.CloudService;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletRequest;
diff --git a/service-stubs/org.apache.stratos.adc.topologymgt.service.stub/pom.xml b/service-stubs/org.apache.stratos.adc.topologymgt.service.stub/pom.xml
index 153bf86..054d981 100644
--- a/service-stubs/org.apache.stratos.adc.topologymgt.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.adc.topologymgt.service.stub/pom.xml
@@ -88,7 +88,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.apache.stratos.stratos.topology.mgt.service.impl.*; version=0.0.0,
+                            org.apache.stratos.topology.mgt.service.impl.*; version=0.0.0,
                             org.apache.stratos.topology.mgt.*; version=0.0.0
                         </Export-Package>
                         <Import-Package>
diff --git a/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml b/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
index dde4009..1563fab 100644
--- a/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
@@ -49,8 +49,8 @@
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/CloudManagerService.wsdl -u -uw -o target/generated-code
-                                                    -p org.apache.stratos.stratos.manager.dashboard.stub
-                                                    -ns2p http://common.core.carbon.wso2.org/xsd=org.apache.stratos.stratos.manager.dashboard.stub,http://services.mgt.services.manager.stratos.wso2.org=org.apache.stratos.stratos.manager.dashboard.stub,http://beans.mgt.services.manager.stratos.wso2.org/xsd=org.apache.stratos.stratos.manager.dashboard.stub.xsd"/>
+                                                    -p org.apache.stratos.manager.dashboard.stub
+                                                    -ns2p http://common.core.carbon.wso2.org/xsd=org.apache.stratos.manager.dashboard.stub,http://services.mgt.services.manager.stratos.wso2.org=org.apache.stratos.manager.dashboard.stub,http://beans.mgt.services.manager.stratos.wso2.org/xsd=org.apache.stratos.manager.dashboard.stub.xsd"/>
                                     <classpath refid="maven.dependency.classpath"/>
                                     <classpath refid="maven.compile.classpath"/>
                                     <classpath refid="maven.runtime.classpath"/>
@@ -89,10 +89,10 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.apache.stratos.stratos.manager.dashboard.stub.*;version="${carbon.platform.package.export.version}",
+                            org.apache.stratos.manager.dashboard.stub.*;version="${carbon.platform.package.export.version}",
                         </Export-Package>
                         <Import-Package>
-                            !org.apache.stratos.stratos.manager.dashboard.stub.*,
+                            !org.apache.stratos.manager.dashboard.stub.*,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>
diff --git a/service-stubs/org.apache.stratos.manager.dashboard.stub/src/main/resources/CloudManagerService.wsdl b/service-stubs/org.apache.stratos.manager.dashboard.stub/src/main/resources/CloudManagerService.wsdl
index 400ae25..f713f5e 100644
--- a/service-stubs/org.apache.stratos.manager.dashboard.stub/src/main/resources/CloudManagerService.wsdl
+++ b/service-stubs/org.apache.stratos.manager.dashboard.stub/src/main/resources/CloudManagerService.wsdl
@@ -21,7 +21,7 @@
                   xmlns:ns="http://services.mgt.services.manager.stratos.apache.org"
                   xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
                   xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-                  xmlns:ax2298="http://beans.mgt.services.manager.stratos.apache.org/xsd"
+                  xmlns:ax2298="http://beans.mgt.services.dashboard.manager.stratos.apache.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/"
@@ -29,7 +29,7 @@
     <wsdl:documentation>CloudManagerService</wsdl:documentation>
     <wsdl:types>
         <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified"
-                   targetNamespace="http://beans.mgt.services.manager.stratos.apache.org/xsd">
+                   targetNamespace="http://beans.mgt.services.dashboard.manager.stratos.apache.org/xsd">
             <xs:complexType name="CloudService">
                 <xs:sequence>
                     <xs:element minOccurs="0" name="active" type="xs:boolean"/>
@@ -43,10 +43,10 @@
                 </xs:sequence>
             </xs:complexType>
         </xs:schema>
-        <xs:schema xmlns:ax2299="http://beans.mgt.services.manager.stratos.apache.org/xsd"
+        <xs:schema xmlns:ax2299="http://beans.mgt.services.dashboard.manager.stratos.apache.org/xsd"
                    attributeFormDefault="qualified" elementFormDefault="qualified"
                    targetNamespace="http://services.mgt.services.manager.stratos.apache.org">
-            <xs:import namespace="http://beans.mgt.services.manager.stratos.apache.org/xsd"/>
+            <xs:import namespace="http://beans.mgt.services.dashboard.manager.stratos.apache.org/xsd"/>
 
             <xs:element name="CloudManagerServiceException">
                 <xs:complexType>
-- 
1.8.1.2