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:10 UTC

[1/3] git commit: fixed user agent pom versioning issues

Updated Branches:
  refs/heads/master a2487af77 -> e893631c9


fixed user agent 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/55cdc545
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/55cdc545
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/55cdc545

Branch: refs/heads/master
Commit: 55cdc545c133118508e6359f804dafb9234c6114
Parents: a2487af
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Tue Jul 16 16:11:27 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Tue Jul 16 16:11:27 2013 +0530

----------------------------------------------------------------------
 components/org.apache.stratos.usage.agent/pom.xml |  4 ++--
 components/org.apache.stratos.usage/pom.xml       | 10 +++++-----
 components/pom.xml                                |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/55cdc545/components/org.apache.stratos.usage.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage.agent/pom.xml b/components/org.apache.stratos.usage.agent/pom.xml
index 92a9174..d5c5652 100644
--- a/components/org.apache.stratos.usage.agent/pom.xml
+++ b/components/org.apache.stratos.usage.agent/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
         <version>3.0.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+<!--	<relativePath>../pom.xml</relativePath>-->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>2.1.2</version>
+            <version>${apache.stratos.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/55cdc545/components/org.apache.stratos.usage/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage/pom.xml b/components/org.apache.stratos.usage/pom.xml
index d546f39..287f93c 100644
--- a/components/org.apache.stratos.usage/pom.xml
+++ b/components/org.apache.stratos.usage/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
         <version>3.0.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+<!--	<relativePath>../pom.xml</relativePath>-->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -126,12 +126,12 @@
         <dependency>
             <groupId>org.apache.stratos</groupId>
             <artifactId>org.apache.stratos.common</artifactId>
-            <version>2.1.2</version>
+            <version>${apache.stratos.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.usage.agent</artifactId>
-	    <version>2.1.2</version>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.usage.agent</artifactId>
+	    <version>${apache.stratos.version}</version>
         </dependency>
          <!--<dependency>
             <groupId>org.wso2.carbon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/55cdc545/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index ecd028e..aea97a4 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -89,8 +89,8 @@
 		<module>org.apache.stratos.status.monitor.agent</module>
 		<module>org.apache.stratos.status.monitor.ui</module>
 		<!-- Usage -->
-		<module>org.apache.stratos.usage</module>		
 		<module>org.apache.stratos.usage.agent</module>
+		<module>org.apache.stratos.usage</module>		
 		<module>org.apache.stratos.usage.summary.helper</module>
 		<module>org.apache.stratos.usage.ui</module>
 


[3/3] git commit: applying 0001-Refactor-manager-load-balance-agent-feature.patch

Posted by la...@apache.org.
applying 0001-Refactor-manager-load-balance-agent-feature.patch


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

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

----------------------------------------------------------------------
 .../dependency-reduced-pom.xml                  | 112 ++++++++++++++++++
 .../pom.xml                                     |   6 +-
 .../clients/common/LoadBalanceAgentClient.java  |   2 +-
 .../pom.xml                                     |  84 ++++++++++++++
 .../pom.xml                                     |  81 +++++++++++++
 .../pom.xml                                     |  79 +++++++++++++
 .../2.1.0/pom.xml                               |  83 --------------
 .../2.1.0/pom.xml                               |  79 -------------
 .../2.1.0/pom.xml                               |  78 -------------
 features/manager/load-balance-agent/pom.xml     |  62 +++++-----
 .../.svn/all-wcprops                            |   5 +
 .../.svn/entries                                |  31 +++++
 .../pom.xml                                     | 114 +++++++++++++++++++
 .../src/.svn/all-wcprops                        |   5 +
 .../src/.svn/entries                            |  31 +++++
 .../src/main/.svn/all-wcprops                   |   5 +
 .../src/main/.svn/entries                       |  34 ++++++
 .../src/main/java/.svn/all-wcprops              |   5 +
 .../src/main/java/.svn/entries                  |  28 +++++
 .../src/main/resources/.svn/all-wcprops         |  11 ++
 .../src/main/resources/.svn/entries             |  62 ++++++++++
 .../LoadBalanceAgentService.wsdl.svn-base       |   5 +
 .../LoadBalanceAgentService.wsdl.svn-base       |  71 ++++++++++++
 .../main/resources/LoadBalanceAgentService.wsdl |  71 ++++++++++++
 service-stubs/pom.xml                           |   1 +
 25 files changed, 871 insertions(+), 274 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/components/org.apache.stratos.autoscaler.service/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler.service/dependency-reduced-pom.xml b/components/org.apache.stratos.autoscaler.service/dependency-reduced-pom.xml
new file mode 100644
index 0000000..3e67132
--- /dev/null
+++ b/components/org.apache.stratos.autoscaler.service/dependency-reduced-pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>stratos-components-parent</artifactId>
+    <groupId>org.apache.stratos</groupId>
+    <version>3.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.stratos</groupId>
+  <artifactId>org.apache.stratos.autoscaler.service</artifactId>
+  <packaging>aar</packaging>
+  <name>Apache Stratos - Autoscaler Service</name>
+  <url>http://apache.org</url>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.7.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <includes>
+                  <include>org.jclouds:*</include>
+                  <include>org.jclouds.*:*</include>
+                </includes>
+              </artifactSet>
+              <filtering>true</filtering>
+              <filters>
+                <filter>
+                  <artifact>org.jclouds*:*</artifact>
+                  <includes>
+                    <include>META-INF/services/org.jclouds.apis.ApiMetadata</include>
+                    <include>META-INF/services/org.jclouds.providers.ProviderMetadata</include>
+                  </includes>
+                </filter>
+              </filters>
+              <transformers>
+                <transformer />
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-aar-maven-plugin</artifactId>
+        <version>1.4</version>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-scr-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.4.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>${project.artifactId}</Bundle-Name>
+            <Export-Package>org.apache.stratos.autoscaler.service</Export-Package>
+            <Private-Package>org.apache.stratos.autoscaler.service.*, !org.apache.stratos.autoscaler.service</Private-Package>
+            <Import-Package>!org.apache.commons.logging,
+                            org.apache.commons.logging; version=0.0.0,
+                            org.wso2.carbon.utils.*,
+                            org.jclouds.compute*;version="${jclouds.version}";resolution:=optional,
+                            org.jclouds*;version="${jclouds.version}",
+                            *; resolution:=optional</Import-Package>
+            <DynamicImport-Package>*</DynamicImport-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.wso2.carbon</groupId>
+      <artifactId>org.wso2.carbon.core</artifactId>
+      <version>4.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wso2.carbon</groupId>
+      <artifactId>org.wso2.carbon.utils</artifactId>
+      <version>4.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.stratos</groupId>
+      <artifactId>org.apache.stratos.lb.common</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wso2.carbon</groupId>
+      <artifactId>org.wso2.carbon.securevault</artifactId>
+      <version>4.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <jclouds.version>1.5.0-beta.5</jclouds.version>
+  </properties>
+</project>
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/components/org.apache.stratos.status.monitor.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.status.monitor.agent/pom.xml b/components/org.apache.stratos.status.monitor.agent/pom.xml
index ce07ec2..aefc54c 100644
--- a/components/org.apache.stratos.status.monitor.agent/pom.xml
+++ b/components/org.apache.stratos.status.monitor.agent/pom.xml
@@ -101,9 +101,9 @@
 
         <!--dependencies to invoke the load average service-->
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.load.balance.agent.stub</artifactId>
-            <version>${wso2carbon.version}</version>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
+            <version>${apache.stratos.version}</version>
         </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/components/org.apache.stratos.status.monitor.agent/src/main/java/org/apache/stratos/status/monitor/agent/clients/common/LoadBalanceAgentClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.status.monitor.agent/src/main/java/org/apache/stratos/status/monitor/agent/clients/common/LoadBalanceAgentClient.java b/components/org.apache.stratos.status.monitor.agent/src/main/java/org/apache/stratos/status/monitor/agent/clients/common/LoadBalanceAgentClient.java
index 6c6b233..a54fd79 100644
--- a/components/org.apache.stratos.status.monitor.agent/src/main/java/org/apache/stratos/status/monitor/agent/clients/common/LoadBalanceAgentClient.java
+++ b/components/org.apache.stratos.status.monitor.agent/src/main/java/org/apache/stratos/status/monitor/agent/clients/common/LoadBalanceAgentClient.java
@@ -22,7 +22,7 @@ import org.apache.axis2.AxisFault;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.load.balance.agent.stub.LoadBalanceAgentServiceStub;
+import org.apache.stratos.load.balance.agent.stub.LoadBalanceAgentServiceStub;
 import org.apache.stratos.status.monitor.agent.internal.core.MySQLConnector;
 
 import java.rmi.RemoteException;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml
new file mode 100644
index 0000000..440e1cc
--- /dev/null
+++ b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.feature/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  #  Licensed to the Apache Software Foundation (ASF) under one
+  #  or more contributor license agreements.  See the NOTICE file
+  #  distributed with this work for additional information
+  #  regarding copyright ownership.  The ASF licenses this file
+  #  to you under the Apache License, Version 2.0 (the
+  #  "License"); you may not use this file except in compliance
+  #  with the License.  You may obtain a copy of the License at
+  #  
+  #  http://www.apache.org/licenses/LICENSE-2.0
+  #  
+  #  Unless required by applicable law or agreed to in writing,
+  #  software distributed under the License is distributed on an
+  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  #  KIND, either express or implied.  See the License for the
+  #  specific language governing permissions and limitations
+  #  under the License.
+  -->        
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.apache.stratos</groupId>
+    	<artifactId>load-balance-agent-feature</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.load.balance.agent.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Load Balance Agent Feature</name>
+    <url>http://apache.org</url>
+    <description>
+        This feature contains the bundles required for Load Balance Agent Functionality
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.load.balance.agent.server.feature</artifactId>
+            <version>${apache.stratos.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.load.balance.agent.ui.feature</artifactId>
+            <version>${apache.stratos.version}</version>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.load.balance.agent</id>
+                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef>
+                            </importFeatures>
+                            <includedFeatures>
+                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.load.balance.agent.ui.feature</includedFeatureDef>
+                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.load.balance.agent.server.feature</includedFeatureDef>
+                            </includedFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
new file mode 100644
index 0000000..28831c2
--- /dev/null
+++ b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.server.feature/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  #  Licensed to the Apache Software Foundation (ASF) under one
+  #  or more contributor license agreements.  See the NOTICE file
+  #  distributed with this work for additional information
+  #  regarding copyright ownership.  The ASF licenses this file
+  #  to you under the Apache License, Version 2.0 (the
+  #  "License"); you may not use this file except in compliance
+  #  with the License.  You may obtain a copy of the License at
+  #  
+  #  http://www.apache.org/licenses/LICENSE-2.0
+  #  
+  #  Unless required by applicable law or agreed to in writing,
+  #  software distributed under the License is distributed on an
+  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  #  KIND, either express or implied.  See the License for the
+  #  specific language governing permissions and limitations
+  #  under the License.
+  -->        
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.apache.stratos</groupId>
+   	<artifactId>load-balance-agent-feature</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.load.balance.agent.server.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos -Load Balance Agent Server Feature</name>
+    <url>http://apache.org</url>
+    <description>
+        This feature contains the bundles required for Load Balance Agent Back End Functionality
+    </description>
+
+    <dependencies>
+        <dependency>              
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.load.balance.agent</artifactId>
+   	    <version>${apache.stratos.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.load.balance.agent.server</id>
+                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>   
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.load.balance.agent</bundleDef>
+                            </bundles>
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml
new file mode 100644
index 0000000..2f577c1
--- /dev/null
+++ b/features/manager/load-balance-agent/org.apache.stratos.load.balance.agent.ui.feature/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  #  Licensed to the Apache Software Foundation (ASF) under one
+  #  or more contributor license agreements.  See the NOTICE file
+  #  distributed with this work for additional information
+  #  regarding copyright ownership.  The ASF licenses this file
+  #  to you under the Apache License, Version 2.0 (the
+  #  "License"); you may not use this file except in compliance
+  #  with the License.  You may obtain a copy of the License at
+  #  
+  #  http://www.apache.org/licenses/LICENSE-2.0
+  #  
+  #  Unless required by applicable law or agreed to in writing,
+  #  software distributed under the License is distributed on an
+  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  #  KIND, either express or implied.  See the License for the
+  #  specific language governing permissions and limitations
+  #  under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.apache.stratos</groupId>
+   	<artifactId>load-balance-agent-feature</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.load.balance.agent.ui.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Load Balance Agent UI Feature</name>
+    <url>http://apache.org</url>
+    <description>
+        This feature contains the bundles required for Load Balance Agent Functionality
+    </description>
+
+    <dependencies>
+        <dependency>              
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
+            <version>${apache.stratos.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.load.balance.agent.ui</id>
+                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>   
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.load.balance.agent.stub</bundleDef>
+                            </bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.feature/2.1.0/pom.xml b/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.feature/2.1.0/pom.xml
deleted file mode 100644
index 5e990e8..0000000
--- a/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2010-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-        
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-    	<artifactId>load-balance-agent-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.load.balance.agent.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Load Balance Agent Feature</name>
-    <url>http://wso2.org</url>
-    <description>
-        This feature contains the bundles required for Load Balance Agent Functionality
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.load.balance.agent.server.feature</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.load.balance.agent.ui.feature</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.load.balance.agent</id>
-                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef>
-                            </importFeatures>
-                            <includedFeatures>
-                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent.ui.feature</includedFeatureDef>
-                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent.server.feature</includedFeatureDef>
-                            </includedFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.server.feature/2.1.0/pom.xml b/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.server.feature/2.1.0/pom.xml
deleted file mode 100644
index 138d4f7..0000000
--- a/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2010-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-        
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-   	<artifactId>load-balance-agent-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.load.balance.agent.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos -Load Balance Agent Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>
-        This feature contains the bundles required for Load Balance Agent Back End Functionality
-    </description>
-
-    <dependencies>
-        <dependency>              
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.load.balance.agent</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.load.balance.agent.server</id>
-                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>   
-                                </properties>
-                            </adviceFile>
-                            <bundles>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.ui.feature/2.1.0/pom.xml b/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index 8c51398..0000000
--- a/features/manager/load-balance-agent/org.wso2.carbon.load.balance.agent.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2010-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-        
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-   	<artifactId>load-balance-agent-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.load.balance.agent.ui.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Load Balance Agent UI Feature</name>
-    <url>http://wso2.org</url>
-    <description>
-        This feature contains the bundles required for Load Balance Agent Functionality
-    </description>
-
-    <dependencies>
-        <dependency>              
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.load.balance.agent.stub</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.load.balance.agent.ui</id>
-                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>   
-                                </properties>
-                            </adviceFile>
-                            <bundles>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent.stub</bundleDef>
-                            </bundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/features/manager/load-balance-agent/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/load-balance-agent/pom.xml b/features/manager/load-balance-agent/pom.xml
index 16cfedb..4b55d45 100644
--- a/features/manager/load-balance-agent/pom.xml
+++ b/features/manager/load-balance-agent/pom.xml
@@ -1,53 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2010-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
+<!-- 
+  #  Licensed to the Apache Software Foundation (ASF) under one
+  #  or more contributor license agreements.  See the NOTICE file
+  #  distributed with this work for additional information
+  #  regarding copyright ownership.  The ASF licenses this file
+  #  to you under the Apache License, Version 2.0 (the
+  #  "License"); you may not use this file except in compliance
+  #  with the License.  You may obtain a copy of the License at
+  #  
+  #  http://www.apache.org/licenses/LICENSE-2.0
+  #  
+  #  Unless required by applicable law or agreed to in writing,
+  #  software distributed under the License is distributed on an
+  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  #  KIND, either express or implied.  See the License for the
+  #  specific language governing permissions and limitations
+  #  under the License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>stratos-features</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.apache.stratos</groupId>
+        <artifactId>stratos-manager-features</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>load-balance-agent-feature</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Load Balance Agent Feature</name>
-    <url>http://wso2.org</url>
+    <name>Apache Stratos - Load Balance Agent Feature</name>
+    <url>http://apache.org</url>
 
     <modules>
-        <module>org.wso2.carbon.load.balance.agent.feature/2.1.0</module>
-        <module>org.wso2.carbon.load.balance.agent.server.feature/2.1.0</module>
-        <module>org.wso2.carbon.load.balance.agent.ui.feature/2.1.0</module>
+        <module>org.apache.stratos.load.balance.agent.feature</module>
+        <module>org.apache.stratos.load.balance.agent.server.feature</module>
+        <module>org.apache.stratos.load.balance.agent.ui.feature</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.load.balance.agent</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.load.balance.agent</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.load.balance.agent.stub</artifactId>
-                <version>${wso2carbon.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/.svn/all-wcprops
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/.svn/all-wcprops b/service-stubs/org.apache.stratos.load.balance.agent.stub/.svn/all-wcprops
new file mode 100644
index 0000000..c3144b0
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/.svn/all-wcprops
@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 112
+/repos/wso2/!svn/ver/166308/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub
+END

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/.svn/entries
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/.svn/entries b/service-stubs/org.apache.stratos.load.balance.agent.stub/.svn/entries
new file mode 100644
index 0000000..9622665
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/.svn/entries
@@ -0,0 +1,31 @@
+10
+
+dir
+177541
+https://svn.wso2.org/repos/wso2/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub
+https://svn.wso2.org/repos/wso2
+
+
+
+2013-02-27T22:52:18.566515Z
+165862
+supunm@wso2.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+a5903396-d722-0410-b921-86c7d4935375
+
+4.1.0
+dir
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml b/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml
new file mode 100644
index 0000000..bf68422
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  #  Licensed to the Apache Software Foundation (ASF) under one
+  #  or more contributor license agreements.  See the NOTICE file
+  #  distributed with this work for additional information
+  #  regarding copyright ownership.  The ASF licenses this file
+  #  to you under the Apache License, Version 2.0 (the
+  #  "License"); you may not use this file except in compliance
+  #  with the License.  You may obtain a copy of the License at
+  #  
+  #  http://www.apache.org/licenses/LICENSE-2.0
+  #  
+  #  Unless required by applicable law or agreed to in writing,
+  #  software distributed under the License is distributed on an
+  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  #  KIND, either express or implied.  See the License for the
+  #  specific language governing permissions and limitations
+  #  under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.apache.stratos</groupId>
+        <artifactId>stratos-service-stubs-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache Stratos - Load Balance Agent Stub</name>
+    <url>http://apache.org</url>
+
+    <build>
+        <plugins>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>source-code-generation</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+                                    <arg line="-uri src/main/resources/LoadBalanceAgentService.wsdl -u -uw -o target/generated-code                                     -p org.apache.stratos.load.balance.agent.stub                                     -ns2p http://services.agent.balance.load.stratos.apache.org=org.apache.stratos.load.balance.agent.stub.services,http://beans.agent.balance.load.stratos.apache.org/xsd=org.apache.stratos.load.balance.agent.stub.beans.xsd,"/>
+                                    <classpath refid="maven.dependency.classpath"/>
+                                    <classpath refid="maven.compile.classpath"/>
+                                    <classpath refid="maven.runtime.classpath"/>
+                                </java>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>
+                                    target/generated-code/src
+                                </source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Export-Package>
+                            org.apache.stratos.load.balance.agent.stub.*; version="${apache.stratos.version}",
+                            org.apache.stratos.load.balance.agent.*; version="${apache.stratos.version}",
+                        </Export-Package>
+                        <Import-Package>
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.axis2.wso2</groupId>
+            <artifactId>axis2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2.wso2</groupId>
+            <artifactId>axis2-client</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/.svn/all-wcprops
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/.svn/all-wcprops b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/.svn/all-wcprops
new file mode 100644
index 0000000..13ec3cb
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/.svn/all-wcprops
@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 122
+/repos/wso2/!svn/ver/166308/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src
+END

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/.svn/entries
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/.svn/entries b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/.svn/entries
new file mode 100644
index 0000000..5803b27
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/.svn/entries
@@ -0,0 +1,31 @@
+10
+
+dir
+177541
+https://svn.wso2.org/repos/wso2/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src
+https://svn.wso2.org/repos/wso2
+
+
+
+2012-07-18T07:52:12.454797Z
+133354
+chethiya
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+a5903396-d722-0410-b921-86c7d4935375
+
+main
+dir
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/.svn/all-wcprops
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/.svn/all-wcprops b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/.svn/all-wcprops
new file mode 100644
index 0000000..470aab2
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/.svn/all-wcprops
@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 127
+/repos/wso2/!svn/ver/166308/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src/main
+END

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/.svn/entries
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/.svn/entries b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/.svn/entries
new file mode 100644
index 0000000..f76bfe7
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/.svn/entries
@@ -0,0 +1,34 @@
+10
+
+dir
+177541
+https://svn.wso2.org/repos/wso2/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src/main
+https://svn.wso2.org/repos/wso2
+
+
+
+2011-05-04T08:04:10.716470Z
+93296
+pradeeban
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+a5903396-d722-0410-b921-86c7d4935375
+
+resources
+dir
+
+java
+dir
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/java/.svn/all-wcprops
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/java/.svn/all-wcprops b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/java/.svn/all-wcprops
new file mode 100644
index 0000000..fc5ed53
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/java/.svn/all-wcprops
@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 132
+/repos/wso2/!svn/ver/166308/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src/main/java
+END

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/java/.svn/entries
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/java/.svn/entries b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/java/.svn/entries
new file mode 100644
index 0000000..2aad16e
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/java/.svn/entries
@@ -0,0 +1,28 @@
+10
+
+dir
+177541
+https://svn.wso2.org/repos/wso2/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src/main/java
+https://svn.wso2.org/repos/wso2
+
+
+
+2011-05-04T08:04:10.716470Z
+93296
+pradeeban
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+a5903396-d722-0410-b921-86c7d4935375
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/all-wcprops
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/all-wcprops b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/all-wcprops
new file mode 100644
index 0000000..0820961
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 137
+/repos/wso2/!svn/ver/166308/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src/main/resources
+END
+LoadBalanceAgentService.wsdl
+K 25
+svn:wc:ra_dav:version-url
+V 166
+/repos/wso2/!svn/ver/166308/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src/main/resources/LoadBalanceAgentService.wsdl
+END

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/entries
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/entries b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/entries
new file mode 100644
index 0000000..30b0409
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+177541
+https://svn.wso2.org/repos/wso2/carbon/platform/branches/4.1.0/service-stubs/org.wso2.carbon.load.balance.agent.stub/4.1.0/src/main/resources
+https://svn.wso2.org/repos/wso2
+
+
+
+2011-05-04T08:04:10.716470Z
+93296
+pradeeban
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+a5903396-d722-0410-b921-86c7d4935375
+
+LoadBalanceAgentService.wsdl
+file
+
+
+
+
+2013-06-05T04:05:58.497220Z
+667e91756177f8790aebc6ec2a007718
+2011-05-04T08:04:10.716470Z
+93296
+pradeeban
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4087
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/prop-base/LoadBalanceAgentService.wsdl.svn-base
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/prop-base/LoadBalanceAgentService.wsdl.svn-base b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/prop-base/LoadBalanceAgentService.wsdl.svn-base
new file mode 100644
index 0000000..bdbd305
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/prop-base/LoadBalanceAgentService.wsdl.svn-base
@@ -0,0 +1,5 @@
+K 13
+svn:eol-style
+V 6
+native
+END

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/text-base/LoadBalanceAgentService.wsdl.svn-base
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/text-base/LoadBalanceAgentService.wsdl.svn-base b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/text-base/LoadBalanceAgentService.wsdl.svn-base
new file mode 100644
index 0000000..f6f0a1d
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/.svn/text-base/LoadBalanceAgentService.wsdl.svn-base
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://agent.balance.load.carbon.wso2.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://agent.balance.load.carbon.wso2.org">
+    <wsdl:types>
+        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://agent.balance.load.carbon.wso2.org">
+            <xs:element name="getLoadAverageResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:double"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="getLoadAverageRequest"/>
+    <wsdl:message name="getLoadAverageResponse">
+        <wsdl:part name="parameters" element="ns:getLoadAverageResponse"/>
+    </wsdl:message>
+    <wsdl:portType name="LoadBalanceAgentServicePortType">
+        <wsdl:operation name="getLoadAverage">
+            <wsdl:input message="ns:getLoadAverageRequest" wsaw:Action="urn:getLoadAverage"/>
+            <wsdl:output message="ns:getLoadAverageResponse" wsaw:Action="urn:getLoadAverageResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="LoadBalanceAgentServiceSoap11Binding" type="ns:LoadBalanceAgentServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <wsdl:operation name="getLoadAverage">
+            <soap:operation soapAction="urn:getLoadAverage" style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:binding name="LoadBalanceAgentServiceSoap12Binding" type="ns:LoadBalanceAgentServicePortType">
+        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <wsdl:operation name="getLoadAverage">
+            <soap12:operation soapAction="urn:getLoadAverage" style="document"/>
+            <wsdl:input>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:binding name="LoadBalanceAgentServiceHttpBinding" type="ns:LoadBalanceAgentServicePortType">
+        <http:binding verb="POST"/>
+        <wsdl:operation name="getLoadAverage">
+            <http:operation location="LoadBalanceAgentService/getLoadAverage"/>
+            <wsdl:input>
+                <mime:content type="text/xml" part="getLoadAverage"/>
+            </wsdl:input>
+            <wsdl:output>
+                <mime:content type="text/xml" part="getLoadAverage"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="LoadBalanceAgentService">
+        <wsdl:port name="LoadBalanceAgentServiceHttpSoap11Endpoint" binding="ns:LoadBalanceAgentServiceSoap11Binding">
+            <soap:address location="https://192.168.1.100:9443/services/LoadBalanceAgentService"/>
+        </wsdl:port>
+        <wsdl:port name="LoadBalanceAgentServiceHttpSoap12Endpoint" binding="ns:LoadBalanceAgentServiceSoap12Binding">
+            <soap12:address location="https://192.168.1.100:9443/services/LoadBalanceAgentService"/>
+        </wsdl:port>
+        <wsdl:port name="LoadBalanceAgentServiceHttpEndpoint" binding="ns:LoadBalanceAgentServiceHttpBinding">
+            <http:address location="https://192.168.1.100:9443/services/LoadBalanceAgentService"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/LoadBalanceAgentService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/LoadBalanceAgentService.wsdl b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/LoadBalanceAgentService.wsdl
new file mode 100644
index 0000000..40b40df
--- /dev/null
+++ b/service-stubs/org.apache.stratos.load.balance.agent.stub/src/main/resources/LoadBalanceAgentService.wsdl
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://agent.balance.load.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://agent.balance.load.stratos.apache.org">
+    <wsdl:types>
+        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://agent.balance.load.stratos.apache.org">
+            <xs:element name="getLoadAverageResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:double"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="getLoadAverageRequest"/>
+    <wsdl:message name="getLoadAverageResponse">
+        <wsdl:part name="parameters" element="ns:getLoadAverageResponse"/>
+    </wsdl:message>
+    <wsdl:portType name="LoadBalanceAgentServicePortType">
+        <wsdl:operation name="getLoadAverage">
+            <wsdl:input message="ns:getLoadAverageRequest" wsaw:Action="urn:getLoadAverage"/>
+            <wsdl:output message="ns:getLoadAverageResponse" wsaw:Action="urn:getLoadAverageResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="LoadBalanceAgentServiceSoap11Binding" type="ns:LoadBalanceAgentServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <wsdl:operation name="getLoadAverage">
+            <soap:operation soapAction="urn:getLoadAverage" style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:binding name="LoadBalanceAgentServiceSoap12Binding" type="ns:LoadBalanceAgentServicePortType">
+        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <wsdl:operation name="getLoadAverage">
+            <soap12:operation soapAction="urn:getLoadAverage" style="document"/>
+            <wsdl:input>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:binding name="LoadBalanceAgentServiceHttpBinding" type="ns:LoadBalanceAgentServicePortType">
+        <http:binding verb="POST"/>
+        <wsdl:operation name="getLoadAverage">
+            <http:operation location="LoadBalanceAgentService/getLoadAverage"/>
+            <wsdl:input>
+                <mime:content type="text/xml" part="getLoadAverage"/>
+            </wsdl:input>
+            <wsdl:output>
+                <mime:content type="text/xml" part="getLoadAverage"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="LoadBalanceAgentService">
+        <wsdl:port name="LoadBalanceAgentServiceHttpSoap11Endpoint" binding="ns:LoadBalanceAgentServiceSoap11Binding">
+            <soap:address location="https://192.168.1.100:9443/services/LoadBalanceAgentService"/>
+        </wsdl:port>
+        <wsdl:port name="LoadBalanceAgentServiceHttpSoap12Endpoint" binding="ns:LoadBalanceAgentServiceSoap12Binding">
+            <soap12:address location="https://192.168.1.100:9443/services/LoadBalanceAgentService"/>
+        </wsdl:port>
+        <wsdl:port name="LoadBalanceAgentServiceHttpEndpoint" binding="ns:LoadBalanceAgentServiceHttpBinding">
+            <http:address location="https://192.168.1.100:9443/services/LoadBalanceAgentService"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e893631c/service-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml
index 9c2010e..66eac06 100644
--- a/service-stubs/pom.xml
+++ b/service-stubs/pom.xml
@@ -51,6 +51,7 @@
 	<module>org.apache.stratos.adc.instanceinfo.mgt.stub</module>
 	<module>org.apache.stratos.tenant.register.gapp.stub</module>
 	<module>org.apache.stratos.redirector.servlet.stub</module>
+	<module>org.apache.stratos.load.balance.agent.stub</module>
     </modules>
 
     <build>


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

Posted by la...@apache.org.
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>