Updated Branches: refs/heads/carbon-4.2.0-upgrade a3ce7d16e -> cd87dbcc0
Fixing wrong import packages Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/37c56e72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/37c56e72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/37c56e72 Branch: refs/heads/carbon-4.2.0-upgrade Commit: 37c56e722f0b466cfc716770656a18f439b8366b Parents: a3ce7d1 Author: Sajith Kariyawasam <[email protected]> Authored: Sat Jan 4 22:21:09 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Sat Jan 4 22:21:09 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/adc/mgt/retriever/DataRetrievalManager.java | 4 ++-- .../stratos/cloud/controller/util/CloudControllerUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c56e72/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java index 27022c5..7faab1f 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java @@ -26,8 +26,8 @@ import org.apache.stratos.adc.mgt.lookup.LookupDataHolder; import org.apache.stratos.adc.mgt.lookup.SubscriptionAliasToCartridgeSubscriptionMap; import org.apache.stratos.adc.mgt.persistence.PersistenceManager; import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription; -import org.jgroups.logging.Log; -import org.jgroups.logging.LogFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.ArrayList; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c56e72/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java index dc708da..80b07f6 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java @@ -35,7 +35,7 @@ import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; import org.apache.stratos.messaging.domain.topology.Topology; import org.wso2.carbon.registry.core.exceptions.RegistryException; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; import java.util.ArrayList; import java.util.Iterator;
