From 3ed9885c3b178d727ec896575a1e5b135a5602b8 Mon Sep 17 00:00:00 2001
From: Manula Thantriwatte <manulac@wso2.com>
Date: Thu, 25 Jul 2013 19:30:01 +0530
Subject: [PATCH] Refactor stratos controller

---
 .../org.apache.stratos.validate.domain.ui/pom.xml  |    2 +-
 .../modules/distribution/pom.xml                   |    2 +-
 .../org.apache.stratos.server.feature/pom.xml      |    2 +-
 .../service/org.apache.stratos.ui.feature/pom.xml  |   20 ++++++++++----------
 .../integration/src/test/resources/testng.xml      |    2 +-
 .../pom.xml                                        |    4 ++--
 .../org.apache.stratos.tenant.mgt.stub/pom.xml     |    8 ++++----
 .../pom.xml                                        |    2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/components/org.apache.stratos.validate.domain.ui/pom.xml b/components/org.apache.stratos.validate.domain.ui/pom.xml
index 2638d15..af1d73a 100644
--- a/components/org.apache.stratos.validate.domain.ui/pom.xml
+++ b/components/org.apache.stratos.validate.domain.ui/pom.xml
@@ -52,7 +52,7 @@
                             javax.servlet;version="${imp.pkg.version.javax.servlet}",
                             javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
                             org.apache.lucene.*,
-                            org.apache.stratos.validate.domain.stub.*; version="${carbon.platform.package.import.version.range}",
+                            org.apache.stratos.validate.domain.stub.*; version="${project.version}",
                             *;resolution:=optional
                         </Import-Package>
                         <Carbon-Component>UIBundle</Carbon-Component>
diff --git a/products/stratos_controller/modules/distribution/pom.xml b/products/stratos_controller/modules/distribution/pom.xml
index 407dfb8..1f862a8 100755
--- a/products/stratos_controller/modules/distribution/pom.xml
+++ b/products/stratos_controller/modules/distribution/pom.xml
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2sc</artifactId>
     <packaging>jar</packaging>
-    <name>Apache Stratos2 - Distribution</name>
+    <name>Apache Stratos - Distribution</name>
     <description>Apache Stratos2 - Distribution</description>
 
     <dependencies>
diff --git a/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml b/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
index 0672ecc..59efa82 100755
--- a/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
+++ b/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
@@ -204,7 +204,7 @@
                                 <bundleDef>org.apache.synapse:synapse-commons:2.1.0-wso2v7</bundleDef>
                                 <bundleDef>org.apache.synapse:synapse-extensions:2.1.0-wso2v7</bundleDef>
                                 <bundleDef>org.apache.synapse:synapse-tasks:2.1.0-wso2v7</bundleDef>-->
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.payment.paypal:${stratos.component.version}</bundleDef>
+				<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.payment.paypal:${stratos.component.version}</bundleDef>-->
 				<bundleDef>com.paypal.sdk.wso2:paypal:1.1.0.wso2v1</bundleDef>
 				<bundleDef>org.wso2.carbon:org.wso2.carbon.business.messaging.paypal.integration.core:${carbon.version}</bundleDef>
 				
diff --git a/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml b/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
index f18634a..961771f 100755
--- a/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
+++ b/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
@@ -101,9 +101,9 @@
 		<version>${carbon.version}</version>
             </dependency>
  <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.register.stub</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.tenant.register.stub</artifactId>
+                <version>${carbon.version}</version>
             </dependency>
 
         <dependency>
@@ -138,9 +138,9 @@
                  <version>${project.version}</version>
             </dependency>
 	    <dependency>
-                 <groupId>org.wso2.carbon</groupId>
-                 <artifactId>org.wso2.carbon.validate.domain.stub</artifactId>
-		<version>${carbon.version}</version>
+                 <groupId>org.apache.stratos</groupId>
+                 <artifactId>org.apache.stratos.validate.domain.stub</artifactId>
+		<version>${project.version}</version>
             </dependency>
         </dependencies>
     <build>
@@ -173,7 +173,7 @@
                                 <bundleDef>org.apache.batik.wso2:batik</bundleDef>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.validate.domain.ui</bundleDef>
                                 <bundleDef>org.wso2.carbon:org.wso2.carbon.register.ui:2.1.1</bundleDef>
-				                <bundleDef>org.wso2.carbon:org.wso2.carbon.payment.ui:${stratos.component.version}</bundleDef>
+				<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.payment.ui:${stratos.component.version}</bundleDef>-->
                                 <bundleDef>org.wso2.carbon:org.wso2.carbon.email.verification.ui</bundleDef>
                                 <bundleDef>org.wso2.carbon:org.wso2.carbon.email.verification.stub</bundleDef>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.manager.dashboard.ui </bundleDef>
@@ -186,10 +186,10 @@
 				<!--stub bundles -->
 
 				<bundleDef>org.apache.stratos:org.apache.stratos.account.mgt.stub:${project.version}</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.validate.domain.stub</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.validate.domain.stub</bundleDef>
 				<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.stub:${wso2carbon.version}</bundleDef>-->
-				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.register.stub:${project.version}</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.payment.stub:${wso2carbon.version}</bundleDef>
+				<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.register.stub:${carbon.version}</bundleDef>
+				<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.payment.stub:${wso2carbon.version}</bundleDef>-->
                             </bundles>
                             <importBundles>
                                 <importBundleDef>org.wso2.carbon:org.wso2.carbon.ui.menu.tools</importBundleDef>
diff --git a/products/stratos_controller/modules/integration/src/test/resources/testng.xml b/products/stratos_controller/modules/integration/src/test/resources/testng.xml
index 26e8678..1f2182b 100755
--- a/products/stratos_controller/modules/integration/src/test/resources/testng.xml
+++ b/products/stratos_controller/modules/integration/src/test/resources/testng.xml
@@ -14,4 +14,4 @@
             </class>
         </classes>
     </test>
-</suite>
\ No newline at end of file
+</suite>
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..f417936 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.stratos.manager.dashboard.stub,http://services.mgt.services.manager.stratos.apache.org=org.apache.stratos.manager.dashboard.stub,http://beans.mgt.services.manager.stratos.apache.org/xsd=org.apache.stratos.manager.dashboard.stub.xsd"/>
                                     <classpath refid="maven.dependency.classpath"/>
                                     <classpath refid="maven.compile.classpath"/>
                                     <classpath refid="maven.runtime.classpath"/>
diff --git a/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml b/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
index f8f25d9..eb1782a 100644
--- a/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.tenant.mgt.stub/pom.xml
@@ -49,8 +49,8 @@
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/TenantMgtAdminService.wsdl -u -uw -o target/generated-code
-                                    -p org.wso2.carbon.tenant.mgt.stub
-                                    -ns2p http://services.mgt.tenant.carbon.wso2.org=org.wso2.carbon.tenant.mgt.stub.services,http://beans.mgt.tenant.carbon.wso2.org/xsd=org.wso2.carbon.tenant.mgt.stub.beans.xsd,http://beans.common.stratos.carbon.wso2.org/xsd=org.wso2.carbon.tenant.mgt.stub.beans.xsd"/>
+                                    -p org.apache.stratos.tenant.mgt.stub
+                                    -ns2p http://services.mgt.tenant.stratos.apache.org=org.apache.stratos.tenant.mgt.stub.services,http://beans.mgt.tenant.stratos.apache.org/xsd=org.apache.stratos.tenant.mgt.stub.beans.xsd,http://beans.common.stratos.apache.org/xsd=org.apache.stratos.tenant.mgt.stub.beans.xsd"/>
                                     <classpath refid="maven.dependency.classpath"/>
                                     <classpath refid="maven.compile.classpath"/>
                                     <classpath refid="maven.runtime.classpath"/>
@@ -71,10 +71,10 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.wso2.carbon.tenant.mgt.stub.*; version="${carbon.platform.package.export.version}"
+                            org.apache.stratos.tenant.mgt.stub.*; version="${project.version}"
                         </Export-Package>
                         <Import-Package>
-			    			!org.wso2.carbon.tenant.mgt.stub.*,
+			    !org.apache.stratos.tenant.mgt.stub.*,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>
diff --git a/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml b/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml
index d9ee81d..98f4f36 100644
--- a/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml
@@ -93,7 +93,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
                             org.apache.stratos.validate.domain.stub.*;
-                            version="${carbon.platform.package.export.version}"
+                            version="${project.version}"
                         </Export-Package>
                         <Import-Package>
                             !org.apache.stratos.validate.domain.stub.*,
-- 
1.7.9.5