From f7fbd7b55726719688728abeed833464a9436b3d Mon Sep 17 00:00:00 2001
From: Udara Liyanage <udara@wso2.com>
Date: Wed, 24 Jul 2013 18:05:17 +0530
Subject: [PATCH] Stratos cloud controller product

---
 components/org.apache.stratos.activation/pom.xml                 |    2 +-
 .../src/main/resources/META-INF/module.xml                       |    6 +++---
 .../src/main/resources/META-INF/services.xml                     |    2 +-
 products/cloud_controller/modules/distribution/pom.xml           |    2 +-
 products/cloud_controller/pom.xml                                |    1 -
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/org.apache.stratos.activation/pom.xml b/components/org.apache.stratos.activation/pom.xml
index b3a5cbe..6b51ede 100644
--- a/components/org.apache.stratos.activation/pom.xml
+++ b/components/org.apache.stratos.activation/pom.xml
@@ -49,7 +49,7 @@
                         <Axis2Module>${project.artifactId}-${project.version}</Axis2Module>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.apache.stratos.activation.activation.*,
+                            org.apache.stratos.activation.*,
                         </Export-Package>
                         <Import-Package>
                             org.apache.stratos.common.*,
diff --git a/components/org.apache.stratos.activation/src/main/resources/META-INF/module.xml b/components/org.apache.stratos.activation/src/main/resources/META-INF/module.xml
index c9184e1..1558e64 100644
--- a/components/org.apache.stratos.activation/src/main/resources/META-INF/module.xml
+++ b/components/org.apache.stratos.activation/src/main/resources/META-INF/module.xml
@@ -16,17 +16,17 @@
   #  specific language governing permissions and limitations
   #  under the License.
   -->
-<module name="activation" class="org.apache.stratos.activation.activation.module.ActivationModule">
+<module name="activation" class="org.apache.stratos.activation.module.ActivationModule">
    <InFlow>
         <handler name="InFlowActivationHandler"
-                 class="org.apache.stratos.activation.activation.module.ActivationHandler">
+                 class="org.apache.stratos.activation.module.ActivationHandler">
         <order phase="Validation" phaseFirst="true"/>
         </handler>
    </InFlow>
 
    <InFaultFlow>
         <handler name="FaultInFlowActivationHandler"
-                 class="org.apache.stratos.activation.activation.module.ActivationHandler">
+                 class="org.apache.stratos.activation.module.ActivationHandler">
         <order phase="Validation" phaseFirst="true"/>
         </handler>
    </InFaultFlow>
diff --git a/components/org.apache.stratos.lb.common/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.lb.common/src/main/resources/META-INF/services.xml
index 6d1f398..71f297a 100644
--- a/components/org.apache.stratos.lb.common/src/main/resources/META-INF/services.xml
+++ b/components/org.apache.stratos.lb.common/src/main/resources/META-INF/services.xml
@@ -1,6 +1,6 @@
 <serviceGroup>
     <service name="LoadBalancerConfigurationService" scope="application">
-        <parameter name="ServiceClass">org.wso2.stratos.lb.common.service.impl.LoadBalancerConfigurationServiceImpll</parameter>
+        <parameter name="ServiceClass">org.apache.stratos.lb.common.service.impl.LoadBalancerConfigurationServiceImpl</parameter>
         <messageReceivers>
         <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only" class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
         <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out" class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
diff --git a/products/cloud_controller/modules/distribution/pom.xml b/products/cloud_controller/modules/distribution/pom.xml
index 2183af3..da19d9a 100644
--- a/products/cloud_controller/modules/distribution/pom.xml
+++ b/products/cloud_controller/modules/distribution/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.stratos.cc</groupId>
         <artifactId>cc-parent</artifactId>
-        <version>1.0.1</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/products/cloud_controller/pom.xml b/products/cloud_controller/pom.xml
index 0455b28..26fff8d 100644
--- a/products/cloud_controller/pom.xml
+++ b/products/cloud_controller/pom.xml
@@ -32,7 +32,6 @@
     <groupId>org.apache.stratos.cc</groupId>
     <artifactId>cc-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1</version>
     <name>Apache Stratos - Cloud Controller</name>
     <url>http://wso2.org/projects/mb/java</url>
     <description>Apache Stratos Cloud Controller</description>
-- 
1.7.10.4