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/17 09:18:40 UTC
git commit: applied 0002-Manager-common-feature-refac.patch
Updated Branches:
refs/heads/master 14f800daf -> ec3a1e93b
applied 0002-Manager-common-feature-refac.patch
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ec3a1e93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ec3a1e93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ec3a1e93
Branch: refs/heads/master
Commit: ec3a1e93b08f64e45f1829c11017eae7555ab00e
Parents: 14f800d
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Wed Jul 17 12:48:19 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Wed Jul 17 12:48:19 2013 +0530
----------------------------------------------------------------------
components/org.apache.stratos.sso.redirector.ui/pom.xml | 1 -
.../org.apache.stratos.common.server.feature/pom.xml | 4 ++--
.../resources/conf/cloud-services-desc.xml | 10 +++++-----
.../src/main/resources/conf/cloud-services-desc.xml | 10 +++++-----
features/manager/common/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../resources/conf/cloud-services-desc.xml | 2 +-
.../src/main/resources/conf/cloud-services-desc.xml | 2 +-
.../org.apache.stratos.throttling.agent.feature/pom.xml | 2 +-
features/manager/throttling/pom.xml | 2 +-
11 files changed, 19 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/components/org.apache.stratos.sso.redirector.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/pom.xml b/components/org.apache.stratos.sso.redirector.ui/pom.xml
index 1b425b7..2d466f9 100644
--- a/components/org.apache.stratos.sso.redirector.ui/pom.xml
+++ b/components/org.apache.stratos.sso.redirector.ui/pom.xml
@@ -28,7 +28,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.sso.redirector.ui</artifactId>
- <version>2.1.0</version>
<packaging>bundle</packaging>
<name>Apache Stratos - SSO redirector UI component</name>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
index 260ab80..b7430a2 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.common.server.feature</artifactId>
<packaging>pom</packaging>
- <name>Apche Stratos - Common Core Feature</name>
+ <name>Apache Stratos - Common Core Feature</name>
<url>http://apache.org</url>
<description>This feature contains the core bundles required for Back-end servlet functionality</description>
@@ -217,7 +217,7 @@
<!-- Tenant Mgmt -->
<bundleDef>org.json.wso2:json</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt:${stratos.version}</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt:${apache.stratos.version}</bundleDef>
<bundleDef>kaptcha.wso2:kaptcha</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core:${apache.stratos.version}</bundleDef>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/cloud-services-desc.xml b/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/cloud-services-desc.xml
index 54141a2..70bcdc8 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/cloud-services-desc.xml
+++ b/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/cloud-services-desc.xml
@@ -4,9 +4,9 @@
given here.
-->
<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
- <cloudService name="WSO2 Stratos Controller" default="true">
+ <cloudService name="Apache Stratos Controller" default="true">
<key>SCC</key>
- <label>WSO2 Stratos Controller</label>
+ <label>Apache Stratos Controller</label>
<link>https://scc.cloud.wso2.com</link>
<!--icon>
https://localhost:9443/cloud-services-icons/esb.gif
@@ -24,15 +24,15 @@
<productPageURL>http://wso2.com/cloud/stratos</productPageURL>
<description>WSO2 Cloud Controller.</description>
</cloudService>
- <cloudService name="WSO2 Stratos Agent" default="true">
+ <cloudService name="Apache Stratos Agent" default="true">
<key>Agent</key>
- <label>WSO2 Stratos Agent</label>
+ <label>Apache Stratos Agent</label>
<link>https://cc.cloud.wso2.com</link>
<!--icon>
https://localhost:9443/cloud-services-icons/esb.gif
</icon-->
<productPageURL>http://wso2.com/cloud/stratos</productPageURL>
- <description>WSO2 Stratos Agent.</description>
+ <description>Apache Stratos Agent.</description>
</cloudService>
<cloudService name="WSO2 Enterprise Service Bus" default="true">
<key>ESB</key>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml
index 54141a2..70bcdc8 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml
+++ b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml
@@ -4,9 +4,9 @@
given here.
-->
<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
- <cloudService name="WSO2 Stratos Controller" default="true">
+ <cloudService name="Apache Stratos Controller" default="true">
<key>SCC</key>
- <label>WSO2 Stratos Controller</label>
+ <label>Apache Stratos Controller</label>
<link>https://scc.cloud.wso2.com</link>
<!--icon>
https://localhost:9443/cloud-services-icons/esb.gif
@@ -24,15 +24,15 @@
<productPageURL>http://wso2.com/cloud/stratos</productPageURL>
<description>WSO2 Cloud Controller.</description>
</cloudService>
- <cloudService name="WSO2 Stratos Agent" default="true">
+ <cloudService name="Apache Stratos Agent" default="true">
<key>Agent</key>
- <label>WSO2 Stratos Agent</label>
+ <label>Apache Stratos Agent</label>
<link>https://cc.cloud.wso2.com</link>
<!--icon>
https://localhost:9443/cloud-services-icons/esb.gif
</icon-->
<productPageURL>http://wso2.com/cloud/stratos</productPageURL>
- <description>WSO2 Stratos Agent.</description>
+ <description>Apache Stratos Agent.</description>
</cloudService>
<cloudService name="WSO2 Enterprise Service Bus" default="true">
<key>ESB</key>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/common/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/pom.xml b/features/manager/common/pom.xml
index 7b59e7d..a5018a7 100644
--- a/features/manager/common/pom.xml
+++ b/features/manager/common/pom.xml
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>common-feature</artifactId>
<packaging>pom</packaging>
- <name>WSO2 Stratos - Common Feature Aggregator Module</name>
+ <name>Apache Stratos - Common Feature Aggregator Module</name>
<url>http://wso2.org</url>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
index 28831c2..00140cc 100644
--- a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
+++ b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.load.balance.agent.server.feature</artifactId>
<packaging>pom</packaging>
- <name>Apache Stratos -Load Balance Agent Server Feature</name>
+ <name>Apache Stratos - Load Balance Agent Server Feature</name>
<url>http://apache.org</url>
<description>
This feature contains the bundles required for Load Balance Agent Back End Functionality
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml b/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
index c154520..0257e0b 100644
--- a/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
+++ b/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.status.monitor.server.feature</artifactId>
<packaging>pom</packaging>
- <name>WSO2 Stratos - Status Monitor Server Feature</name>
+ <name>Apache Stratos - Status Monitor Server Feature</name>
<url>http://wso2.org</url>
<description>
This feature contains the bundles required for Status Monitoring Backend Functionality
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
index 7f797b1..d7016d7 100644
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
@@ -4,7 +4,7 @@
given here.
-->
<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
- <cloudService name="WSO2 Stratos Manager">
+ <cloudService name="Apache Stratos Manager">
<key>manager</key>
<link>https://cloud.wso2.com</link>
</cloudService>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
index 7f797b1..d7016d7 100644
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
@@ -4,7 +4,7 @@
given here.
-->
<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
- <cloudService name="WSO2 Stratos Manager">
+ <cloudService name="Apache Stratos Manager">
<key>manager</key>
<link>https://cloud.wso2.com</link>
</cloudService>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
index dc63784..4657f69 100644
--- a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
+++ b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
@@ -31,7 +31,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.throttling.agent.feature</artifactId>
<packaging>pom</packaging>
- <name>WSO2 Stratos - Throttling Agent Feature</name>
+ <name>Apache Stratos - Throttling Agent Feature</name>
<url>http://apache.org</url>
<description>This feature contains the bundles required for throttle resource usage</description>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ec3a1e93/features/manager/throttling/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/pom.xml b/features/manager/throttling/pom.xml
index f8ec919..de23b2a 100644
--- a/features/manager/throttling/pom.xml
+++ b/features/manager/throttling/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>throttling-feature</artifactId>
<packaging>pom</packaging>
- <name>WSO2 Stratos - Throttling Feature Aggregator Module</name>
+ <name>Apache Stratos - Throttling Feature Aggregator Module</name>
<url>http://wso2.org</url>
<modules>
<module>org.apache.stratos.throttling.manager.feature</module>