You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/25 04:41:36 UTC
git commit: Fixed osgi package export issue in load balancer common
Updated Branches:
refs/heads/master 3894880e6 -> fa7d6e3a4
Fixed osgi package export issue in load balancer common
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fa7d6e3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fa7d6e3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fa7d6e3a
Branch: refs/heads/master
Commit: fa7d6e3a4302143457cedb24da8b2609035b9549
Parents: 3894880
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 25 09:11:15 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 25 09:11:15 2013 +0530
----------------------------------------------------------------------
components/org.apache.stratos.common/pom.xml | 1 +
.../common/internal/CloudCommonServiceComponent.java | 10 +++++-----
.../org.apache.stratos.load.balancer.common/pom.xml | 1 +
.../pom.xml | 1 +
4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa7d6e3a/components/org.apache.stratos.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/pom.xml b/components/org.apache.stratos.common/pom.xml
index 724989b..067489f 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/pom.xml
@@ -48,6 +48,7 @@
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
org.apache.stratos.common.*,
+ org.apache.stratos.common.statistics.publisher.*,
</Export-Package>
<Import-Package>
org.wso2.carbon.registry.core.*;version=1.0.1,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa7d6e3a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java
index e43c9a6..e895106 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java
@@ -65,14 +65,14 @@ public class CloudCommonServiceComponent {
CommonUtil.setEula(eula);
}
- packageInfos = new PackageInfoHolder();
- context.getBundleContext().registerService(
- PackageInfoHolder.class.getName(), packageInfos, null);
+ //packageInfos = new PackageInfoHolder();
+ //context.getBundleContext().registerService(
+ // PackageInfoHolder.class.getName(), packageInfos, null);
//Register manager configuration OSGI service
try {
- StratosConfiguration stratosConfiguration = CommonUtil.loadStratosConfiguration();
- bundleContext.registerService(StratosConfiguration.class.getName(), stratosConfiguration, null);
+ //StratosConfiguration stratosConfiguration = CommonUtil.loadStratosConfiguration();
+ //bundleContext.registerService(StratosConfiguration.class.getName(), stratosConfiguration, null);
if (log.isDebugEnabled()) {
log.debug("******* Cloud Common Service bundle is activated ******* ");
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa7d6e3a/components/org.apache.stratos.load.balancer.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/pom.xml b/components/org.apache.stratos.load.balancer.common/pom.xml
index e3bc211..c298321 100644
--- a/components/org.apache.stratos.load.balancer.common/pom.xml
+++ b/components/org.apache.stratos.load.balancer.common/pom.xml
@@ -99,6 +99,7 @@
<Import-Package>
!org.apache.commons.logging,
org.apache.commons.logging; version=0.0.0,
+ org.apache.stratos.common,
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fa7d6e3a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
index 52d78c7..fd57388 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
@@ -69,6 +69,7 @@
<bundles>
<!--bundleDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent.stub</bundleDef>
-->
+ <bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef>
<bundleDef>org.apache.stratos:org.apache.stratos.load.balancer.common:${project.version}</bundleDef>
<bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
<bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>