From 41d372536d2cae84c657d124044106d503b43093 Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Thu, 4 Dec 2014 11:58:39 +0530 Subject: [PATCH] Fixing bin xml to add bin folder --- product/modules/distribution/pom.xml | 43 +++---- .../modules/distribution/src/assembly/bin.xml | 118 +++++++++--------- .../distribution/src/assembly/dist.xml | 4 +- .../distribution/src/assembly/docs.xml | 2 +- .../src/assembly/filter.properties | 2 +- 5 files changed, 85 insertions(+), 84 deletions(-) diff --git a/product/modules/distribution/pom.xml b/product/modules/distribution/pom.xml index 81d0999a465..c326a514ef6 100644 --- a/product/modules/distribution/pom.xml +++ b/product/modules/distribution/pom.xml @@ -104,16 +104,16 @@ - + - + + dir="${tempdir}/wso2cdm-${project.version}/repository/components"> @@ -178,7 +178,7 @@ - + @@ -197,7 +197,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.5.2 + 1-pre-dist @@ -217,21 +217,22 @@ - + + 2-dist + package + + attached + + + false + + ${basedir}/src/assembly/filter.properties + + + ${basedir}/src/assembly/bin.xml + + + diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index 3a3fbc673aa..a6b60078ef0 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -1,5 +1,5 @@ - + bin zip @@ -8,8 +8,8 @@ target/wso2carbon-core-${carbon.kernel.version} - wso2emm-${project.version} - + wso2cdm-${pom.version} + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes - wso2emm-${project.version}/lib/runtimes/ + wso2cdm-${pom.version}/lib/runtimes/ */** target/wso2carbon-core-${carbon.kernel.version} - wso2emm-${project.version} + wso2cdm-${pom.version} **/*.sh 755 - + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ - wso2emm-${project.version}/repository/conf/multitenancy + wso2cdm-${project.version}/repository/conf/multitenancy **/stratos.xml **/multitenancy-packages.xml @@ -68,7 +68,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ - wso2emm-${project.version}/repository/conf + wso2cdm-${project.version}/repository/conf **/tenant-mgt.xml @@ -76,14 +76,14 @@ src/repository/resources/styles/css - wso2emm-${project.version}/resources/allthemes/Default/admin + wso2cdm-${project.version}/resources/allthemes/Default/admin **/**.css src/repository/resources/styles/images - wso2emm-${project.version}/resources/allthemes/Default/images + wso2cdm-${project.version}/resources/allthemes/Default/images **/**.gif **/**.png @@ -94,13 +94,13 @@ target/site - wso2emm-${project.version}/docs + wso2cdm-${project.version}/docs 755 src/repository/resources/stratos_root - wso2emm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT + wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT 755 @@ -110,7 +110,7 @@ */** - + - + + <!–copy web app for application authentication feature –> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps @@ -146,10 +146,10 @@ authenticationendpoint.war - + --> src/repository/conf - wso2emm-${project.version}/repository/conf + wso2cdm-${project.version}/repository/conf **/api-manager.xml **/sso-idp-config.xml @@ -159,7 +159,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ - wso2emm-${project.version}/repository/conf/security/ + wso2cdm-${project.version}/repository/conf/security/ **/entitlement.properties **/trusted-idp-config.xml @@ -167,14 +167,14 @@ src/repository/conf/datasources - wso2emm-${project.version}/repository/conf/datasources + wso2cdm-${project.version}/repository/conf/datasources **/master-datasources.xml src/repository/resources - wso2emm-${project.version}/repository/resources + wso2cdm-${project.version}/repository/resources */** @@ -182,12 +182,12 @@ src/repository/conf/data-bridge - wso2emm-${project.version}/repository/conf/data-bridge + wso2cdm-${project.version}/repository/conf/data-bridge 755 ../p2-profile-gen/target/wso2carbon-core-${carbon.version}/lib/runtimes - wso2emm-${project.version}/lib/runtimes/ + wso2cdm-${project.version}/lib/runtimes/ */** @@ -195,14 +195,14 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider - wso2emm-${project.version}/dbscripts/service-provider + wso2cdm-${project.version}/dbscripts/service-provider */** ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules - wso2emm-${project.version}/modules/ + wso2cdm-${project.version}/modules/ */** @@ -212,7 +212,7 @@ src/repository/dbscripts/ - wso2emm-${project.version}/dbscripts + wso2cdm-${project.version}/dbscripts */** @@ -222,13 +222,13 @@ - wso2emm-${project.version}/lib/endorsed + wso2cdm-${project.version}/lib/endorsed javax.el:el-api:jar - wso2emm-${project.version}/repository/deployment/client/modules + wso2cdm-${project.version}/repository/deployment/client/modules org.hibernate.wso2:hibernate:jar @@ -238,11 +238,11 @@ - + src/repository/conf/tomcat/context.xml - wso2emm-${project.version}/repository/conf/tomcat + wso2cdm-${project.version}/repository/conf/tomcat true 644 - + INSTALL.txt - wso2emm-${project.version} + wso2cdm-${project.version} true 644 README.txt - wso2emm-${project.version} + wso2cdm-${project.version} true 644 LICENSE.txt - wso2emm-${project.version} + wso2cdm-${project.version} true 644 release-notes.html - wso2emm-${project.version} + wso2cdm-${project.version} true 644 target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt - wso2emm-${project.version}/bin/ + wso2cdm-${project.version}/bin/ true 644 target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt - wso2emm-${project.version}/bin/ + wso2cdm-${project.version}/bin/ true 644 - + - src/repository/conf/log4j.properties - wso2emm-${project.version}/repository/conf/ + target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties + wso2cdm-${project.version}/repository/conf/ true src/repository/conf/multitenancy/cloud-services-desc.xml - wso2emm-${project.version}/repository/conf/multitenancy/ + wso2cdm-${project.version}/repository/conf/multitenancy/ true src/repository/conf/axis2/axis2.xml - wso2emm-${project.version}/repository/conf/axis2/ + wso2cdm-${project.version}/repository/conf/axis2/ true 644 src/repository/conf/application-authenticators.xml - wso2emm-${project.version}/repository/conf/security/ + wso2cdm-${project.version}/repository/conf/security/ true 644 target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README - wso2emm-${project.version}/repository/conf/ + wso2cdm-${project.version}/repository/conf/ true 644 src/repository/conf/identity.xml - wso2emm-${project.version}/repository/conf + wso2cdm-${project.version}/repository/conf 644 src/repository/database/WSO2EMM_DB.h2.db - wso2emm-${project.version}/repository/database + wso2cdm-${project.version}/repository/database 644 - + diff --git a/product/modules/distribution/src/assembly/dist.xml b/product/modules/distribution/src/assembly/dist.xml index 35210c3bacd..d0a9a55a8d9 100644 --- a/product/modules/distribution/src/assembly/dist.xml +++ b/product/modules/distribution/src/assembly/dist.xml @@ -16,7 +16,7 @@ ~ under the License. --> - 1-pre-dist + wso2-cdm-dist zip @@ -26,7 +26,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components - wso2emm-${project.version}/repository/components + wso2cdm-${project.version}/repository/components **/eclipse.ini **/*.lock diff --git a/product/modules/distribution/src/assembly/docs.xml b/product/modules/distribution/src/assembly/docs.xml index 7d7a026e7eb..51539b58bbe 100644 --- a/product/modules/distribution/src/assembly/docs.xml +++ b/product/modules/distribution/src/assembly/docs.xml @@ -25,7 +25,7 @@ target/site - wso2emm-${project.version}-docs + wso2cdm-${project.version}-docs ../../modules/documentation/src/site/xdoc/user-core diff --git a/product/modules/distribution/src/assembly/filter.properties b/product/modules/distribution/src/assembly/filter.properties index bd8f07d1e08..a0ebf6302ad 100644 --- a/product/modules/distribution/src/assembly/filter.properties +++ b/product/modules/distribution/src/assembly/filter.properties @@ -1,6 +1,6 @@ product.name=WSO2 Connected Device Manager product.version=2.0.0-SNAPSHOT -product.key=EMM +product.key=CDM hotdeployment=true hotupdate=true carbon.version=4.3.0