From 4c8486c38c33364f937c28ccf1dd6098e78381a8 Mon Sep 17 00:00:00 2001
From: Udara Liyanage <udara@wso2.com>
Date: Tue, 23 Jul 2013 17:22:34 +0530
Subject: [PATCH] Cloud controller p2 gen refac

---
 components/org.apache.stratos.deployment/pom.xml   |    3 ++
 .../pom.xml                                        |    4 +-
 .../org.apache.stratos.common.feature/pom.xml      |    5 +--
 .../pom.xml                                        |    2 +-
 .../resources/p2.inf                               |   16 ++++----
 .../src/main/resources/p2.inf                      |   16 ++++----
 .../pom.xml                                        |    2 +-
 .../cloud_controller/modules/p2-profile/pom.xml    |   42 ++++++++++----------
 8 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/components/org.apache.stratos.deployment/pom.xml b/components/org.apache.stratos.deployment/pom.xml
index 7a7399d..e3dd2a3 100644
--- a/components/org.apache.stratos.deployment/pom.xml
+++ b/components/org.apache.stratos.deployment/pom.xml
@@ -100,5 +100,8 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
     </dependencies>
+    <properties>
+	<axis2.osgi.version.range>1.6.1.wso2v8</axis2.osgi.version.range>
+    </properties>
 </project>
 
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 d09ce75..5e358c5 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
@@ -204,7 +204,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.stratos.cloud.controller</id>
+                            <id>org.apache.stratos.cloud.controller</id>
                             <propertiesFile>../../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>
@@ -257,7 +257,7 @@
                             </importBundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.lb.common:4.1.3</importFeatureDef>
+                                <importFeatureDef>org.apache.stratos.lb.common:${apache.stratos.version}</importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.ntask.core:${wso2carbon.version}</importFeatureDef> 
                             </importFeatures>
                         </configuration>
diff --git a/features/manager/common/org.apache.stratos.common.feature/pom.xml b/features/manager/common/org.apache.stratos.common.feature/pom.xml
index 40d670b..8031a40 100644
--- a/features/manager/common/org.apache.stratos.common.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.feature/pom.xml
@@ -67,7 +67,7 @@
                             <propertiesFile>../../../../etc/feature.properties</propertiesFile>
                             <includedFeatures>
                                 <includedFeatureDef>org.apache.stratos:org.apache.stratos.common.server.feature</includedFeatureDef>
-				<includedFeatureDef>org.apache.stratos:org.apache.stratos.common.ui.feature:${apache.stratos.version}</includedFeatureDef>
+				<includedFeatureDef>org.apache.stratos:org.apache.stratos.common.ui.feature</includedFeatureDef>
                             </includedFeatures>
                         </configuration>
                     </execution>
@@ -75,7 +75,4 @@
             </plugin>
         </plugins>
     </build>
-    <properties>
-        <apache.stratos.version>3.0.0-SNAPSHOT</apache.stratos.version>
-    </properties>
 </project>
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
index 3a51c14..bc1036e 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
@@ -202,7 +202,7 @@
                             <bundles>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.common:${apache.stratos.version}</bundleDef>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.activation:2.1.2</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.activation:${apache.stratos.version}</bundleDef>
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.sample.installer:${stratos.version}</bundleDef>-->
                                 <bundleDef>org.apache.stratos:org.apache.stratos.tenant.dispatcher</bundleDef>
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent</bundleDef>-->
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf b/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf
index d87e754..d6a9f2e 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf
+++ b/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf
@@ -1,10 +1,10 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/multitenancy/cloud-services-desc.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/stratos.xml,target:${installFolder}/../conf/multitenancy/stratos.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/identity.xml,target:${installFolder}/../conf/identity.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/eula.xml,target:${installFolder}/../conf/multitenancy/eula.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf);
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/multitenancy/cloud-services-desc.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/stratos.xml,target:${installFolder}/../conf/multitenancy/stratos.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/identity.xml,target:${installFolder}/../conf/identity.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/eula.xml,target:${installFolder}/../conf/multitenancy/eula.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf);
 
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
index d87e754..d6a9f2e 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
+++ b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
@@ -1,10 +1,10 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/multitenancy/cloud-services-desc.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/stratos.xml,target:${installFolder}/../conf/multitenancy/stratos.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/identity.xml,target:${installFolder}/../conf/identity.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf/eula.xml,target:${installFolder}/../conf/multitenancy/eula.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/features/org.wso2.carbon.stratos.common.server_${feature.version}/conf);
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/multitenancy/cloud-services-desc.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/stratos.xml,target:${installFolder}/../conf/multitenancy/stratos.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/identity.xml,target:${installFolder}/../conf/identity.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/eula.xml,target:${installFolder}/../conf/multitenancy/eula.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf);
 
diff --git a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
index 4657f69..621993a 100644
--- a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
+++ b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
@@ -57,7 +57,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.stratos.throttling.agent</id>
+                            <id>org.apache.stratos.throttling.agent</id>
                             <propertiesFile>../../../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>
diff --git a/products/cloud_controller/modules/p2-profile/pom.xml b/products/cloud_controller/modules/p2-profile/pom.xml
index 227dd51..7ab0445 100644
--- a/products/cloud_controller/modules/p2-profile/pom.xml
+++ b/products/cloud_controller/modules/p2-profile/pom.xml
@@ -157,19 +157,19 @@
                                 
                                 <!-- Features related to Cloud -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.stratos.common.feature:${stratos.component.patch.version.2.1.1}
+                                    org.apache.stratos:org.apache.stratos.common.feature:3.0.0-SNAPSHOT
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.stratos.usage.agent.feature:${stratos.component.version}
+                                    org.apache.stratos:org.apache.stratos.usage.agent.feature:${apache.stratos.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.stratos.throttling.agent.feature:${stratos.component.version}
+                                    org.apache.stratos:org.apache.stratos.throttling.agent.feature:${apache.stratos.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.stratos.deployment.feature:${stratos.component.version}
+                                    org.apache.stratos:org.apache.stratos.deployment.feature:${apache.stratos.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.load.balance.agent.server.feature:${stratos.component.version}
+                                    org.apache.stratos:org.apache.stratos.load.balance.agent.server.feature:${apache.stratos.version}
                                 </featureArtifactDef>
 				 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.version}
@@ -192,7 +192,7 @@
                                     org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version}
                                 </featureArtifactDef>
 				<featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.stratos.cloud.controller.feature:${stratos.component.patch.version.2.1.3}
+                                    org.apache.stratos:org.apache.stratos.cloud.controller.feature:${apache.stratos.version}
                                 </featureArtifactDef>
                                 
                                 <featureArtifactDef>
@@ -216,7 +216,7 @@
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.lb.common.feature:${carbon.patch.version.4.1.3}
+                                    org.apache.stratos:org.apache.stratos.lb.common.feature:${apache.stratos.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
@@ -353,16 +353,16 @@
                                     <version>${carbon.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.lb.common.feature.group</id>
-                                    <version>${carbon.patch.version.4.1.3}</version>
+                                    <id>org.apache.stratos.lb.common.feature.group</id>
+                                    <version>${apache.stratos.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ntask.core.feature.group</id>
                                     <version>${carbon.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.stratos.cloud.controller.feature.group</id>
-                                    <version>${stratos.component.patch.version.2.1.3}</version>
+                                    <id>org.apache.stratos.cloud.controller.feature.group</id>
+                                    <version>${apache.stratos.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
@@ -540,27 +540,27 @@
                                 </feature-->
                                 <!--Cloud service deployment feature -->
                                 <feature>
-                                    <id>org.wso2.carbon.stratos.deployment.feature.group</id>
-                                    <version>${stratos.component.version}</version>
+                                    <id>org.apache.stratos.deployment.feature.group</id>
+                                    <version>${apache.stratos.version}</version>
                                 </feature>
 
                                 <!-- multitenancy feature groups -->
                                 <feature>
-                                    <id>org.wso2.carbon.stratos.common.feature.group</id>
-                                    <version>${stratos.component.patch.version.2.1.1}</version>
+                                    <id>org.apache.stratos.common.feature.group</id>
+                                    <version>3.0.0-SNAPSHOT</version>
                                 </feature>
 
                                 <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.wso2.carbon.stratos.usage.agent.feature.group</id>
-                                    <version>${stratos.component.version}</version>
+                                    <id>org.apache.stratos.usage.agent.feature.group</id>
+                                    <version>${apache.stratos.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.stratos.throttling.agent.feature.group</id>
-                                    <version>${stratos.component.version}</version>
+                                    <id>org.apache.stratos.throttling.agent.feature.group</id>
+                                    <version>${apache.stratos.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.cassandra.server.feature.group</id>
-- 
1.7.10.4