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/19 07:51:58 UTC

[1/2] git commit: refactor group id, artifact id, name, description, url, organization, mail lists in elb

Updated Branches:
  refs/heads/master ceecdcbff -> a7e9e80a3


refactor group id, artifact id, name, description, url, organization, mail lists in elb

Signed-off-by: Lakmal Warusawithana <la...@wso2.com>


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

Branch: refs/heads/master
Commit: bfa7af55a12eb312b7c7b0dc86a3efc5082ac8b9
Parents: ceecdcb
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Thu Jul 18 16:49:29 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Thu Jul 18 20:05:56 2013 +0530

----------------------------------------------------------------------
 products/elb/modules/distribution/pom.xml       | 10 +--
 .../distribution/src/main/assembly/bin.xml      | 70 ++++++++--------
 .../distribution/src/main/assembly/dist.xml     |  2 +-
 .../distribution/src/main/assembly/docs.xml     |  2 +-
 .../distribution/src/main/assembly/src.xml      | 10 +--
 products/elb/modules/integration/pom.xml        |  8 +-
 products/elb/modules/p2-profile/pom.xml         | 84 +++++++++++---------
 products/elb/pom.xml                            | 41 +++++-----
 8 files changed, 119 insertions(+), 108 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bfa7af55/products/elb/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/pom.xml b/products/elb/modules/distribution/pom.xml
index f2522f7..98762e5 100755
--- a/products/elb/modules/distribution/pom.xml
+++ b/products/elb/modules/distribution/pom.xml
@@ -23,18 +23,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.wso2.elb</groupId>
+        <groupId>org.apache.stratos.elb</groupId>
         <artifactId>elb-parent</artifactId>
         <version>2.0.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2elb</artifactId>
+    <artifactId>apache-stratos-elb</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 ELB - Distribution</name>
-    <url>http://wso2.org/projects/load-balancer</url>
-    <description>WSO2 Elastic Load Balancer Distribution</description>
+    <name>Apache Stratos - ELB - Distribution</name>
+    <url>http://apache.org</url>
+    <description>Apache Stratos Elastic Load Balancer Distribution</description>
 
     <dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bfa7af55/products/elb/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/bin.xml b/products/elb/modules/distribution/src/main/assembly/bin.xml
index ab0cc3a..25e44c9 100755
--- a/products/elb/modules/distribution/src/main/assembly/bin.xml
+++ b/products/elb/modules/distribution/src/main/assembly/bin.xml
@@ -25,7 +25,7 @@
     <fileSets>
         <fileSet>
             <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
-            <outputDirectory>wso2elb-${pom.version}</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}</outputDirectory>
             <excludes>
                 <exclude>**/*.sh</exclude>
                 <exclude>**/conf/axis2/axis2.xml</exclude>
@@ -73,20 +73,20 @@
         </fileSet>
         <fileSet>
             <directory>src/main/conf/synapse-configs</directory>
-            <outputDirectory>wso2elb-${pom.version}/repository/deployment/server/synapse-configs
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/deployment/server/synapse-configs
             </outputDirectory>
         </fileSet>
         <fileSet>
             <directory>src/main/cartridges</directory>
-            <outputDirectory>wso2elb-${pom.version}/repository/deployment/server/cartridges</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/deployment/server/cartridges</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>src/main/services</directory>
-            <outputDirectory>wso2elb-${pom.version}/repository/deployment/server/services</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/deployment/server/services</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/</directory>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf/etc</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf/etc</outputDirectory>
             <includes>
                 <include>*.xsd</include>
             </includes>
@@ -96,13 +96,13 @@
     <dependencySets>
         <!-- use the new tool to create a bundles -->
         <dependencySet>
-            <outputDirectory>wso2elb-${pom.version}/lib/core/WEB-INF/lib</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/lib/core/WEB-INF/lib</outputDirectory>
             <includes>
                 <include>org.wso2.carbon:org.wso2.carbon.mediator.bridge:jar</include>
             </includes>
         </dependencySet>
         <!--dependencySet>
-            <outputDirectory>wso2elb-${pom.version}/samples/axis2Client/client_repo/modules
+            <outputDirectory>apache-stratos-elb-${pom.version}/samples/axis2Client/client_repo/modules
             </outputDirectory>
             <includes>
                 <include>org.apache.axis2:addressing:mar</include>
@@ -113,7 +113,7 @@
             </outputFileNameMapping>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>wso2elb-${pom.version}/samples/axis2Server/repository/modules
+            <outputDirectory>apache-stratos-elb-${pom.version}/samples/axis2Server/repository/modules
             </outputDirectory>
             <includes>
                 <include>org.apache.axis2:addressing:mar</include>
@@ -124,7 +124,7 @@
             </outputFileNameMapping>
         </dependencySet-->
         <dependencySet>
-            <outputDirectory>wso2elb-${pom.version}/repository/axis2/client/lib</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/axis2/client/lib</outputDirectory>
             <includes>
                 <include>bouncycastle:bcprov-jdk15:jar</include>
             </includes>
@@ -132,7 +132,7 @@
             </outputFileNameMapping>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>wso2elb-${pom.version}/repository/deployment/client/modules
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/deployment/client/modules
             </outputDirectory>
             <includes>
                 <include>org.apache.rampart:rampart:mar</include>
@@ -140,7 +140,7 @@
         </dependencySet>
         <!-- MB Client libs -->
         <dependencySet>
-            <outputDirectory>wso2elb-${pom.version}/repository/components/dropins</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/components/dropins</outputDirectory>
             <includes>
                 <include>org.wso2.andes.wso2:andes-client:jar</include>
                 <include>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec:jar</include>
@@ -153,14 +153,14 @@
     <files>
         <file>
             <source>src/main/bin/wso2server.sh</source>
-            <outputDirectory>wso2elb-${pom.version}/bin</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/bin</outputDirectory>
             <destName>wso2server.sh</destName>
             <fileMode>755</fileMode>
             <filtered>true</filtered>
         </file>
         <file>
             <source>src/main/bin/wso2server.bat</source>
-            <outputDirectory>wso2elb-${pom.version}/bin</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/bin</outputDirectory>
             <destName>wso2server.bat</destName>
             <fileMode>755</fileMode>
             <filtered>true</filtered>
@@ -169,124 +169,124 @@
             <source>
                 ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
             </source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
         </file>
         <file>
             <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/zoo.cfg</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf/etc</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf/etc</outputDirectory>
         </file>
         <file>
             <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf/etc</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf/etc</outputDirectory>
         </file>
         <file>
             <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf/</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf/</outputDirectory>
         </file>
         <file>
             <source>src/main/conf/user-mgt.xml</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
             <destName>user-mgt.xml</destName>
         </file>
         <file>
             <source>src/main/conf/embedded-ldap.xml</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
             <destName>embedded-ldap.xml</destName>
         </file>
         <file>
             <source>src/main/conf/axis2.xml</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf/axis2</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf/axis2</outputDirectory>
             <destName>axis2.xml</destName>
         </file>
 	      <file>
             <source>src/main/conf/loadbalancer.conf</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
             <destName>loadbalancer.conf</destName>
         </file>
         <file>
             <source>src/main/conf/log4j.properties</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
             <destName>log4j.properties</destName>
             <filtered>true</filtered>
         </file>
         <file>
             <source>src/main/conf/synapse.properties</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
             <destName>synapse.properties</destName>
             <filtered>true</filtered>
         </file>
         <file>
             <source>src/main/conf/cipher-text.properties</source>
-            <outputDirectory>wso2elb-${pom.version}/lib</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/lib</outputDirectory>
             <destName>cipher-text.properties</destName>
             <filtered>true</filtered>
         </file>
         <file>
             <source>src/main/conf/nhttp.properties</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
             <destName>nhttp.properties</destName>
             <filtered>true</filtered>
         </file>
         <file>
             <source>src/main/conf/passthru-http.properties</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
             <destName>passthru-http.properties</destName>
             <filtered>true</filtered>
         </file>
         <file>
             <source>src/main/conf/datasources.properties</source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf</outputDirectory>
             <destName>datasources.properties</destName>
             <filtered>true</filtered>
         </file>
                                                                 
         <file>
             <source>../../LICENSE.txt</source>
-            <outputDirectory>wso2elb-${pom.version}</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>../../README.txt</source>
-            <outputDirectory>wso2elb-${pom.version}</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>../../INSTALL.txt</source>
-            <outputDirectory>wso2elb-${pom.version}</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>../../docs/xdoc/release-notes.xml</source>
-            <outputDirectory>wso2elb-${pom.version}</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}</outputDirectory>
             <destName>release-notes.html</destName>
             <fileMode>644</fileMode>
         </file>
         <!--file>
             <source>target/wso2carbon-core-${carbon.patch.version}/bin/README.txt</source>
-            <outputDirectory>wso2elb-${pom.version}/bin/</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file-->
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
-            <outputDirectory>wso2elb-${pom.version}/bin/</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <!--file>
             <source>target/wso2carbon-core-${carbon.patch.version}/bin/wso2server.bat
             </source>
-            <outputDirectory>wso2elb-${pom.version}/bin/</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
         </file-->
         <file>
             <source>
                 target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml
             </source>
-            <outputDirectory>wso2elb-${pom.version}/repository/conf/</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
         </file>
     </files>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bfa7af55/products/elb/modules/distribution/src/main/assembly/dist.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/dist.xml b/products/elb/modules/distribution/src/main/assembly/dist.xml
index f575fc0..ca1b2d5 100644
--- a/products/elb/modules/distribution/src/main/assembly/dist.xml
+++ b/products/elb/modules/distribution/src/main/assembly/dist.xml
@@ -26,7 +26,7 @@
         <!-- Copying p2 profile and osgi bundles-->
         <fileSet>
             <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
-            <outputDirectory>wso2elb-${pom.version}/repository/components</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}/repository/components</outputDirectory>
             <excludes>
                 <exclude>**/eclipse.ini</exclude>
                 <exclude>**/*.lock</exclude>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bfa7af55/products/elb/modules/distribution/src/main/assembly/docs.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/docs.xml b/products/elb/modules/distribution/src/main/assembly/docs.xml
index d3fed3b..2718747 100644
--- a/products/elb/modules/distribution/src/main/assembly/docs.xml
+++ b/products/elb/modules/distribution/src/main/assembly/docs.xml
@@ -26,7 +26,7 @@
     <fileSets>
         <fileSet>
             <directory>target/site</directory>
-            <outputDirectory>wso2elb-${pom.version}-docs</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}-docs</outputDirectory>
             <fileMode>755</fileMode>
         </fileSet>
     </fileSets>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bfa7af55/products/elb/modules/distribution/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/src.xml b/products/elb/modules/distribution/src/main/assembly/src.xml
index 6d0c8a9..451c388 100644
--- a/products/elb/modules/distribution/src/main/assembly/src.xml
+++ b/products/elb/modules/distribution/src/main/assembly/src.xml
@@ -27,14 +27,14 @@
     <fileSets>
         <fileSet>
             <directory>target/sources</directory>
-            <outputDirectory>wso2elb-${pom.version}-src</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>../..</directory>
-            <outputDirectory>wso2elb-${pom.version}-src</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
             <includes>
                 <include>modules/**/*</include>
                 <include>**/pom.xml</include>
@@ -57,17 +57,17 @@
     <files>
         <file>
             <source>../../LICENSE.txt</source>
-            <outputDirectory>wso2elb-${pom.version}-src</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
             <filtered>true</filtered>
         </file>
         <file>
             <source>../../README.txt</source>
-            <outputDirectory>wso2elb-${pom.version}-src</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
             <filtered>true</filtered>
         </file>
         <file>
             <source>../../INSTALL.txt</source>
-            <outputDirectory>wso2elb-${pom.version}-src</outputDirectory>
+            <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
             <filtered>true</filtered>
         </file>
     </files>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bfa7af55/products/elb/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/integration/pom.xml b/products/elb/modules/integration/pom.xml
index 8190566..7708136 100644
--- a/products/elb/modules/integration/pom.xml
+++ b/products/elb/modules/integration/pom.xml
@@ -22,15 +22,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.lb</groupId>
-        <artifactId>lb-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>org.apache.stratos.elb</groupId>
+        <artifactId>elb-parent</artifactId>
+        <version>2.0.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>integration</artifactId>
-    <name>WSO2 LB - Integration Tests</name>
+    <name>Apache Stratos - ELB - Integration Tests</name>
     <packaging>jar</packaging>
 
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bfa7af55/products/elb/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/p2-profile/pom.xml b/products/elb/modules/p2-profile/pom.xml
index 89bcbed..c443916 100755
--- a/products/elb/modules/p2-profile/pom.xml
+++ b/products/elb/modules/p2-profile/pom.xml
@@ -22,17 +22,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.wso2.elb</groupId>
+        <groupId>org.apache.stratos.elb</groupId>
         <artifactId>elb-parent</artifactId>
         <version>2.0.5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2elb-p2-profile-gen</artifactId>
+    <artifactId>apache-stratos-elb-p2-profile-gen</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 ELB - P2 Profile Generation</name>
-    <url>http://www.wso2.org</url>
+    <name>Apache Stratos - ELB - P2 Profile Generation</name>
+    <url>http://www.apache.org</url>
 
     <build>
         <plugins>
@@ -61,7 +61,7 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                     <execution>
+                    <execution>
                         <id>2-unpack-kernel-patch</id>
                         <phase>test</phase>
                         <goals>
@@ -142,7 +142,7 @@
                                     org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.patch.version.4.1.1}
                                 </featureArtifactDef>
 
-				 <featureArtifactDef>
+                                <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.lb.endpoint.server.feature:${carbon.patch.version.4.1.3}
                                 </featureArtifactDef>
 
@@ -184,16 +184,26 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.version}
                                 </featureArtifactDef>
-		                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.security.mgt.server.feature:${carbon.version}</featureArtifactDef>
-		                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.version}</featureArtifactDef>
-		                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.version}</featureArtifactDef>
-		                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.server.feature:${carbon.version}</featureArtifactDef>
-		                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version}</featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.security.mgt.server.feature:${carbon.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.caching.server.feature:${carbon.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.patch.version.4.1.1}
                                 </featureArtifactDef>
-				<!--***********************************************-->
-				<featureArtifactDef>
+                                <!--***********************************************-->
+                                <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.version}
                                 </featureArtifactDef>
                             </featureArtifacts>
@@ -299,7 +309,7 @@
                                     <id>org.wso2.carbon.lb.common.feature.group</id>
                                     <version>${carbon.patch.version.4.1.3}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>org.wso2.carbon.lb.endpoint.server.feature.group</id>
                                     <version>${carbon.patch.version.4.1.3}</version>
                                 </feature>
@@ -307,8 +317,8 @@
                                     <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
                                     <version>${carbon.patch.version.4.1.1}</version>
                                 </feature>
-				<!--***********************************************-->
-				<feature>
+                                <!--***********************************************-->
+                                <feature>
                                     <id>org.wso2.carbon.event.server.feature.group</id>
                                     <version>${carbon.version}</version>
                                 </feature>
@@ -318,27 +328,27 @@
                     </execution>
                 </executions>
             </plugin>
-	    <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.1</version>
-        <executions>
-            <execution>
-                <phase>package</phase>
-                <configuration>
-                    <tasks>
-                        <replace token="false" value="true"
-                                 dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/configuration/org.eclipse.equinox.simpleconfigurator">
-                            <include name="**/bundles.info"/>
-                        </replace>
-                    </tasks>
-                </configuration>
-                <goals>
-                    <goal>run</goal>
-                </goals>
-            </execution>
-        </executions>
-    </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <replace token="false" value="true"
+                                         dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/configuration/org.eclipse.equinox.simpleconfigurator">
+                                    <include name="**/bundles.info"/>
+                                </replace>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bfa7af55/products/elb/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/pom.xml b/products/elb/pom.xml
index 6a60285..61f6f62 100755
--- a/products/elb/pom.xml
+++ b/products/elb/pom.xml
@@ -23,20 +23,20 @@
          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>carbon-products</artifactId>
-        <version>4.0.0</version>
+        <groupId>org.apache.stratos</groupId>
+        <artifactId>stratos-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.elb</groupId>
+    <groupId>org.apache.stratos.elb</groupId>
     <artifactId>elb-parent</artifactId>
     <packaging>pom</packaging>
     <version>2.0.5</version>
-    <name>WSO2 ELB - Aggregator Module</name>
-    <url>http://wso2.com/products/load-balancer</url>
-    <description>WSO2 Elastic Load Balancer (ELB)</description>
+    <name>Apache Stratos - ELB - Aggregator Module</name>
+    <url>http://apache.org</url>
+    <description>Apache Stratos Elastic Load Balancer (ELB)</description>
 
     <licenses>
         <license>
@@ -132,29 +132,29 @@
     </profiles>
 
     <organization>
-        <name>WSO2 Inc</name>
-        <url>http://wso2.com</url>
+        <name>Apache</name>
+        <url>http://apache.org</url>
     </organization>
 
     <issueManagement>
         <system>JIRA</system>
-        <url>http://wso2.org/jira/browse/LB</url>
+        <url>https://issues.apache.org/jira/browse/stratos</url>
     </issueManagement>
 
     <mailingLists>
         <mailingList>
-            <name>WSO2 LB Users' list</name>
-            <post>mailto:lb-user@wso2.org</post>
-            <archive>http://wso2.org/mailarchive/lb-user/</archive>
-            <subscribe>mailto:lb-user-request@wso2.org?subject=subscribe</subscribe>
-            <unsubscribe>mailto:lb-user-request@wso2.org?subject=unsubscribe</unsubscribe>
+            <name>Apache Stratos Developer Mailing List</name>
+            <post>mailto://dev@stratos.incubator.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/incubator-stratos-dev/</archive>
+            <subscribe>mailto:dev-subscribe@stratos.incubator.apache.org?subject=subscribe</subscribe>
+            <unsubscribe>mailto:dev-unsubscribe@stratos.incubator.apache.org?subject=unsubscribe</unsubscribe>
         </mailingList>
         <mailingList>
-            <name>WSO2 LB/Carbon Developers' List</name>
-            <post>mailto:dev@wso2.org</post>
-            <archive>http://wso2.org/mailarchive/dev/</archive>
-            <subscribe>mailto:dev-request@wso2.org?subject=subscribe</subscribe>
-            <unsubscribe>mailto:dev-request@wso2.org?subject=unsubscribe</unsubscribe>
+            <name>Apache Stratos Commit Mailing List</name>
+            <post></post>
+            <archive>http://mail-archives.apache.org/mod_mbox/incubator-stratos-commits/</archive>
+            <subscribe>mailto:commits-subscribe@stratos.incubator.apache.org?subject=subscribe</subscribe>
+            <unsubscribe>mailto:commits-unsubscribe@stratos.incubator.apache.org?subject=unsubscribe</unsubscribe>
         </mailingList>
     </mailingLists>
 
@@ -201,6 +201,7 @@
         <carbon.kernel.version>4.1.0</carbon.kernel.version>
         <carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
         <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3>
+        <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
 	<stratos.component.version>2.1.0</stratos.component.version>
 	<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>
 	<stratos.component.patch.version.2.1.3>2.1.3</stratos.component.patch.version.2.1.3>


[2/2] git commit: applied 0001-Refactory-Stratos-CLI-tool.patch

Posted by la...@apache.org.
applied 0001-Refactory-Stratos-CLI-tool.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/a7e9e80a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a7e9e80a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a7e9e80a

Branch: refs/heads/master
Commit: a7e9e80a3be749bba4c8891881352ee0c2e2ec8c
Parents: bfa7af5
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Fri Jul 19 11:20:24 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Fri Jul 19 11:20:24 2013 +0530

----------------------------------------------------------------------
 products/pom.xml                                |  42 +++++++
 products/stratos2/stratos_cli/1.0.1/LICENSE.txt |  46 --------
 products/stratos2/stratos_cli/1.0.1/README.txt  |  97 ----------------
 .../stratos_cli/1.0.1/distribution/pom.xml      |  67 -----------
 .../distribution/src/main/assembly/bin.xml      |  56 ----------
 .../1.0.1/distribution/src/main/bin/stratos.bat |  34 ------
 .../1.0.1/distribution/src/main/bin/stratos.sh  |  31 ------
 .../1.0.1/distribution/src/main/bin/version.txt |   1 -
 products/stratos2/stratos_cli/1.0.1/pom.xml     |  46 --------
 .../stratos2/stratos_cli/distribution/pom.xml   | 111 -------------------
 .../distribution/src/main/assembly/bin.xml      |  42 -------
 .../distribution/src/main/bin/stratos.sh        |   3 -
 products/stratos2/stratos_cli/pom.xml           |  46 --------
 products/stratos_cli/LICENSE.txt                |  46 ++++++++
 products/stratos_cli/README.txt                 |  95 ++++++++++++++++
 products/stratos_cli/distribution/pom.xml       |  67 +++++++++++
 .../distribution/src/main/assembly/bin.xml      |  56 ++++++++++
 .../distribution/src/main/bin/stratos.bat       |  34 ++++++
 .../distribution/src/main/bin/stratos.sh        |  31 ++++++
 .../distribution/src/main/bin/version.txt       |   1 +
 products/stratos_cli/pom.xml                    |  44 ++++++++
 21 files changed, 416 insertions(+), 580 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/pom.xml
----------------------------------------------------------------------
diff --git a/products/pom.xml b/products/pom.xml
new file mode 100644
index 0000000..e4c9765
--- /dev/null
+++ b/products/pom.xml
@@ -0,0 +1,42 @@
+<!-- 
+  #  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-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>stratos-products-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Products</name>
+    <description>Apache Stratos plafrom based products</description>
+    <url>http://apache.org</url>
+
+
+    <modules>
+	<module>stratos_cli</module>
+    </modules>
+
+</project>
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/1.0.1/LICENSE.txt
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/1.0.1/LICENSE.txt b/products/stratos2/stratos_cli/1.0.1/LICENSE.txt
deleted file mode 100644
index 823ac36..0000000
--- a/products/stratos2/stratos_cli/1.0.1/LICENSE.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-
-This product is licensed by WSO2 Inc. under Apache License 2.0. The license
-can be downloaded from the following locations:
-	http://www.apache.org/licenses/LICENSE-2.0.html
-	http://www.apache.org/licenses/LICENSE-2.0.txt
-
-This product also contains software under different licenses. 
-
-Following are the dependencies for this product.
-
-Artifact                                                Version           
-----------------------------------------------------------------------
-avalon-framework:avalon-framework			4.1.3
-com.google.code.gson:gson				2.1
-commons-beanutils:commons-beanutils			1.8.0
-commons-cli:commons-cli					1.2
-commons-codec:commons-codec				1.2
-commons-digester:commons-digester			1.8
-commons-httpclient:commons-httpclient			3.0.1
-commons-io:commons-io					2.0
-commons-logging:commons-logging				1.1
-commons-validator:commons-validator			1.4.0
-javax.servlet:servlet-api				2.3
-jaxen:jaxen						1.1.1
-jline:jline						2.11
-log4j:log4j						1.2.13
-logkit:logkit						1.0.1
-org.apache.axis2.wso2:axis2				1.6.1.wso2v9
-org.apache.commons:commons-lang3			3.1
-org.apache.geronimo.specs:geronimo-activation_1.1_spec	1.0.2
-org.apache.geronimo.specs:geronimo-javamail_1.4_spec	1.6
-org.apache.geronimo.specs:geronimo-stax-api_1.0_spec	1.0.1
-org.apache.httpcomponents.wso2:httpcore			4.1.0-wso2v1
-org.apache.neethi.wso2:neethi				2.0.4.wso2v4
-org.apache.ws.commons.axiom:axiom-api			1.2.11-wso2v2
-org.apache.ws.commons.axiom:axiom-impl			1.2.11-wso2v2
-org.apache.ws.commons.axiom.wso2:axiom			1.2.11.wso2v4
-org.apache.ws.commons.schema:XmlSchema			1.4.3
-org.apache.ws.commons.schema.wso2:XmlSchema		1.4.7.wso2v2
-org.codehaus.woodstox:wstx-asl				3.2.9
-org.slf4j:slf4j-api					1.7.5
-org.slf4j:slf4j-log4j12					1.7.5
-org.wso2.carbon:org.wso2.carbon.adc.mgt.stub		4.1.3
-org.wso2.securevault:org.wso2.securevault		1.0.0-wso2v2
-wsdl4j:wsdl4j						1.6.2
-wsdl4j.wso2:wsdl4j					1.6.2.wso2v2

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/1.0.1/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/1.0.1/README.txt b/products/stratos2/stratos_cli/1.0.1/README.txt
deleted file mode 100755
index d37f38c..0000000
--- a/products/stratos2/stratos_cli/1.0.1/README.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-================================================================================
-                        WSO2 Stratos CLI v1.0.1
-================================================================================
-
-Welcome to the WSO2 Stratos CLI release
-
-The command line interface (CLI) is a powerful tool that clients can use
-to communicate with Stratos 2.0 services. 
-
-The tenant can use the CLI tool on two separate modes if needed, which 
-are namely single command line mode and interactive mode. 
-
-If the user executes with a command as an argument, the CLI tool 
-will execute that command and exit with a status code. 
-
-However, if there is no command as an argument, the CLI tool will 
-enter into an interactive mode.
-
-A user will be able to carryout all the following functions via the
-CLI, with the exception of registering tenants and viewing logs.
-
-The CLI tool also supports command history and auto-completing features 
-in the interactive mode.
-
-Help
-==================================
-usage: stratos [-debug] [-h] [-p <password>] [-trace] [-u <username>]
- -debug                     Enable debug logging
- -h,--help                  Display this help
- -p,--password <password>   Password
- -trace                     Enable trace logging
- -u,--username <username>   Username
-
-
-Available Commands: 
-add-domain-mapping        Map domain for the subscribed cartridge
-help                      Help for commands
-subscribe                 Subscribe to a cartridge
-sync                      Synchronize GIT repository for the subscribed cartridge
-remove-domain-mapping     Remove domain mapping for the subscribed cartridge
-list                      List subscribed cartridges with details
-unsubscribe               Unsubscribe from a subscribed cartridge
-policies                  List available policies
-exit                      Exit from Stratos Client Tool
-info                      Get information about a subscribed cartridge
-cartridges                List available cartridges
-
-
-Installation & Running
-==================================
-
-1. Extract the zip and go to the extracted directory
-
-Add execute permission to the script in Linux.
-chmod +x ./stratos.sh
-
-2. Export the host and port of the SC as environment variables
-
-Linux:
-export STRATOS_URL=https://s2demo.wso2.com:9445
-
-Windows:
-set STRATOS_URL=https://s2demo.wso2.com:9445
-
-3. Run the stratos.sh or stratos.bat as appropriate
-
-4. Export the following environment variables.
-
-Linux: (Add to your bashrc file)
-export JAVA_HOME=/opt/jdk1.6.0_24
-export PATH=$JAVA_HOME/bin:$PATH
-
-Windows: (Set in System Properties)
-set JAVA_HOME=C:\Java\jdk1.6.0_24
-set PATH=%JAVA_HOME%\bin;%PATH%
-
-4. Use the tentant username and password to login
-
-If you wish, you can also export your username and password as environment variables.
-If you export only the username, you will be prompted to enter the password.
-
-Linux:
-export STRATOS_USERNAME=<username>
-export STRATOS_PASSWORD=<password>
-
-Windows:
-set STRATOS_USERNAME=<username>
-set STRATOS_PASSWORD=<password>
-
-Issue Tracker
-==================================
-
-  https://wso2.org/jira/browse/SPI
-
---------------------------------------------------------------------------------
-(c) Copyright 2013 WSO2 Inc.
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/1.0.1/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/1.0.1/distribution/pom.xml b/products/stratos2/stratos_cli/1.0.1/distribution/pom.xml
deleted file mode 100644
index dc0fb82..0000000
--- a/products/stratos2/stratos_cli/1.0.1/distribution/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~  Copyright (c) 2013, WSO2 Inc. (http://wso2.com) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. 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.stratos2</groupId>
-        <artifactId>wso2s2cli-parent</artifactId>
-        <version>1.0.1</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2s2cli</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos CLI</name>
-    <url>http://wso2.com/cloud/stratos/</url>
-    <description>WSO2 Stratos CLI Distribution</description>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>1-pre_dist</id>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/assembly/bin.xml b/products/stratos2/stratos_cli/1.0.1/distribution/src/main/assembly/bin.xml
deleted file mode 100644
index d2f3002..0000000
--- a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<assembly>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>../../../../../components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt.cli/2.1.3/target</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
-            <includes>
-                <include>org.wso2.carbon.adc.mgt.cli-2.1.3-Tool.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/bin</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
-            <includes>
-                <include>stratos.sh</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/bin</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
-            <includes>
-                <include>stratos.bat</include>
-            </includes>
-        </fileSet>
-	<fileSet>
-            <directory>../</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
-            <includes>
-                <include>README.txt</include>
-		<include>LICENSE.txt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/stratos.bat
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/stratos.bat b/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/stratos.bat
deleted file mode 100644
index 2888c73..0000000
--- a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/stratos.bat
+++ /dev/null
@@ -1,34 +0,0 @@
-@echo off
-REM ---------------------------------------------------------------------------
-REM        Copyright 2013 WSO2, Inc. http://www.wso2.org
-REM
-REM  Licensed under the Apache License, Version 2.0 (the "License");
-REM  you may not use this file except in compliance with the License.
-REM  You may obtain a copy of the License at
-REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM  Unless required by applicable law or agreed to in writing, software
-REM  distributed under the License is distributed on an "AS IS" BASIS,
-REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM  See the License for the specific language governing permissions and
-REM  limitations under the License.
-
-rem ---------------------------------------------------------------------------
-rem Main Script for WSO2 Carbon
-rem
-rem Environment Variable Prequisites
-rem
-rem   STRATOS_CLI_HOME Home of Stratos CLI Tool
-rem
-rem   STRATOS_URL      The URL of the Stratos Controller
-rem ---------------------------------------------------------------------------
-
-rem ----- Only set STRATOS_CLI_HOME if not already set ----------------------------
-
-if "%STRATOS_CLI_HOME%"=="" set STRATOS_CLI_HOME=%CD%
-
-cd %STRATOS_CLI_HOME%
-
-java -jar "org.wso2.carbon.adc.mgt.cli-2.1.3-Tool.jar" %*
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/stratos.sh b/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/stratos.sh
deleted file mode 100755
index 75d19e3..0000000
--- a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/stratos.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-#  Copyright 2013 WSO2, Inc. http://www.wso2.org
-#
-#  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.
-
-# ----------------------------------------------------------------------------
-# Main Script for the WSO2 Stratos CLI Tool
-#
-# Environment Variable Prequisites
-#
-#   STRATOS_CLI_HOME Home of Stratos CLI Tool
-#
-#   STRATOS_URL      The URL of the Stratos Controller
-
-if [ -z $STRATOS_CLI_HOME ] ; then
-STRATOS_CLI_HOME="$PWD"
-fi
-
-java -jar $STRATOS_CLI_HOME/org.wso2.carbon.adc.mgt.cli-2.1.3-Tool.jar $*
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/version.txt
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/version.txt b/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/version.txt
deleted file mode 100644
index 80b544c..0000000
--- a/products/stratos2/stratos_cli/1.0.1/distribution/src/main/bin/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-WSO2 Stratos CLI v1.0.1

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/1.0.1/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/1.0.1/pom.xml b/products/stratos2/stratos_cli/1.0.1/pom.xml
deleted file mode 100644
index b32dc0f..0000000
--- a/products/stratos2/stratos_cli/1.0.1/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. 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>stratos2-products</artifactId>
-        <version>4.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.stratos2</groupId>
-    <artifactId>wso2s2cli-parent</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.1</version>
-    <name>WSO2 Stratos CLI - Distribution</name>
-    <url>http://wso2.com/cloud/stratos/</url>
-    <description>WSO2 Stratos CLI</description>
-
-   
-    <modules>
-	<module>
-	    distribution/pom.xml
-   	</module>
-    </modules>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/distribution/pom.xml b/products/stratos2/stratos_cli/distribution/pom.xml
deleted file mode 100644
index 4a3151f..0000000
--- a/products/stratos2/stratos_cli/distribution/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ~ Copyright (c) 2009-2010, 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.stratos2</groupId>
-        <artifactId>wso2s2cli-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2s2cli</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 stratos cli - Distribution</name>
-    <url>http://wso2.org/projects/load-balancer</url>
-    <description>WSO2 Stratos cli Distribution</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ui</artifactId>
-            <version>4.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.adc.mgt.stub</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <version>2.4</version>
-            <classifier>jdk15</classifier>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>3-extract-docs-from-components</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <property name="tempdir" value="target/docs-temp"/>
-                                <mkdir dir="${tempdir}"/>
-                                <unzip dest="${tempdir}">
-                                    <fileset dir="target">
-                                        <include name="${project.artifactId}-${project.version}.zip"/>
-                                    </fileset>
-                                </unzip>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>1-pre_dist</id>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/distribution/src/main/assembly/bin.xml b/products/stratos2/stratos_cli/distribution/src/main/assembly/bin.xml
deleted file mode 100644
index 7fcfc6d..0000000
--- a/products/stratos2/stratos_cli/distribution/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<assembly>
-    <!--<id>bin</id>-->
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>../../../../components/stratos/artifact-deployment-coordinator/org.wso2.carbon.adc.mgt.cli/2.1.1/target</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
-            <includes>
-                <include>org.wso2.carbon.adc.mgt.cli-2.1.1-Tool.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/bin</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
-            <includes>
-                <include>stratos.sh</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/distribution/src/main/bin/stratos.sh b/products/stratos2/stratos_cli/distribution/src/main/bin/stratos.sh
deleted file mode 100755
index 2772a74..0000000
--- a/products/stratos2/stratos_cli/distribution/src/main/bin/stratos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-java -cp org.wso2.carbon.adc.mgt.cli-2.1.1-Tool.jar org.wso2.carbon.adc.mgt.cli.CliTool $@
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos2/stratos_cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/stratos_cli/pom.xml b/products/stratos2/stratos_cli/pom.xml
deleted file mode 100644
index 833e62d..0000000
--- a/products/stratos2/stratos_cli/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. 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>stratos2-products</artifactId>
-        <version>4.1.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.stratos2</groupId>
-    <artifactId>wso2s2cli-parent</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0</version>
-    <name>WSO2 stratos cli - Distribution</name>
-    <url>http://wso2.org/projects/load-balancer</url>
-    <description>WSO2 Stratos cli Distribution</description>
-
-   
-    <modules>
-	<module>
-	    distribution/pom.xml
-   	</module>
-    </modules>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos_cli/LICENSE.txt
----------------------------------------------------------------------
diff --git a/products/stratos_cli/LICENSE.txt b/products/stratos_cli/LICENSE.txt
new file mode 100644
index 0000000..128d81e
--- /dev/null
+++ b/products/stratos_cli/LICENSE.txt
@@ -0,0 +1,46 @@
+
+This product is licensed by Apache Org. under Apache License 2.0. The license
+can be downloaded from the following locations:
+	http://www.apache.org/licenses/LICENSE-2.0.html
+	http://www.apache.org/licenses/LICENSE-2.0.txt
+
+This product also contains software under different licenses. 
+
+Following are the dependencies for this product.
+
+Artifact                                                Version           
+----------------------------------------------------------------------
+avalon-framework:avalon-framework			4.1.3
+com.google.code.gson:gson				2.1
+commons-beanutils:commons-beanutils			1.8.0
+commons-cli:commons-cli					1.2
+commons-codec:commons-codec				1.2
+commons-digester:commons-digester			1.8
+commons-httpclient:commons-httpclient			3.0.1
+commons-io:commons-io					2.0
+commons-logging:commons-logging				1.1
+commons-validator:commons-validator			1.4.0
+javax.servlet:servlet-api				2.3
+jaxen:jaxen						1.1.1
+jline:jline						2.11
+log4j:log4j						1.2.13
+logkit:logkit						1.0.1
+org.apache.axis2.wso2:axis2				1.6.1.wso2v9
+org.apache.commons:commons-lang3			3.1
+org.apache.geronimo.specs:geronimo-activation_1.1_spec	1.0.2
+org.apache.geronimo.specs:geronimo-javamail_1.4_spec	1.6
+org.apache.geronimo.specs:geronimo-stax-api_1.0_spec	1.0.1
+org.apache.httpcomponents.wso2:httpcore			4.1.0-wso2v1
+org.apache.neethi.wso2:neethi				2.0.4.wso2v4
+org.apache.ws.commons.axiom:axiom-api			1.2.11-wso2v2
+org.apache.ws.commons.axiom:axiom-impl			1.2.11-wso2v2
+org.apache.ws.commons.axiom.wso2:axiom			1.2.11.wso2v4
+org.apache.ws.commons.schema:XmlSchema			1.4.3
+org.apache.ws.commons.schema.wso2:XmlSchema		1.4.7.wso2v2
+org.codehaus.woodstox:wstx-asl				3.2.9
+org.slf4j:slf4j-api					1.7.5
+org.slf4j:slf4j-log4j12					1.7.5
+org.apache.stratos:org.apache.stratos.adc.mgt.stub	4.1.3
+org.wso2.securevault:org.wso2.securevault		1.0.0-wso2v2
+wsdl4j:wsdl4j						1.6.2
+wsdl4j.wso2:wsdl4j					1.6.2.wso2v2

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos_cli/README.txt
----------------------------------------------------------------------
diff --git a/products/stratos_cli/README.txt b/products/stratos_cli/README.txt
new file mode 100755
index 0000000..930f910
--- /dev/null
+++ b/products/stratos_cli/README.txt
@@ -0,0 +1,95 @@
+================================================================================
+                        Apache Stratos CLI v1.0.1
+================================================================================
+
+Welcome to the Apache Stratos CLI release
+
+The command line interface (CLI) is a powerful tool that clients can use
+to communicate with Stratos services. 
+
+The tenant can use the CLI tool on two separate modes if needed, which 
+are namely single command line mode and interactive mode. 
+
+If the user executes with a command as an argument, the CLI tool 
+will execute that command and exit with a status code. 
+
+However, if there is no command as an argument, the CLI tool will 
+enter into an interactive mode.
+
+A user will be able to carryout all the following functions via the
+CLI, with the exception of registering tenants and viewing logs.
+
+The CLI tool also supports command history and auto-completing features 
+in the interactive mode.
+
+Help
+==================================
+usage: stratos [-debug] [-h] [-p <password>] [-trace] [-u <username>]
+ -debug                     Enable debug logging
+ -h,--help                  Display this help
+ -p,--password <password>   Password
+ -trace                     Enable trace logging
+ -u,--username <username>   Username
+
+
+Available Commands: 
+add-domain-mapping        Map domain for the subscribed cartridge
+help                      Help for commands
+subscribe                 Subscribe to a cartridge
+sync                      Synchronize GIT repository for the subscribed cartridge
+remove-domain-mapping     Remove domain mapping for the subscribed cartridge
+list                      List subscribed cartridges with details
+unsubscribe               Unsubscribe from a subscribed cartridge
+policies                  List available policies
+exit                      Exit from Stratos Client Tool
+info                      Get information about a subscribed cartridge
+cartridges                List available cartridges
+
+
+Installation & Running
+==================================
+
+1. Extract the zip and go to the extracted directory
+
+Add execute permission to the script in Linux.
+chmod +x ./stratos.sh
+
+2. Export the host and port of the SC as environment variables
+
+Linux:
+export STRATOS_URL=https://s2demo.apache.com:9445
+
+Windows:
+set STRATOS_URL=https://s2demo.apache.com:9445
+
+3. Run the stratos.sh or stratos.bat as appropriate
+
+4. Export the following environment variables.
+
+Linux: (Add to your bashrc file)
+export JAVA_HOME=/opt/jdk1.6.0_24
+export PATH=$JAVA_HOME/bin:$PATH
+
+Windows: (Set in System Properties)
+set JAVA_HOME=C:\Java\jdk1.6.0_24
+set PATH=%JAVA_HOME%\bin;%PATH%
+
+4. Use the tentant username and password to login
+
+If you wish, you can also export your username and password as environment variables.
+If you export only the username, you will be prompted to enter the password.
+
+Linux:
+export STRATOS_USERNAME=<username>
+export STRATOS_PASSWORD=<password>
+
+Windows:
+set STRATOS_USERNAME=<username>
+set STRATOS_PASSWORD=<password>
+
+Issue Tracker
+==================================
+
+
+--------------------------------------------------------------------------------
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos_cli/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/pom.xml b/products/stratos_cli/distribution/pom.xml
new file mode 100644
index 0000000..d8d33a8
--- /dev/null
+++ b/products/stratos_cli/distribution/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  Copyright (c) 2013, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. 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>Apache-s2cli-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>apaches2cli</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos CLI</name>
+    <url>http://apache.org/cloud/stratos/</url>
+    <description>Apache Stratos CLI Distribution</description>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>1-pre_dist</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos_cli/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/assembly/bin.xml b/products/stratos_cli/distribution/src/main/assembly/bin.xml
new file mode 100644
index 0000000..6e31429
--- /dev/null
+++ b/products/stratos_cli/distribution/src/main/assembly/bin.xml
@@ -0,0 +1,56 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. 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.
+ -->
+<assembly>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>../../../../../components/stratos/artifact-deployment-coordinator/org.apache.stratos.adc.mgt.cli/3.0.0-SNAPSHOT/target</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
+            <includes>
+                <include>org.apache.stratos.adc.mgt.cli-3.0.0-SNAPSHOT-Tool.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/bin</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
+            <includes>
+                <include>stratos.sh</include>
+            </includes>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/bin</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
+            <includes>
+                <include>stratos.bat</include>
+            </includes>
+        </fileSet>
+	<fileSet>
+            <directory>../</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
+            <includes>
+                <include>README.txt</include>
+		<include>LICENSE.txt</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos_cli/distribution/src/main/bin/stratos.bat
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/bin/stratos.bat b/products/stratos_cli/distribution/src/main/bin/stratos.bat
new file mode 100644
index 0000000..121e12d
--- /dev/null
+++ b/products/stratos_cli/distribution/src/main/bin/stratos.bat
@@ -0,0 +1,34 @@
+@echo off
+REM ---------------------------------------------------------------------------
+REM        Copyright 2013 WSO2, Inc. http://www.wso2.org
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Main Script for WSO2 Carbon
+rem
+rem Environment Variable Prequisites
+rem
+rem   STRATOS_CLI_HOME Home of Stratos CLI Tool
+rem
+rem   STRATOS_URL      The URL of the Stratos Controller
+rem ---------------------------------------------------------------------------
+
+rem ----- Only set STRATOS_CLI_HOME if not already set ----------------------------
+
+if "%STRATOS_CLI_HOME%"=="" set STRATOS_CLI_HOME=%CD%
+
+cd %STRATOS_CLI_HOME%
+
+java -jar "org.apache.stratos.adc.mgt.cli-3.0.0-SNAPSHOT-Tool.jar" %*
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos_cli/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/bin/stratos.sh b/products/stratos_cli/distribution/src/main/bin/stratos.sh
new file mode 100755
index 0000000..f088383
--- /dev/null
+++ b/products/stratos_cli/distribution/src/main/bin/stratos.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+#  Copyright 2013 WSO2, Inc. http://www.wso2.org
+#
+#  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.
+
+# ----------------------------------------------------------------------------
+# Main Script for the WSO2 Stratos CLI Tool
+#
+# Environment Variable Prequisites
+#
+#   STRATOS_CLI_HOME Home of Stratos CLI Tool
+#
+#   STRATOS_URL      The URL of the Stratos Controller
+
+if [ -z $STRATOS_CLI_HOME ] ; then
+STRATOS_CLI_HOME="$PWD"
+fi
+
+java -jar $STRATOS_CLI_HOME/org.apache.stratos.mgt.cli-3.0.0-SNAPSHOT-Tool.jar $*
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos_cli/distribution/src/main/bin/version.txt
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/bin/version.txt b/products/stratos_cli/distribution/src/main/bin/version.txt
new file mode 100644
index 0000000..a31005a
--- /dev/null
+++ b/products/stratos_cli/distribution/src/main/bin/version.txt
@@ -0,0 +1 @@
+WSO2 Stratos CLI 3.0.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a7e9e80a/products/stratos_cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/pom.xml b/products/stratos_cli/pom.xml
new file mode 100644
index 0000000..9dd2434
--- /dev/null
+++ b/products/stratos_cli/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+  ~
+  ~  WSO2 Inc. 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-products-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>apache-s2cli-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos CLI - Distribution</name>
+    <url>http://apache.org/cloud/stratos/</url>
+    <description>Apache Stratos CLI</description>
+
+   
+    <modules>
+	<module>
+	    distribution
+   	</module>
+    </modules>
+</project>