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/25 08:11:39 UTC

git commit: Refactor org.apache.stratos.common version in pom files

Updated Branches:
  refs/heads/master ae7f40378 -> 72e70a273


Refactor org.apache.stratos.common version in pom files

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/72e70a27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/72e70a27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/72e70a27

Branch: refs/heads/master
Commit: 72e70a2735367f2beb6767750e923142a6e45f2b
Parents: ae7f403
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Thu Jul 25 10:56:14 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Thu Jul 25 11:41:00 2013 +0530

----------------------------------------------------------------------
 components/org.apache.stratos.theme.mgt/pom.xml                | 6 +++---
 .../theme/mgt/internal/TenantThemeMgtServiceComponent.java     | 2 +-
 .../apache/stratos/theme/mgt/util/ThemeLoadingListener.java    | 6 +++---
 .../main/java/org/apache/stratos/theme/mgt/util/ThemeUtil.java | 4 ++--
 products/stratos_controller/modules/cloud-service-mgt/pom.xml  | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/72e70a27/components/org.apache.stratos.theme.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.theme.mgt/pom.xml b/components/org.apache.stratos.theme.mgt/pom.xml
index 7c2e8d7..8059e64 100644
--- a/components/org.apache.stratos.theme.mgt/pom.xml
+++ b/components/org.apache.stratos.theme.mgt/pom.xml
@@ -100,9 +100,9 @@
             <version>4.1.0</version>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.common</artifactId>
-            <version>2.1.2</version>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.common</artifactId>
+	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/72e70a27/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/internal/TenantThemeMgtServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/internal/TenantThemeMgtServiceComponent.java b/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/internal/TenantThemeMgtServiceComponent.java
index 9e8c2bd..6603a6f 100644
--- a/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/internal/TenantThemeMgtServiceComponent.java
+++ b/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/internal/TenantThemeMgtServiceComponent.java
@@ -19,7 +19,7 @@
 
 package org.apache.stratos.theme.mgt.internal;
 
-import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
+import org.apache.stratos.common.listeners.TenantMgtListener;
 import org.apache.stratos.theme.mgt.util.ThemeLoadingListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/72e70a27/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java b/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java
index 32dcad1..c3bcd2f 100644
--- a/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java
+++ b/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeLoadingListener.java
@@ -20,9 +20,9 @@
 package org.apache.stratos.theme.mgt.util;
 
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
-import org.wso2.carbon.stratos.common.exception.StratosException;
-import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
+import org.apache.stratos.common.beans.TenantInfoBean;
+import org.apache.stratos.common.exception.StratosException;
+import org.apache.stratos.common.listeners.TenantMgtListener;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/72e70a27/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeUtil.java b/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeUtil.java
index 09c5e79..6c78474 100644
--- a/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeUtil.java
+++ b/components/org.apache.stratos.theme.mgt/src/main/java/org/apache/stratos/theme/mgt/util/ThemeUtil.java
@@ -29,8 +29,8 @@ import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.registry.core.session.UserRegistry;
 import org.wso2.carbon.registry.core.utils.RegistryUtils;
-import org.wso2.carbon.stratos.common.constants.StratosConstants;
-import org.wso2.carbon.stratos.common.util.CommonUtil;
+import org.apache.stratos.common.constants.StratosConstants;
+import org.apache.stratos.common.util.CommonUtil;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.ServerConstants;
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/72e70a27/products/stratos_controller/modules/cloud-service-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/cloud-service-mgt/pom.xml b/products/stratos_controller/modules/cloud-service-mgt/pom.xml
index 58fa774..895a37b 100644
--- a/products/stratos_controller/modules/cloud-service-mgt/pom.xml
+++ b/products/stratos_controller/modules/cloud-service-mgt/pom.xml
@@ -83,9 +83,9 @@
             <version>${wso2carbon.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.common</artifactId>
-            <version>${stratos.component.version}</version>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.common</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>