From 1ee862ed83d003676875aa71491e9296288b621c Mon Sep 17 00:00:00 2001
From: Niranjan-K <niranjan.karu@gmail.com>
Date: Wed, 3 Dec 2014 15:30:22 +0530
Subject: [PATCH] Changed carbon.kernal.version to carbon.kernel.version

---
 pom.xml                                       |  2 +-
 product/modules/distribution/pom.xml          | 14 ++---
 .../modules/distribution/src/assembly/bin.xml | 60 +++++++++----------
 .../distribution/src/assembly/dist.xml        |  2 +-
 product/modules/p2-profile-gen/pom.xml        | 12 ++--
 5 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index 876336192..7da7c90c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     </modules>
 
     <properties>
-        <carbon.kernal.version>4.2.0</carbon.kernal.version>
+        <carbon.kernel.version>4.2.0</carbon.kernel.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml
index 3a92ac0a9..3d0be22f8 100644
--- a/product/modules/distribution/pom.xml
+++ b/product/modules/distribution/pom.xml
@@ -83,7 +83,7 @@
                                 <artifactItem>
                                     <groupId>org.wso2.carbon</groupId>
                                     <artifactId>wso2carbon-core</artifactId>
-                                    <version>${carbon.kernal.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>target</outputDirectory>
@@ -118,7 +118,7 @@
                                         <include name="wso2emm-${project.version}.zip"/>
                                     </fileset>
                                 </unzip>
-                                <copy todir="target/wso2carbon-core-${carbon.kernal.version}/repository/components"
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
                                       overwrite="true">
                                     <fileset
                                             dir="${tempdir}/wso2emm-${project.version}/repository/components"></fileset>
@@ -141,7 +141,7 @@
                                 <copy file="src/repository/resources/shindig/index.jsp"
                                       todir="target/shindig"/>-->
 
-                                <concat destfile="target/wso2carbon-core-${carbon.kernal.version}/repository/log4j.properties">
+                                <concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/log4j.properties">
                                     og4j.logger.net.sf.ehcache=ERROR
                                 </concat>
 
@@ -155,16 +155,16 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <!--<copy todir="target/wso2carbon-core-${carbon.kernal.version}/modules"
+                                <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules"
                                       overwrite="true">
                                     <fileset dir="src/repository/modules"></fileset>
                                 </copy>
-                                <copy todir="target/wso2carbon-core-${carbon.kernal.version}/repository/deployment/server/jaggeryapps"
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps"
                                       overwrite="true">
                                     <fileset dir="../apps"></fileset>
                                 </copy>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernal.version}/repository/components/plugins"
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins"
                                       overwrite="true">
                                     <fileset dir="src/repository/components/patches/apimgt"></fileset>
                                 </copy>-->
@@ -185,7 +185,7 @@
                                 <delete dir="target/archive-tmp"/>
                                 <delete dir="target/dependency-maven-plugin-markers"/>
                                 <delete dir="target/maven-archiver"/>
-                                <delete dir="target/wso2carbon-core-${carbon.kernal.version}"/>
+                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
                                 <delete file="target/wso2emm-${project.version}.jar"/>
                                 <delete dir="target/sources"/>
                                 <delete dir="target/site"/>
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index 96440fc22..fcc83cab7 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -7,7 +7,7 @@
 
     <fileSets>
         <fileSet>
-            <directory>target/wso2carbon-core-${carbon.kernal.version}</directory>
+            <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
             <outputDirectory>wso2emm-${pom.version}</outputDirectory>
             <excludes>
                 <exclude>**/*.sh</exclude>
@@ -33,14 +33,14 @@
         </fileSet>
         <!--copying runtimes-->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/lib/runtimes</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory>
             <outputDirectory>wso2emm-${pom.version}/lib/runtimes/</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>target/wso2carbon-core-${carbon.kernal.version}</directory>
+            <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
             <outputDirectory>wso2emm-${pom.version}</outputDirectory>
             <includes>
                 <include>**/*.sh</include>
@@ -60,7 +60,7 @@
         <!--Multitenancy related file -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/multitenancy/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
             <outputDirectory>wso2emm-${pom.version}/repository/conf/multitenancy</outputDirectory>
             <includes>
@@ -73,7 +73,7 @@
 
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/multitenancy/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
             <outputDirectory>wso2emm-${pom.version}/repository/conf</outputDirectory>
             <includes>
@@ -111,7 +111,7 @@
             <fileMode>755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/modules</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
             <includes>
                 <include>*/**</include>
@@ -119,7 +119,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/deployment/server/jaggeryapps
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/
             </outputDirectory>
@@ -136,7 +136,7 @@
         <!--copy jaxrs web app for OAuth feature-->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/deployment/server/webapps
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <includes>
@@ -147,7 +147,7 @@
         <!--copy web app for application authentication feature -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/deployment/server/webapps
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <includes>
@@ -164,7 +164,7 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/security/
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/
             </directory>
             <outputDirectory>wso2emm-${pom.version}/repository/conf/security/</outputDirectory>
             <includes>
@@ -214,7 +214,7 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/dbscripts/service-provider
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
             </directory>
             <outputDirectory>wso2emm-${pom.version}/dbscripts/service-provider</outputDirectory>
             <includes>
@@ -234,7 +234,7 @@
             </outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/modules</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory>
             <outputDirectory>wso2emm-${pom.version}/modules/</outputDirectory>
             <includes>
                 <include>*/**</include>
@@ -273,7 +273,7 @@
     <files>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/tomcat/webapp-classloading.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
             </source>
             <outputDirectory>wso2emm-${pom.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
@@ -281,7 +281,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/tomcat/webapp-classloading-environments.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
             </source>
             <outputDirectory>wso2emm-${pom.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
@@ -294,7 +294,7 @@
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/event-broker.xml
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
             </source>
             <outputDirectory>wso2emm-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
@@ -326,13 +326,13 @@
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernal.version}/bin/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
             <outputDirectory>wso2emm-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernal.version}/bin/version.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
             <outputDirectory>wso2emm-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -390,7 +390,7 @@
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernal.version}/repository/conf/README</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
             <outputDirectory>wso2emm-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -406,31 +406,31 @@
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/user-mgt.xml
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml
             </source>
             <outputDirectory>wso2emm-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0001/lib/org.wso2.carbon.server-${carbon.kernal.version}.jar
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0001/lib/org.wso2.carbon.server-${carbon.kernel.version}.jar
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/lib/</outputDirectory>
         </file>
         <file>
-            <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0001/dbscripts/db2.sql</source>
+            <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0001/dbscripts/db2.sql</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0001/dbscripts/mysql.sql
+            <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0001/dbscripts/mysql.sql
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0003/dbscripts/mysql_cluster.sql
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0003/dbscripts/mysql_cluster.sql
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/</outputDirectory>
             <fileMode>644</fileMode>
@@ -438,19 +438,19 @@
         <!-- Files WSO2-CARBON-PATCH-4.2.0-0002 - Start -->
         <file>
             <source>
-                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0002/repository/conf/security/cipher-text.properties
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/security/cipher-text.properties
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0002/repository/conf/security/cipher-tool.properties
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/security/cipher-tool.properties
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0002/repository/conf/axis2/axis2.xml
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/axis2/axis2.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory>
             <filtered>true</filtered>
@@ -458,7 +458,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0002/repository/conf/axis2/tenant-axis2.xml
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/axis2/tenant-axis2.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory>
             <filtered>true</filtered>
@@ -466,7 +466,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0002/repository/conf/axis2/axis2_client.xml
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0002/repository/conf/axis2/axis2_client.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory>
             <filtered>true</filtered>
@@ -474,7 +474,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0004/repository/conf/carbon.xml
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0004/repository/conf/carbon.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
@@ -485,7 +485,7 @@
         <!-- nTask Component -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/etc/tasks-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
             </source>
             <outputDirectory>wso2emm-${pom.version}/repository/conf/etc</outputDirectory>
         </file>
diff --git a/product/modules/distribution/src/assembly/dist.xml b/product/modules/distribution/src/assembly/dist.xml
index d1bd5ea4f..6eabcb829 100644
--- a/product/modules/distribution/src/assembly/dist.xml
+++ b/product/modules/distribution/src/assembly/dist.xml
@@ -25,7 +25,7 @@
     <fileSets>
         <!-- Copying p2 profile and osgi bundles-->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/components</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
             <outputDirectory>wso2emm-${pom.version}/repository/components</outputDirectory>
             <excludes>
                 <exclude>**/eclipse.ini</exclude>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 4d8a1532f..2bf338b4a 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -48,7 +48,7 @@
                                 <artifactItem>
                                     <groupId>org.wso2.carbon</groupId>
                                     <artifactId>wso2carbon-core</artifactId>
-                                    <version>${carbon.kernal.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>target</outputDirectory>
@@ -101,7 +101,7 @@
                             <featureArtifacts>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.kernal.version}
+                                    org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
                             </featureArtifacts>
 
@@ -120,18 +120,18 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <destination>
-                                ${basedir}/target/wso2carbon-core-${carbon.kernal.version}/repository/components
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
                                 <feature>
                                     <id>org.wso2.carbon.ndatasource.feature.group</id>
-                                    <version>${carbon.kernal.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
 
                                 <feature>
                                     <id>org.wso2.carbon.ndatasource.ui.feature.group</id>
-                                    <version>${carbon.kernal.version}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                             </features>
                         </configuration>
@@ -148,7 +148,7 @@
                         <configuration>
                             <tasks>
                                 <replace token="false" value="true"
-                                         dir="target/wso2carbon-core-${carbon.kernal.version}/repository/components">
+                                         dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">
                                     <include name="**/bundles.info"/>
                                 </replace>
                             </tasks>