From c884cfae23b3967f828b11aaded133b984397efa Mon Sep 17 00:00:00 2001 From: Dulitha Wijewantha Date: Wed, 14 Jan 2015 16:32:12 +0530 Subject: [PATCH] Code formatting --- .../modules/distribution/src/assembly/bin.xml | 128 +++++++++++------- product/modules/p2-profile-gen/pom.xml | 48 +++++-- 2 files changed, 114 insertions(+), 62 deletions(-) diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index e264c68c0d..831c6d6196 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -9,24 +9,26 @@ target/wso2carbon-core-${carbon.kernel.version} wso2cdm-${pom.version} - + - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes + wso2cdm-${pom.version}/lib/runtimes/ */** @@ -46,7 +48,8 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ - wso2cdm-${project.version}/repository/conf/multitenancy + wso2cdm-${project.version}/repository/conf/multitenancy + **/stratos.xml **/multitenancy-packages.xml @@ -67,14 +70,16 @@ src/repository/resources/styles/css - wso2cdm-${project.version}/resources/allthemes/Default/admin + wso2cdm-${project.version}/resources/allthemes/Default/admin + **/**.css src/repository/resources/styles/images - wso2cdm-${project.version}/resources/allthemes/Default/images + wso2cdm-${project.version}/resources/allthemes/Default/images + **/**.gif **/**.png @@ -95,7 +100,8 @@ 755 --> - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules + ${pom.artifactId}-${project.version}/modules/ */** @@ -112,7 +118,8 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ wso2cdm-${project.version}/repository/conf/security/ @@ -122,7 +129,8 @@ src/repository/conf/datasources - wso2cdm-${project.version}/repository/conf/datasources + wso2cdm-${project.version}/repository/conf/datasources + **/master-datasources.xml **/cdm-datasources.xml @@ -138,18 +146,22 @@ src/repository/conf/data-bridge - wso2cdm-${project.version}/repository/conf/data-bridge + wso2cdm-${project.version}/repository/conf/data-bridge + 755 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes + wso2cdm-${project.version}/lib/runtimes/ */** - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider wso2cdm-${project.version}/dbscripts/service-provider @@ -157,9 +169,11 @@ - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity + + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity + wso2cdm-${project.version}/dbscripts/identity */** @@ -167,7 +181,9 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules + wso2cdm-${project.version}/modules/ */** @@ -186,12 +202,12 @@ src/repository/jaggeryapps - wso2cdm-${project.version}/repository/deployment/server/jaggeryapps + wso2cdm-${project.version}/repository/deployment/server/jaggeryapps + 755 - @@ -214,7 +230,8 @@ ../agents/android/jax-rs/target/cdm-android-api.war - wso2cdm-${pom.version}/repository/deployment/server/webapps + wso2cdm-${pom.version}/repository/deployment/server/webapps + 755 - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml + + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml + wso2cdm-${project.version}/repository/conf/etc true 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml + + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml + wso2cdm-${project.version}/repository/conf true 644 - - + + - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml + wso2cdm-${project.version}/repository/conf/security true 644 - + - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml + wso2cdm-${project.version}/repository/conf true 644 @@ -327,7 +352,8 @@ src/repository/conf/multitenancy/cloud-services-desc.xml - wso2cdm-${project.version}/repository/conf/multitenancy/ + wso2cdm-${project.version}/repository/conf/multitenancy/ + true - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml ${pom.artifactId}-${pom.version}/repository/conf true @@ -374,9 +402,12 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml - ${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile + + ${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile + true 644 @@ -386,7 +417,8 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml - ${pom.artifactId}-${pom.version}/repository/conf/tomcat + ${pom.artifactId}-${pom.version}/repository/conf/tomcat + true 644 diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index db84eac3cc..222a7367e1 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -115,15 +115,20 @@ org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version} - org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} + + org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} - org.jaggeryjs.modules:carbon.feature:${carbon.feature.version} + + org.jaggeryjs.modules:carbon.feature:${carbon.feature.version} - org.jaggeryjs.modules:process.feature:${process.feature.version} + + org.jaggeryjs.modules:process.feature:${process.feature.version} - org.jaggeryjs.modules:uuid.feature:${uuid.feature.version} + + org.jaggeryjs.modules:uuid.feature:${uuid.feature.version} - org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} + + org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version} @@ -326,15 +331,19 @@ ${carbon.platform.version} - org.wso2.carbon.identity.thrift.authentication.feature.group + + org.wso2.carbon.identity.thrift.authentication.feature.group + ${carbon.platform.version} - org.wso2.carbon.governance.metadata.server.feature.group + org.wso2.carbon.governance.metadata.server.feature.group + ${carbon.platform.version} - org.wso2.carbon.registry.extensions.server.feature.group + org.wso2.carbon.registry.extensions.server.feature.group + ${carbon.platform.version} @@ -342,11 +351,15 @@ ${carbon.platform.version} - org.wso2.carbon.registry.associations.dependencies.server.feature.group + + org.wso2.carbon.registry.associations.dependencies.server.feature.group + ${carbon.platform.version} - org.wso2.carbon.registry.community.features.server.feature.group + + org.wso2.carbon.registry.community.features.server.feature.group + ${carbon.platform.version} @@ -371,7 +384,9 @@ ${carbon.platform.version} - org.wso2.carbon.identity.application.authentication.framework.server.feature.group + + org.wso2.carbon.identity.application.authentication.framework.server.feature.group + ${carbon.platform.version} @@ -379,11 +394,14 @@ ${carbon.platform.version} - org.wso2.carbon.identity.user.profile.server.feature.group + org.wso2.carbon.identity.user.profile.server.feature.group + ${carbon.platform.version} - org.wso2.carbon.identity.relying.party.server.feature.group + + org.wso2.carbon.identity.relying.party.server.feature.group + ${carbon.platform.version} @@ -391,7 +409,9 @@ ${carbon.platform.version} - org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group + + org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group + ${carbon.platform.version}