Updated Branches: refs/heads/master a5883c3f3 -> fadde578b
Including 4.2.0 kernel patches , patch0001 to patch0004 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/de51de64 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/de51de64 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/de51de64 Branch: refs/heads/master Commit: de51de64f1bc858054bd30537595bf596af8b6b9 Parents: 5b14b03 Author: Sajith Kariyawasam <[email protected]> Authored: Tue Jan 7 15:19:59 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Tue Jan 7 15:19:59 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/de51de64/products/autoscaler/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml index da5224c..ddee2ed 100644 --- a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml +++ b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml @@ -162,15 +162,35 @@ </includes> </fileSet> - <!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 --> - <!-- N/A for carbon 4.2.0 --> - <!--fileSet> - <directory>../p2-profile/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/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/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/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/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>src/main/autoscale-policies</directory> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/de51de64/products/autoscaler/modules/p2-profile/pom.xml ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/p2-profile/pom.xml b/products/autoscaler/modules/p2-profile/pom.xml index c27ed79..ccad5c6 100644 --- a/products/autoscaler/modules/p2-profile/pom.xml +++ b/products/autoscaler/modules/p2-profile/pom.xml @@ -61,7 +61,7 @@ </artifactItems> </configuration> </execution> - <!--execution> + <execution> <id>2-unpack-kernel-patch</id> <phase>test</phase> <goals> @@ -71,7 +71,26 @@ <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> @@ -79,7 +98,45 @@ </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> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/de51de64/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml index e1589e0..5845fa4 100644 --- a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml +++ b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml @@ -162,15 +162,38 @@ </includes> </fileSet> - <!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 --> - <!-- N/A for carbon 4.2.0 --> - <!--fileSet> - <directory>../p2-profile/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/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/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/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/target/WSO2-CARBON-PATCH-4.2.0-0004</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory> + <includes> + <include>**/patch0004/*.*</include> + </includes> + </fileSet> + + + </fileSets> <dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/de51de64/products/cloud-controller/modules/p2-profile/pom.xml ---------------------------------------------------------------------- diff --git a/products/cloud-controller/modules/p2-profile/pom.xml b/products/cloud-controller/modules/p2-profile/pom.xml index 4e8082c..a116466 100644 --- a/products/cloud-controller/modules/p2-profile/pom.xml +++ b/products/cloud-controller/modules/p2-profile/pom.xml @@ -61,7 +61,7 @@ </artifactItems> </configuration> </execution> - <!--execution> + <execution> <id>2-unpack-kernel-patch</id> <phase>test</phase> <goals> @@ -71,7 +71,26 @@ <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> @@ -79,7 +98,45 @@ </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> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/de51de64/products/load-balancer/modules/p2-profile/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/p2-profile/pom.xml b/products/load-balancer/modules/p2-profile/pom.xml index 05f6d19..f7d9855 100755 --- a/products/load-balancer/modules/p2-profile/pom.xml +++ b/products/load-balancer/modules/p2-profile/pom.xml @@ -60,8 +60,8 @@ </artifactItems> </configuration> </execution> - <!--execution> - <id>unpack-kernel-patch</id> + <execution> + <id>2-unpack-kernel-patch</id> <phase>test</phase> <goals> <goal>unpack</goal> @@ -70,7 +70,26 @@ <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> @@ -78,7 +97,45 @@ </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> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/de51de64/products/stratos-controller/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos-controller/modules/distribution/src/assembly/bin.xml b/products/stratos-controller/modules/distribution/src/assembly/bin.xml index 60aff65..4ff3685 100755 --- a/products/stratos-controller/modules/distribution/src/assembly/bin.xml +++ b/products/stratos-controller/modules/distribution/src/assembly/bin.xml @@ -325,14 +325,36 @@ <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> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/de51de64/products/stratos-controller/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos-controller/modules/p2-profile-gen/pom.xml b/products/stratos-controller/modules/p2-profile-gen/pom.xml index 1610333..416c7e1 100644 --- a/products/stratos-controller/modules/p2-profile-gen/pom.xml +++ b/products/stratos-controller/modules/p2-profile-gen/pom.xml @@ -60,7 +60,7 @@ </artifactItems> </configuration> </execution> - <!-- <execution> + <execution> <id>2-unpack-kernel-patch</id> <phase>test</phase> <goals> @@ -70,7 +70,26 @@ <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> @@ -78,7 +97,45 @@ </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>
