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/16 13:44:11 UTC

[2/3] git commit: fixed some pom versioning issues

fixed some pom versioning issues


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c0fc375b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c0fc375b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c0fc375b

Branch: refs/heads/master
Commit: c0fc375b20ba0ecb3000ce5ac38d26992e31b100
Parents: 55cdc54
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Tue Jul 16 17:08:13 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Tue Jul 16 17:08:13 2013 +0530

----------------------------------------------------------------------
 components/org.apache.stratos.theme.mgt.ui/pom.xml           | 2 +-
 components/pom.xml                                           | 2 +-
 .../org.apache.stratos.cloud.controller.feature/pom.xml      | 2 +-
 service-stubs/org.apache.stratos.theme.mgt.stub/pom.xml      | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c0fc375b/components/org.apache.stratos.theme.mgt.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.theme.mgt.ui/pom.xml b/components/org.apache.stratos.theme.mgt.ui/pom.xml
index 99fa478..1ff0bc7 100644
--- a/components/org.apache.stratos.theme.mgt.ui/pom.xml
+++ b/components/org.apache.stratos.theme.mgt.ui/pom.xml
@@ -80,7 +80,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
+            <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.theme.mgt.stub</artifactId>
             <version>3.0.0-SNAPSHOT</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c0fc375b/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index aea97a4..f8efa48 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -99,8 +99,8 @@
 		<module>org.apache.stratos.activation</module>
 		<module>org.apache.stratos.cartridge.mgt.ui</module>
 		<!-- Theme mgt -->
-		<module>org.apache.stratos.theme.mgt</module>
 		<module>org.apache.stratos.theme.mgt.ui</module>
+		<module>org.apache.stratos.theme.mgt</module>
 	    </modules>
 	    
 	    <build>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c0fc375b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index af4ac2d..e7fb6ee 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -158,7 +158,7 @@
          <dependency>
            <groupId>org.apache.stratos</groupId>
            <artifactId>org.apache.stratos.cartridge.messages</artifactId>
-           <version>2.1.1</version>
+           <version>${apache.stratos.version}</version>
          </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c0fc375b/service-stubs/org.apache.stratos.theme.mgt.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.theme.mgt.stub/pom.xml b/service-stubs/org.apache.stratos.theme.mgt.stub/pom.xml
index fa38f2e..d82e430 100644
--- a/service-stubs/org.apache.stratos.theme.mgt.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.theme.mgt.stub/pom.xml
@@ -60,8 +60,8 @@
                             <tasks>
                                 <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <arg line="-uri src/main/resources/ThemeMgtService.wsdl -u -uw -o target/generated-code
-                                    -p org.wso2.carbon.theme.mgt.stub
-                                    -ns2p http://services.mgt.theme.carbon.wso2.org=org.wso2.carbon.theme.mgt.stub.services,http://utils.services.resource.registry.carbon.wso2.org/xsd=org.wso2.carbon.theme.mgt.stub.registry.resource.stub.services.utils.xsd,http://common.registry.carbon.wso2.org/xsd=org.wso2.carbon.theme.mgt.stub.registry.resource.stub.common.xsd,http://beans.resource.registry.carbon.wso2.org/xsd=org.wso2.carbon.theme.mgt.stub.registry.resource.stub.beans.xsd,http://services.resource.registry.carbon.wso2.org=org.wso2.carbon.theme.mgt.stub.registry.resource.stub.services"/>
+                                    -p org.apache.stratos.theme.mgt.stub
+                                    -ns2p http://services.mgt.theme.carbon.wso2.org=org.apache.stratos.theme.mgt.stub.services,http://utils.services.resource.registry.carbon.wso2.org/xsd=org.apache.stratos.theme.mgt.stub.registry.resource.stub.services.utils.xsd,http://common.registry.carbon.wso2.org/xsd=org.apache.stratos.theme.mgt.stub.registry.resource.stub.common.xsd,http://beans.resource.registry.carbon.wso2.org/xsd=org.apache.stratos.theme.mgt.stub.registry.resource.stub.beans.xsd,http://services.resource.registry.carbon.wso2.org=org.apache.stratos.theme.mgt.stub.registry.resource.stub.services"/>
                                     <classpath refid="maven.dependency.classpath"/>
                                     <classpath refid="maven.compile.classpath"/>
                                     <classpath refid="maven.runtime.classpath"/>
@@ -101,10 +101,10 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.wso2.carbon.theme.mgt.stub.*; version="${carbon.platform.package.export.version}",
+                            org.apache.stratos.theme.mgt.stub.*; version="${carbon.platform.package.export.version}",
                         </Export-Package>
                         <Import-Package>
-                            !org.wso2.carbon.theme.mgt.stub.*;
+                            !org.apache.stratos.theme.mgt.stub.*;
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>