From 1ee862ed83d003676875aa71491e9296288b621c Mon Sep 17 00:00:00 2001 From: Niranjan-K 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 876336192c..7da7c90c12 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ - 4.2.0 + 4.2.0 1.5.4 1.3 diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml index 3a92ac0a97..3d0be22f8d 100644 --- a/product/modules/distribution/pom.xml +++ b/product/modules/distribution/pom.xml @@ -83,7 +83,7 @@ org.wso2.carbon wso2carbon-core - ${carbon.kernal.version} + ${carbon.kernel.version} zip true target @@ -118,7 +118,7 @@ - @@ -141,7 +141,7 @@ --> - + og4j.logger.net.sf.ehcache=ERROR @@ -155,16 +155,16 @@ package - @@ -185,7 +185,7 @@ - + diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index 96440fc229..fcc83cab7e 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -7,7 +7,7 @@ - target/wso2carbon-core-${carbon.kernal.version} + target/wso2carbon-core-${carbon.kernel.version} wso2emm-${pom.version} **/*.sh @@ -33,14 +33,14 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/lib/runtimes + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes wso2emm-${pom.version}/lib/runtimes/ */** - target/wso2carbon-core-${carbon.kernal.version} + target/wso2carbon-core-${carbon.kernel.version} wso2emm-${pom.version} **/*.sh @@ -60,7 +60,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/multitenancy/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ wso2emm-${pom.version}/repository/conf/multitenancy @@ -73,7 +73,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/multitenancy/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ wso2emm-${pom.version}/repository/conf @@ -111,7 +111,7 @@ 755 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/modules + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules ${pom.artifactId}-${pom.version}/modules/ */** @@ -119,7 +119,7 @@ - ../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 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/ @@ -136,7 +136,7 @@ - ../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 ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps @@ -147,7 +147,7 @@ - ../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 ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps @@ -164,7 +164,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/security/ + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ wso2emm-${pom.version}/repository/conf/security/ @@ -214,7 +214,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/dbscripts/service-provider + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider wso2emm-${pom.version}/dbscripts/service-provider @@ -234,7 +234,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/modules + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules wso2emm-${pom.version}/modules/ */** @@ -273,7 +273,7 @@ - ../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 wso2emm-${pom.version}/repository/conf/tomcat true @@ -281,7 +281,7 @@ - ../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 wso2emm-${pom.version}/repository/conf/tomcat true @@ -294,7 +294,7 @@ 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/event-broker.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml wso2emm-${pom.version}/repository/conf/ true @@ -326,13 +326,13 @@ 644 - target/wso2carbon-core-${carbon.kernal.version}/bin/README.txt + target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt wso2emm-${pom.version}/bin/ true 644 - target/wso2carbon-core-${carbon.kernal.version}/bin/version.txt + target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt wso2emm-${pom.version}/bin/ true 644 @@ -390,7 +390,7 @@ 644 - target/wso2carbon-core-${carbon.kernal.version}/repository/conf/README + target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README wso2emm-${pom.version}/repository/conf/ true 644 @@ -406,31 +406,31 @@ 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/conf/user-mgt.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml wso2emm-${pom.version}/repository/conf/ true - ../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 ${pom.artifactId}-${pom.version}/lib/ - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0001/dbscripts/db2.sql + ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0001/dbscripts/db2.sql ${pom.artifactId}-${pom.version}/dbscripts/ 644 - ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernal.version}-0001/dbscripts/mysql.sql + ../p2-profile-gen/target/WSO2-CARBON-PATCH-${carbon.kernel.version}-0001/dbscripts/mysql.sql ${pom.artifactId}-${pom.version}/dbscripts/ 644 - ../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 ${pom.artifactId}-${pom.version}/dbscripts/ 644 @@ -438,19 +438,19 @@ - ../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 ${pom.artifactId}-${pom.version}/repository/conf/security/ - ../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 ${pom.artifactId}-${pom.version}/repository/conf/security/ - ../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 ${pom.artifactId}-${pom.version}/repository/conf/axis2/ true @@ -458,7 +458,7 @@ - ../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 ${pom.artifactId}-${pom.version}/repository/conf/axis2/ true @@ -466,7 +466,7 @@ - ../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 ${pom.artifactId}-${pom.version}/repository/conf/axis2/ true @@ -474,7 +474,7 @@ - ../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 ${pom.artifactId}-${pom.version}/repository/conf/ true @@ -485,7 +485,7 @@ - ../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 wso2emm-${pom.version}/repository/conf/etc diff --git a/product/modules/distribution/src/assembly/dist.xml b/product/modules/distribution/src/assembly/dist.xml index d1bd5ea4f9..6eabcb8292 100644 --- a/product/modules/distribution/src/assembly/dist.xml +++ b/product/modules/distribution/src/assembly/dist.xml @@ -25,7 +25,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernal.version}/repository/components + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components wso2emm-${pom.version}/repository/components **/eclipse.ini diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index 4d8a1532fa..2bf338b4a1 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -48,7 +48,7 @@ org.wso2.carbon wso2carbon-core - ${carbon.kernal.version} + ${carbon.kernel.version} zip true target @@ -101,7 +101,7 @@ - org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.kernal.version} + org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.kernel.version} @@ -120,18 +120,18 @@ file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo - ${basedir}/target/wso2carbon-core-${carbon.kernal.version}/repository/components + ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components true org.wso2.carbon.ndatasource.feature.group - ${carbon.kernal.version} + ${carbon.kernel.version} org.wso2.carbon.ndatasource.ui.feature.group - ${carbon.kernal.version} + ${carbon.kernel.version} @@ -148,7 +148,7 @@ + dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">