Merge branch 'carbon-4.2.0-upgrade'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/04ea1bfc Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/04ea1bfc Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/04ea1bfc Branch: refs/heads/master Commit: 04ea1bfc1508bb0dd7889f42a7ad5bcaacc308ef Parents: 42f8d98 de51de6 Author: Sajith Kariyawasam <[email protected]> Authored: Tue Jan 7 15:21:49 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Tue Jan 7 15:21:49 2014 +0530 ---------------------------------------------------------------------- .../distribution/src/main/assembly/bin.xml | 38 +++++++++--- products/autoscaler/modules/p2-profile/pom.xml | 63 ++++++++++++++++++- .../distribution/src/main/assembly/bin.xml | 41 +++++++++--- .../cloud-controller/modules/p2-profile/pom.xml | 63 ++++++++++++++++++- .../load-balancer/modules/p2-profile/pom.xml | 65 ++++++++++++++++++-- .../modules/distribution/src/assembly/bin.xml | 38 +++++++++--- .../modules/p2-profile-gen/pom.xml | 63 ++++++++++++++++++- 7 files changed, 332 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04ea1bfc/products/stratos-manager/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --cc products/stratos-manager/modules/distribution/src/assembly/bin.xml index 75ae826,0000000..667e14e mode 100755,000000..100755 --- a/products/stratos-manager/modules/distribution/src/assembly/bin.xml +++ b/products/stratos-manager/modules/distribution/src/assembly/bin.xml @@@ -1,640 -1,0 +1,662 @@@ +<!-- + ~ 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. + --> +<assembly> + <!--<id>bin</id>--> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/wso2carbon-core-${carbon.kernel.version}</directory> + <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <excludes> + <exclude>**/*.sh</exclude> + <exclude>**/wso2server.bat</exclude> + <exclude>**/axis2services/sample01.aar</exclude> + <exclude>**/axis2services/echo/**</exclude> + <exclude>**/axis2services/version/**</exclude> + <exclude>**/pom.xml</exclude> + <exclude>**/version.txt</exclude> + <exclude>**/INSTALL.txt</exclude> + <exclude>**/LICENSE.txt</exclude> + <exclude>**/NOTICE</exclude> + <exclude>**/release-notes.html</exclude> + <exclude>**/carbon.xml</exclude> + <exclude>**/README*</exclude> + <!--Removing relying party ui bundle to fix STRATOS-1149 --> + <exclude>**/org.wso2.carbon.identity.relyingparty.ui_4.1.0-SNAPSHOT.jar</exclude> + <exclude>**/org.wso2.carbon.identity.relyingparty.stub_4.1.0-SNAPSHOT.jar</exclude> + <!--Removing roles mgt ui to fix STRATOS-2114--> + <exclude>**/org.wso2.carbon.roles.mgt.ui_4.1.0-SNAPSHOT.jar</exclude> + <exclude>**/org.wso2.carbon.roles.mgt.stub_4.1.0-SNAPSHOT.jar</exclude> + <exclude>**/log4j.properties</exclude> + <exclude>**/repository/components/**</exclude> + </excludes> + </fileSet> + <!-- Copying p2 profile and osgi bundles--> + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory> + <excludes> + <exclude>**/eclipse.ini</exclude> + <exclude>**/*.lock</exclude> + <exclude>**/.data</exclude> + <exclude>**/.settings</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>target/shopping-cart-global-${shoppingcart.global.version}</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/samples/bin</outputDirectory> + <includes> + <include>**/*.car</include> + <include>**/*.properties</include> + </includes> + </fileSet> + <fileSet> + <directory>../../../../components/org.apache.stratos.manager.console</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/console</outputDirectory> + <excludes> + <exclude>**/README</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>target/wso2carbon-core-${carbon.kernel.version}</directory> + <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <excludes> + <exclude>**/daemon.sh</exclude> + <exclude>**/log4j.properties</exclude> + <exclude>**/wso2server.sh</exclude> + <exclude>**/wso2server.bat</exclude> + </excludes> + <includes> + <include>**/*.sh</include> + <include>**/native/*</include> + </includes> + <fileMode>755</fileMode> + </fileSet> + <fileSet> + <directory>../../conf/synapse-configs</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs + </outputDirectory> + </fileSet> + <fileSet> + <directory>../../conf</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/samples-desc.xml</exclude> + <exclude>**/identity.xml</exclude> + <exclude>**/user-mgt.xml</exclude> + <exclude>**/datasources.properties</exclude> + <exclude>.svn</exclude> + <exclude>email-bill-generated.xml</exclude> + <exclude>email-billing-notifications.xml</exclude> + <exclude>email-new-tenant-activation.xml</exclude> + <exclude>email-new-tenant-registration.xml</exclude> + <exclude>email-password-reset.xml</exclude> + <exclude>email-payment-received-customer.xml</exclude> + <exclude>email-registration-payment-received-customer.xml</exclude> + <exclude>email-payment-received-wso2.xml</exclude> + <exclude>email-registration-complete.xml</exclude> + <exclude>email-registration-moderation.xml</exclude> + <exclude>email-registration.xml</exclude> + <exclude>email-update.xml</exclude> + <exclude>tenant-reg-agent.xml</exclude> + <exclude>features-dashboard.xml</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../../conf</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/email</outputDirectory> + <includes> + <include>email-bill-generated.xml</include> + <include>email-billing-notifications.xml</include> + <include>email-new-tenant-activation.xml</include> + <include>email-new-tenant-registration.xml</include> + <include>email-password-reset.xml</include> + <include>email-payment-received-customer.xml</include> + <include>email-registration-payment-received-customer.xml</include> + <include>email-payment-received-wso2.xml</include> + <include>email-registration-complete.xml</include> + <include>email-registration-moderation.xml</include> + <include>email-registration.xml</include> + <include>email-update.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>../../conf</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory> + <includes> + <include>tenant-reg-agent.xml</include> + <include>features-dashboard.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>../../conf</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory> + <includes> + <include>stratos-datasources.xml</include> + </includes> + </fileSet> + + <!-- Copying themes, cloud icons--> + <fileSet> + <directory>../../resources</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/resources</outputDirectory> + <fileMode>755</fileMode> + <includes> + <include>allthemes/**</include> + <include>powerded-by-logos/**</include> + </includes> + <excludes> + <exclude>.svn</exclude> + </excludes> + </fileSet> + + <!--start BAM related files --> + <!--<fileSet> + <directory>resources/dataservices</directory> + <outputDirectory> + ${pom.artifactId}-${pom.version}/repository/deployment/server/dataservices + </outputDirectory> + <includes> + <include>*.dbs</include> + <include>*.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>resources/dataservices/bam</directory> + <outputDirectory> + ${pom.artifactId}-${pom.version}/repository/deployment/server/dataservices + </outputDirectory> + <includes> + <include>*.dbs</include> + <include>*.xml</include> + </includes> + </fileSet>--> + + <fileSet> + <directory>resources</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + <!--fileSet> + <directory>resources/dbscripts</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet--> + <!--end BAM related files --> + + <!--qpid related files --> + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/advanced</outputDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/jmx.xml</exclude> + <exclude>**/tenant-axis2.xml</exclude> + <exclude>**/authenticators.xml</exclude> + <exclude>**/logging-config.xml</exclude> + </excludes> + </fileSet> + <!-- end of qpid related files --> + + <!-- adc.mgt related files --> + <fileSet> + <!--directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory--> + <directory>src/main/conf/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <includes> + <include>cartridge-config.properties</include> + <include>policies.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + <includes> + <include>policies.xsd</include> + </includes> + </fileSet> + <!-- end of adc.mgt related files --> + + <fileSet> + <directory>../p2-profile/target/wso2carbon-core-${carbon.platform.version}/repository/conf/etc/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + <includes> + <include>**/cassandra.yaml</include> + </includes> + </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <includes> + <include>**/identity.xml</include> + <include>**/rule-engine-config.xml</include> + </includes> + </fileSet> + + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory> + <includes> + <include>**/multitenancy-packages.xml</include> + <include>**/stratos.xml</include> + <include>**/eula.xml</include> + <include>**/usage-throttling-agent-config.xml</include> + <!--include>**/cloud-services-desc.xml</include--> + </includes> + </fileSet> + + <!-- copy the landing page webapp --> + <fileSet> + <directory>lib/home</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory> + </fileSet> + + <fileSet> + <directory>../../modules/features-dashboard/target/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory> + <includes> + <include>**/*.war</include> + </includes> + </fileSet> + <fileSet> + <directory>../../resources/cloud-services-icons/target/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory> + <includes> + <include>**/*.war</include> + </includes> + </fileSet> + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity</outputDirectory> + <includes> + <include>**/**.sql</include> + </includes> + </fileSet> + + <!-- copy cxf runtime --> + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/lib/runtimes/</outputDirectory> + <includes> + <include>*/**</include> + </includes> + </fileSet> + + <!-- copy jaggery modules --> + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/modules</outputDirectory> + <includes> + <include>*/**</include> + </includes> + </fileSet> + + <!-- copy the billing h2 db --> + <fileSet> + <directory>target/database</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> + </fileSet> - <!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 --> - <fileSet> - <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> - <includes> - <include>**/patch0002/axis2_1.6.1.wso2v9.jar</include> - </includes> - </fileSet> ++ ++ <!-- Kernel Patches--> ++ <fileSet> ++ <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory> ++ <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> ++ <includes> ++ <include>**/patch0001/*.*</include> ++ </includes> ++ </fileSet> ++ <fileSet> ++ <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002</directory> ++ <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> ++ <includes> ++ <include>**/patch0002/*.*</include> ++ </includes> ++ </fileSet> ++ <fileSet> ++ <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003</directory> ++ <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> ++ <includes> ++ <include>**/patch0003/*.*</include> ++ </includes> ++ </fileSet> ++ <fileSet> ++ <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004</directory> ++ <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> ++ <includes> ++ <include>**/patch0004/*.*</include> ++ </includes> ++ </fileSet> + <fileSet> + <directory>../../dbscripts/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory> + </fileSet> + <fileSet> + <directory>../../payload</directory> + <includes> + <include>user-data</include> + </includes> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory> + </fileSet> + <fileSet> + <directory>../../payload/user-data/</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/user-data</outputDirectory> + </fileSet> + </fileSets> + + <dependencySets> + <dependencySet> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/lib</outputDirectory> + <includes> + <include>bouncycastle:bcprov-jdk15:jar</include> + </includes> + </dependencySet> + <!-- use the new tool to create a bundles --> + <dependencySet> + <outputDirectory>${pom.artifactId}-${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> + <includes> + <include>org.apache.axis2:addressing:mar</include> + <include>org.apache.rampart:rampart:mar</include> + <include>org.apache.sandesha2:sandesha2:mar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension} + </outputFileNameMapping> + </dependencySet> + <dependencySet> + <outputDirectory>wso2elb-${pom.version}/samples/axis2Server/repository/modules + </outputDirectory> + <includes> + <include>org.apache.axis2:addressing:mar</include> + <include>org.apache.rampart:rampart:mar</include> + <include>org.apache.sandesha2:sandesha2:mar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension} + </outputFileNameMapping> + </dependencySet--> + <dependencySet> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/axis2/client/lib</outputDirectory> + <includes> + <include>bouncycastle:bcprov-jdk15:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension} + </outputFileNameMapping> + </dependencySet> + <dependencySet> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/client/modules + </outputDirectory> + <includes> + <include>org.apache.rampart:rampart:mar</include> + </includes> + </dependencySet> + <!--<dependencySet> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory> + <includes> + <include>org.wso2.carbon:features-dashboard:war</include> + </includes> + </dependencySet>--> + </dependencySets> + + <files> + <file> + <source>INSTALL.txt</source> + <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>../../conf/samples-desc.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>src/main/notice/NOTICE</source> + <outputDirectory>apache-stratos-manager-${pom.version}</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>src/main/license/LICENSE</source> + <outputDirectory>apache-stratos-manager-${pom.version}</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>../../conf/datasources.properties</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <!-- copy custome webapp classLoading files --> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + + <!--file> + <source>../../conf/cartridge-config.properties</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file--> + <file> + <source>../../conf/cloud-services-desc.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>README.txt</source> + <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>LICENSE.txt</source> + <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>release-notes.html</source> + <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <filtered>true</filtered> + </file> + <file> + <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source> + + <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source> + <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <!--file> + <source>target/wso2carbon-core-${carbon.kernel.version}/bin/wso2server.bat</source> + <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file--> + <!--file> + <source>bam-resources/bam.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file--> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/userRP.jks</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/</outputDirectory> + <fileMode>644</fileMode> + </file> + <!--file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file--> + + <!-- Including logging-config.xml file --> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory> + </file> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + </file> + <file> + <source>src/bin/stratos.sh</source> + <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> + <file> + <source>src/bin/stratos.bat</source> + <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> + <file> + <source>src/bin/git-folder-structure.sh</source> + <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> + <file> + <source>src/bin/manage-git-repo.sh</source> + <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> + <file> + <source>src/bin/set-mysql-password.sh</source> + <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> + <file> + <source>src/bin/add_entry_zone_file.sh</source> + <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> + <file> + <source>src/bin/remove_entry_zone_file.sh</source> + <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> + <file> + <source>src/bin/update-instance.sh</source> + <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory> + <filtered>true</filtered> + <fileMode>755</fileMode> + </file> + <!-- Including log4j.properties file --> + <!--file> + <source> + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties + + </source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + </file--> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + + <!--file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/sso-idp-config.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> + </file--> + + <!-- Including coordination-client-config.xml file --> + <!--<file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + </file> --> + <!-- Ntask config file --> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + </file> + <file> + <source>../../conf/zoo.cfg</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> + </file> + <file> + <source>../../conf/jaas.conf</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory> + <destName>jaas.conf</destName> + <filtered>true</filtered> + </file> + <!-- REST endpoint webapp --> + <file> + <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/stratos.war</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory> + <fileMode>644</fileMode> + </file> + <!-- End of REST endpoint webapp --> + </files> +</assembly> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04ea1bfc/products/stratos-manager/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --cc products/stratos-manager/modules/p2-profile-gen/pom.xml index bae1793,0000000..a07e0c6 mode 100644,000000..100644 --- a/products/stratos-manager/modules/p2-profile-gen/pom.xml +++ b/products/stratos-manager/modules/p2-profile-gen/pom.xml @@@ -1,421 -1,0 +1,478 @@@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ 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-manager-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>stratos-manager-profile-gen</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos Manager - Profile Generation</name> + <url>http://apache.org</url> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>1-unpack-p2-agent-distribution</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> + <artifactId>wso2carbon-core</artifactId> + <version>${carbon.kernel.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> - <!-- <execution> ++ <execution> + <id>2-unpack-kernel-patch</id> + <phase>test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.wso2.carbon</groupId> - <artifactId>WSO2-CARBON-PATCH-4.1.0</artifactId> ++ <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> ++ <version>0001</version> ++ <type>zip</type> ++ <overWrite>true</overWrite> ++ <outputDirectory>target</outputDirectory> ++ </artifactItem> ++ </artifactItems> ++ </configuration> ++ </execution> ++ <execution> ++ <id>3-unpack-kernel-patch</id> ++ <phase>test</phase> ++ <goals> ++ <goal>unpack</goal> ++ </goals> ++ <configuration> ++ <artifactItems> ++ <artifactItem> ++ <groupId>org.wso2.carbon</groupId> ++ <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> + <version>0002</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> - </execution> --> ++ </execution> ++ <execution> ++ <id>4-unpack-kernel-patch</id> ++ <phase>test</phase> ++ <goals> ++ <goal>unpack</goal> ++ </goals> ++ <configuration> ++ <artifactItems> ++ <artifactItem> ++ <groupId>org.wso2.carbon</groupId> ++ <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> ++ <version>0003</version> ++ <type>zip</type> ++ <overWrite>true</overWrite> ++ <outputDirectory>target</outputDirectory> ++ </artifactItem> ++ </artifactItems> ++ </configuration> ++ </execution> ++ <execution> ++ <id>5-unpack-kernel-patch</id> ++ <phase>test</phase> ++ <goals> ++ <goal>unpack</goal> ++ </goals> ++ <configuration> ++ <artifactItems> ++ <artifactItem> ++ <groupId>org.wso2.carbon</groupId> ++ <artifactId>WSO2-CARBON-PATCH-4.2.0</artifactId> ++ <version>0004</version> ++ <type>zip</type> ++ <overWrite>true</overWrite> ++ <outputDirectory>target</outputDirectory> ++ </artifactItem> ++ </artifactItems> ++ </configuration> ++ </execution> + </executions> + </plugin> + <plugin> + <groupId>org.wso2.maven</groupId> + <artifactId>carbon-p2-plugin</artifactId> + <version>1.5.3</version> + <executions> + <execution> + <id>2-p2-repo-generation</id> + <phase>package</phase> + <goals> + <goal>p2-repo-gen</goal> + </goals> + <configuration> + <p2AgentLocation>${basedir}/target/p2-agent</p2AgentLocation> + <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> + <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> + <publishArtifacts>true</publishArtifacts> + <publishArtifactRepository>true</publishArtifactRepository> + <featureArtifacts> + <!--**************************************************Manager features start*********************************************--> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.version}</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.ntask.feature:${carbon.version}</featureArtifactDef> + <!-- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.coordination.core.feature:${carbon.version}</featureArtifactDef> --> + <!-- registry related features--> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.version}</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.version}</featureArtifactDef> + <!-- Features related to Cloud Manger --> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.common.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.tenant.activity.server.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.usage.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.usage.agent.feature:${project.version} + </featureArtifactDef> + <!--featureArtifactDef> + org.apache.stratos:org.apache.stratos.throttling.manager.feature:${project.version} + </featureArtifactDef--> +<!-- <featureArtifactDef> + org.apache.stratos:org.apache.stratos.throttling.agent.feature:${project.version} + </featureArtifactDef> --> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.version} + </featureArtifactDef> + <!--featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.billing.server.feature:2.1.3 + </featureArtifactDef--> + <!--featuredArtifactDef> + org.wso2.carbon:org.wso2.carbon.rule.service.server.feature:${carbon.version} + </featuredArtifactDef--> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.logging.mgt.feature:${project.version} + </featureArtifactDef> + <!--featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.billing.ui.feature:${stratos.component.version} + </featureArtifactDef--> + <!-- Security Mgt feature to manage key stores --> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.webapp.mgt.server.feature:${carbon.version} + </featureArtifactDef> + <!-- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.admin.mgt.server.feature:${carbon.version}</featureArtifactDef> --> + <!-- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.admin.mgt.ui.feature:${carbon.version}</featureArtifactDef> --> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt.server.feature:${carbon.version}</featureArtifactDef> + <!-- start BAM feature --> + <featureArtifactDef>org.wso2.carbon:org.apache.synapse.wso2.feature:2.1.1-wso2v4</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.version}</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.version}</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.transaction.manager.feature:${carbon.version}</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.service.mgt.server.feature:4.2.1</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.transport.mgt.server.feature:${carbon.version}</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.version}</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.version}</featureArtifactDef> + <!--featureArtifactDef>org.wso2.carbon:org.wso2.carbon.reporting.server.feature:${carbon.version}</featureArtifactDef--> + <!-- end BAM features --> + <!-- GApp SSO features --> + + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.feature:${carbon.version} + </featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.feature:${carbon.version} + </featureArtifactDef> + <!-- End GApp SSO features --> + + <!-- Status Monitor Feature. Uncomment, if you want the manager to be used as a Stratos Status Monitor --> + <!--featureArtifactDef>org.wso2.carbon:org.wso2.carbon.status.monitor.feature:${stratos.version}</featurecomponent.ArtifactDef--> + + <!--Adding sso and registry ui features to make the manager self contained--> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.identity.sso.saml.feature:${carbon.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:2.2.0 + </featureArtifactDef> + + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.registry.ui.menu.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.feature:${carbon.version}</featureArtifactDef> --> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version}</featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.rm.server.feature:4.2.0</featureArtifactDef> + <featureArtifactDef>org.apache.stratos:org.apache.stratos.adc.mgt.feature:${project.version}</featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.cartridge.mgt.ui.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.apache.stratos:org.apache.stratos.rest.endpoint.feature:${project.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${wso2carbon.version} + </featureArtifactDef> + <featureArtifactDef> + org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${wso2carbon.version} + </featureArtifactDef> + <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:4.2.1</featureArtifactDef> + <!--**************************************************Manager features end*********************************************--> + + + </featureArtifacts> + </configuration> + </execution> + + + + <execution> + <id>3-p2-profile-generation</id> + <phase>package</phase> + <goals> + <goal>p2-profile-gen</goal> + </goals> + <configuration> + <profile>default</profile> + <p2AgentLocation>${basedir}/target/p2-agent</p2AgentLocation> + <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> + <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> + <destination>${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components</destination> + <deleteOldProfileFiles>true</deleteOldProfileFiles> + <features> + <!--****************************************Manager features start*********************************************--> + <feature> + <id>org.wso2.carbon.registry.ui.menu.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.identity.sso.saml.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.stratos.identity.saml2.sso.mgt.feature.group</id> + <version>2.2.0</version> + </feature> + <feature> + <id>org.apache.stratos.logging.mgt.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.databridge.datapublisher.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.security.mgt.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.registry.core.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.registry.resource.properties.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.webapp.mgt.server.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.ntask.feature.group</id> + <version>${carbon.version}</version> + </feature> + <!-- <feature> + <id>org.wso2.carbon.coordination.core.feature.group</id> + <version>${carbon.version}</version> + </feature>--> + + <feature> + <id>org.apache.stratos.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.common.feature.group</id> + <version>${project.version}</version> + </feature> + <!-- start BAM --> + <feature> + <id>org.apache.synapse.wso2.feature.group</id> + <version>2.1.1-wso2v4</version> + </feature> + <!-- <feature> + <id>org.wso2.carbon.task.server.feature.group</id> + <version>${carbon.version}</version> + </feature> --> + <feature> + <id>org.wso2.carbon.transaction.manager.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.transport.mgt.server.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.event.server.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.event.common.feature.group</id> + <version>${carbon.version}</version> + </feature> + <!-- <feature> + <id>org.wso2.carbon.admin.mgt.server.feature.group</id> + <version>${carbon.version}</version> + </feature> --> + <!-- <feature> + <id>org.wso2.carbon.admin.mgt.ui.feature.group</id> + <version>${carbon.version}</version> + </feature> --> + <feature> + <id>org.wso2.carbon.captcha.mgt.server.feature.group</id> + <version>${carbon.version}</version> + </feature> + + <!-- Status Monitor Feature. Uncomment, if you want the manager to be used as a Stratos Status Monitor --> + <!--feature> + <id>org.wso2.carbon.status.monitor.feature.group</id> + <version>${stratos.version}</version> + </feature--> + + <!-- GApp SSO features --> + <feature> + <id>org.wso2.carbon.identity.core.feature.group</id> + <version>${carbon.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.identity.relying.party.feature.group</id> + <version>${carbon.version}</version> + </feature> + <!--End GApp SSO features --> + + <feature> + <id>org.apache.stratos.usage.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.usage.agent.feature.group</id> + <version>${project.version}</version> + </feature> + <!--feature> + <id>org.apache.stratos.throttling.manager.feature.group</id> + <version>${project.version}</version> + </feature--> +<!-- <feature> + <id>org.apache.stratos.throttling.agent.feature.group</id> + <version>${project.version}</version> + </feature>--> + <!--feature> + <id>org.wso2.carbon.billing.server.feature.group</id> + <version>2.1.3</version> + </feature--> + <!--feature> + <id>org.wso2.carbon.billing.ui.feature.group</id> + <version>${stratos.component.version}</version> + </feature--> + <!--feature> + <id>org.wso2.carbon.rule.service.server.feature.group</id> + <version>${carbon.version}</version> + </feature--> + <!--feature> + <id>org.wso2.carbon.reporting.server.feature.group</id> + <version>${carbon.version}</version> + </feature--> + <feature> + <id>org.apache.stratos.tenant.activity.server.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.adc.mgt.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.cartridge.mgt.ui.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.apache.stratos.rest.endpoint.feature.group</id> + <version>${project.version}</version> + </feature> + <feature> + <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id> + <version>${wso2carbon.version}</version> + </feature> + <!--****************************************Manager features end*********************************************--> + </features> + + </configuration> + </execution> + + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <configuration> + <tasks> + <replace token="false" value="true" + dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"> + <include name="**/bundles.info"/> + </replace> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
