You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/26 07:50:23 UTC
git commit: Refactor products-stratos controller module
Updated Branches:
refs/heads/master 478868a13 -> 5a5e6a4c6
Refactor products-stratos controller module
Signed-off-by: Isuru Perera <is...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5a5e6a4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5a5e6a4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5a5e6a4c
Branch: refs/heads/master
Commit: 5a5e6a4c6c4531ab9394368ef046c3008ca9789c
Parents: 478868a
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Fri Jul 26 10:58:03 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Fri Jul 26 11:20:00 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 2 +-
.../ui/clients/CloudManagerServiceClient.java | 2 +-
.../modules/distribution/pom.xml | 4 +-
.../modules/features-dashboard/pom.xml | 4 +-
.../org.apache.stratos.server.feature/pom.xml | 2 +-
.../org.apache.stratos.ui.feature/pom.xml | 39 +++++++++++---------
.../modules/integration/pom.xml | 8 ++--
.../integration/tests/TenantMgtTestCase.java | 4 +-
.../integration/src/test/resources/testng.xml | 6 +--
.../modules/p2-profile-gen/pom.xml | 2 +-
.../resources/cloud-services-icons/pom.xml | 4 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
13 files changed, 43 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/components/org.apache.stratos.validate.domain.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.validate.domain.ui/pom.xml b/components/org.apache.stratos.validate.domain.ui/pom.xml
index 2638d15..3168afe 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>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
----------------------------------------------------------------------
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 89d7cba..5359afa 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.services.mgt.beans.xsd.CloudService;
+import org.apache.stratos.manager.dashboard.stub.xsd.CloudService;
import javax.servlet.ServletConfig;
import javax.servlet.ServletRequest;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/distribution/pom.xml b/products/stratos_controller/modules/distribution/pom.xml
index 407dfb8..d2eee31 100755
--- a/products/stratos_controller/modules/distribution/pom.xml
+++ b/products/stratos_controller/modules/distribution/pom.xml
@@ -30,8 +30,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2sc</artifactId>
<packaging>jar</packaging>
- <name>Apache Stratos2 - Distribution</name>
- <description>Apache Stratos2 - Distribution</description>
+ <name>Apache Stratos - Distribution</name>
+ <description>Apache Stratos - Distribution</description>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/features-dashboard/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/features-dashboard/pom.xml b/products/stratos_controller/modules/features-dashboard/pom.xml
index 471a574..66651e2 100755
--- a/products/stratos_controller/modules/features-dashboard/pom.xml
+++ b/products/stratos_controller/modules/features-dashboard/pom.xml
@@ -35,8 +35,8 @@
<artifactId>features-dashboard</artifactId>
<packaging>war</packaging>
<version>1.0.0</version>
- <name>features-dashboard-webapp</name>
- <description>features-dashboard-webapp</description>
+ <name>Apache Stratos - Features Dashboard Webapp</name>
+ <description>Apache Stratos - Features Dashboard Webapp</description>
<properties>
<CApp.type>web/application</CApp.type>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
----------------------------------------------------------------------
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..a01c058 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>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/features/service/org.apache.stratos.ui.feature/pom.xml
----------------------------------------------------------------------
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..bf04fd7 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
@@ -100,28 +100,32 @@
<artifactId>org.wso2.carbon.email.verification.stub</artifactId>
<version>${carbon.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.tenant.register.stub</artifactId>
<version>${project.version}</version>
+ </dependency-->
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.tenant.register.stub</artifactId>
+ <version>${carbon.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.security.mgt</artifactId>
- <version>${carbon.version}</version>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.security.mgt</artifactId>
+ <version>${carbon.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager.dashboard.ui</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager.dashboard.stub</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager.login.ui</artifactId>
<version>${project.version}</version>
@@ -138,9 +142,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,11 +177,11 @@
<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>
- <bundleDef>org.apache.stratos:org.apache.stratos.manager.dashboard.stub</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.manager.dashboard.stub</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.manager.login.ui</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.manager.styles</bundleDef>
<!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity.ui</bundleDef>
@@ -186,9 +190,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.apache.stratos:org.apache.stratos.tenant.register.stub:${project.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>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/integration/pom.xml b/products/stratos_controller/modules/integration/pom.xml
index 21522be..ba64d76 100755
--- a/products/stratos_controller/modules/integration/pom.xml
+++ b/products/stratos_controller/modules/integration/pom.xml
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>integration</artifactId>
- <name>Apache Stratos Manager - Integration Tests</name>
+ <name>Apache Stratos - Manager Integration Tests</name>
<packaging>jar</packaging>
<build>
@@ -150,9 +150,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
+ <version>${carbon.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java b/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
index 963e0a1..f33946c 100755
--- a/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
+++ b/products/stratos_controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
@@ -27,8 +27,8 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.wso2.carbon.integration.framework.utils.FrameworkSettings;
-import org.apache.stratos.tenant.mgt.stub.TenantMgtAdminServiceStub;
-import org.apache.stratos.tenant.mgt.stub.beans.xsd.TenantInfoBean;
+import org.wso2.carbon.tenant.mgt.stub.TenantMgtAdminServiceStub;
+import org.wso2.carbon.tenant.mgt.stub.beans.xsd.TenantInfoBean;
import org.wso2.carbon.utils.CarbonUtils;
import java.util.Calendar;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/integration/src/test/resources/testng.xml
----------------------------------------------------------------------
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..5cdc25e 100755
--- a/products/stratos_controller/modules/integration/src/test/resources/testng.xml
+++ b/products/stratos_controller/modules/integration/src/test/resources/testng.xml
@@ -5,13 +5,13 @@
<class name="org.apache.stratos.manager.integration.tests.StratosManagerTestServerManager"/>
<class name="org.apache.stratos.manager.integration.tests.LoginLogoutTestCase"/>
<class name="org.apache.stratos.manager.integration.tests.SecurityVerificationTestCase"/>
- <class name="org.apache.stratos.manager.integration.tests.TenantMgtTestCase">
+ <!--class name="org.apache.stratos.manager.integration.tests.TenantMgtTestCase">
<methods>
<include name="init"/>
<include name="addTenantTest"/>
<include name="activateTenantTest"/>
</methods>
- </class>
+ </class-->
</classes>
</test>
-</suite>
\ No newline at end of file
+</suite>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/p2-profile-gen/pom.xml b/products/stratos_controller/modules/p2-profile-gen/pom.xml
index 5a28297..a9a600c 100644
--- a/products/stratos_controller/modules/p2-profile-gen/pom.xml
+++ b/products/stratos_controller/modules/p2-profile-gen/pom.xml
@@ -31,7 +31,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>stratos-controller-profile-gen</artifactId>
<packaging>pom</packaging>
- <name>Apache Stratos Controller - Profile Generation</name>
+ <name>Apache Stratos - Controller Profile Generation</name>
<url>http://apache.org</url>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/products/stratos_controller/resources/cloud-services-icons/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/resources/cloud-services-icons/pom.xml b/products/stratos_controller/resources/cloud-services-icons/pom.xml
index 6df9ca0..662ea95 100755
--- a/products/stratos_controller/resources/cloud-services-icons/pom.xml
+++ b/products/stratos_controller/resources/cloud-services-icons/pom.xml
@@ -25,8 +25,8 @@
<artifactId>cloud-services-icons</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>
- <name>cloud-services-icons</name>
- <description>WSO2 Manager - Cloud Services Icons</description>
+ <name>Apache Stratos - Manager Cloud Services Icons</name>
+ <description>Apache Stratos - Manager Cloud Services Icons</description>
<licenses>
<license>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
----------------------------------------------------------------------
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 0d1a97f..fbe27a8 100644
--- a/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.manager.dashboard.stub/pom.xml
@@ -89,7 +89,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.manager.dashboard.stub.*;version="${carbon.platform.package.export.version}",
+ org.apache.stratos.manager.dashboard.stub.*;version="${project.version}",
</Export-Package>
<Import-Package>
!org.apache.stratos.manager.dashboard.stub.*,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a5e6a4c/service-stubs/org.apache.stratos.validate.domain.stub/pom.xml
----------------------------------------------------------------------
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.*,