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/23 17:33:23 UTC
git commit: applied
0001-Refactor-pom-files-to-make-the-build-success.patch
Updated Branches:
refs/heads/master 169b88a2a -> f8cb615ea
applied 0001-Refactor-pom-files-to-make-the-build-success.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/f8cb615e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f8cb615e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f8cb615e
Branch: refs/heads/master
Commit: f8cb615eac43d485d0b7ad6b56c908c71d7c007f
Parents: 169b88a
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Tue Jul 23 21:03:09 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Tue Jul 23 21:03:09 2013 +0530
----------------------------------------------------------------------
.../ui/internal/TenantActivityUIServiceComponent.java | 2 +-
.../org.apache.stratos.tenant.registration.ui/pom.xml | 2 +-
components/org.apache.stratos.throttling.manager/pom.xml | 2 +-
.../src/main/resources/p2.inf | 10 +++++-----
.../common/org.apache.stratos.common.ui.feature/pom.xml | 2 +-
.../gapp/org.apache.stratos.gapp.server.feature/pom.xml | 2 +-
.../pom.xml | 2 +-
.../stratos_controller/modules/p2-profile-gen/pom.xml | 9 ++++++---
.../org.apache.stratos.tenant.register.stub/pom.xml | 2 +-
9 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java
index d8c8eea..451d72c 100644
--- a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java
+++ b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java
@@ -13,7 +13,7 @@ import org.wso2.carbon.utils.ConfigurationContextService;
* cardinality="1..1" policy="dynamic" bind="setConfigurationContextService"
* unbind="unsetConfigurationContextService"
* @scr.reference name="stratos.config.service"
- * interface="org.wso2.stratos.stratos.common.util.StratosConfiguration" cardinality="1..1"
+ * interface="org.apache.stratos.common.util.StratosConfiguration" cardinality="1..1"
* policy="dynamic" bind="setStratosConfigurationService" unbind="unsetStratosConfigurationService"
*/
public class TenantActivityUIServiceComponent {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/components/org.apache.stratos.tenant.registration.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.registration.ui/pom.xml b/components/org.apache.stratos.tenant.registration.ui/pom.xml
index 8904101..32a3e4d 100644
--- a/components/org.apache.stratos.tenant.registration.ui/pom.xml
+++ b/components/org.apache.stratos.tenant.registration.ui/pom.xml
@@ -46,7 +46,7 @@
org.wso2.carbon.register.ui.*,
</Export-Package>
<Import-Package>
- org.apache.stratos.tenant.register.stub.*; version=4.1.0,
+ org.apache.stratos.tenant.register.stub.*; version=3.0.0-SHAPSHOT,
javax.servlet;version="${imp.pkg.version.javax.servlet}",
javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
!javax.xml.namespace,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/components/org.apache.stratos.throttling.manager/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.throttling.manager/pom.xml b/components/org.apache.stratos.throttling.manager/pom.xml
index 0855d5a..4b1ea69 100644
--- a/components/org.apache.stratos.throttling.manager/pom.xml
+++ b/components/org.apache.stratos.throttling.manager/pom.xml
@@ -70,7 +70,7 @@
<Import-Package>
org.wso2.carbon.rule.*,
org.apache.stratos.common.*,
- org.apahce.throttling.agent.*,
+ org.apache.throttling.agent.*,
org.wso2.carbon.billing.mgt.*,
org.wso2.carbon.registry.core.*;version=1.0.1,
org.wso2.carbon.registry.resource.*,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
index d3b634f..c63c4c6 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
@@ -1,8 +1,8 @@
instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.stratos.cloud.controller_${feature.version}/conf/cloud-controller.xml,target:${installFolder}/../conf/cloud-controller.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.stratos.cloud.controller_${feature.version}/conf/etc/cartridge.xsd,target:${installFolder}/../conf/etc/cartridge.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.stratos.cloud.controller_${feature.version}/conf/etc/cartridges.xsd,target:${installFolder}/../conf/etc/cartridges.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.stratos.cloud.controller_${feature.version}/conf/etc/service.xsd,target:${installFolder}/../conf/etc/service.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.stratos.cloud.controller_${feature.version}/conf/etc/services.xsd,target:${installFolder}/../conf/etc/services.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/cloud-controller.xml,target:${installFolder}/../conf/cloud-controller.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridge.xsd,target:${installFolder}/../conf/etc/cartridge.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridges.xsd,target:${installFolder}/../conf/etc/cartridges.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/service.xsd,target:${installFolder}/../conf/etc/service.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/services.xsd,target:${installFolder}/../conf/etc/services.xsd,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../deployment/server/cartridges);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../deployment/server/services);\
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
index c689657..4752783 100644
--- a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
@@ -91,7 +91,7 @@
<goal>p2-feature-gen</goal>
</goals>
<configuration>
- <id>org.apache.stratos.stratos.common.ui</id>
+ <id>org.apache.stratos.common.ui</id>
<propertiesFile>../../../../etc/feature.properties</propertiesFile>
<adviceFile>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml b/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml
index a2d7b38..1aff1c7 100644
--- a/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml
+++ b/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml
@@ -48,7 +48,7 @@
<goal>p2-feature-gen</goal>
</goals>
<configuration>
- <id>org.apache.stratos.stratos.gapp.server</id>
+ <id>org.apache.stratos.gapp.server</id>
<propertiesFile>../../../../etc/feature.properties</propertiesFile>
<importFeatures>
<importFeatureDef>org.wso2.carbon.identity.core.server:${carbon.version}</importFeatureDef>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
index e571494..90d7a33 100644
--- a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
+++ b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
@@ -84,7 +84,7 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity:${apache.stratos.version}</bundleDef>
</bundles>
<importBundles>
</importBundles>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/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 3f3b9da..9fd5f68 100644
--- a/products/stratos_controller/modules/p2-profile-gen/pom.xml
+++ b/products/stratos_controller/modules/p2-profile-gen/pom.xml
@@ -116,6 +116,9 @@
org.apache.stratos:org.apache.stratos.common.feature:${apache.stratos.version}
</featureArtifactDef>
<featureArtifactDef>
+ org.apache.stratos:org.apache.stratos.tenant.activity.server.feature:${apache.stratos.version}
+ </featureArtifactDef>
+ <featureArtifactDef>
org.apache.stratos:org.apache.stratos.usage.feature:${apache.stratos.version}
</featureArtifactDef>
<featureArtifactDef>
@@ -270,7 +273,7 @@
<version>${apache.stratos.version}</version>
</feature>
<feature>
- <id>org.apche.stratos.common.feature.group</id>
+ <id>org.apache.stratos.common.feature.group</id>
<version>${apache.stratos.version}</version>
</feature>
<!-- start BAM -->
@@ -329,8 +332,8 @@
<!--End GApp SSO features -->
<feature>
- <id>org.wso2.carbon.load.balance.agent.server.feature.group</id>
- <version>${stratos.component.version}</version>
+ <id>org.apache.stratos.load.balance.agent.server.feature.group</id>
+ <version>${apache.stratos.version}</version>
</feature>
<feature>
<id>org.apache.stratos.usage.feature.group</id>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8cb615e/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml b/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
index 56240f1..628760c 100644
--- a/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.tenant.register.stub/pom.xml
@@ -71,7 +71,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.tenant.register.stub.*; version="${carbon.platform.package.export.version}",
+ org.apache.stratos.tenant.register.stub.*; version="${apache.stratos.version}",
</Export-Package>
<Import-Package>
!org.apache.stratos.tenant.register.stub.*,