You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/08/08 06:29:55 UTC
git commit: STRATOS-24: Cleaned up ELB distribution creation process.
Updated Branches:
refs/heads/master a4da63266 -> c2059beb0
STRATOS-24: Cleaned up ELB distribution creation process.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c2059beb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c2059beb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c2059beb
Branch: refs/heads/master
Commit: c2059beb09d883ef926c17d6542f8789f5baad79
Parents: a4da632
Author: Isuru Perera <is...@apache.org>
Authored: Thu Aug 8 09:59:37 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Thu Aug 8 09:59:37 2013 +0530
----------------------------------------------------------------------
products/elb/modules/distribution/pom.xml | 15 ----
.../distribution/src/main/assembly/bin.xml | 16 ++++-
.../distribution/src/main/assembly/dist.xml | 39 -----------
.../distribution/src/main/assembly/src.xml | 74 --------------------
products/elb/modules/p2-profile/pom.xml | 6 +-
5 files changed, 16 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c2059beb/products/elb/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/pom.xml b/products/elb/modules/distribution/pom.xml
index 2666727..880ae84 100755
--- a/products/elb/modules/distribution/pom.xml
+++ b/products/elb/modules/distribution/pom.xml
@@ -517,21 +517,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>pre_dist</id>
- <phase>test</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <filters>
- <filter>${basedir}/src/main/assembly/filter.properties</filter>
- </filters>
- <descriptors>
- <descriptor>src/main/assembly/dist.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
<id>dist</id>
<phase>package</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c2059beb/products/elb/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/bin.xml b/products/elb/modules/distribution/src/main/assembly/bin.xml
index f10ccc6..6c0f7b1 100755
--- a/products/elb/modules/distribution/src/main/assembly/bin.xml
+++ b/products/elb/modules/distribution/src/main/assembly/bin.xml
@@ -59,8 +59,20 @@
<exclude>**/user-mgt.xml</exclude>
<exclude>**/*.aar</exclude>
<exclude>**/webapp-mode/**</exclude>
- <exclude>**/repository/components/plugins/*.ui*</exclude>
- <!--exclude>**/samples/*</exclude-->
+ <exclude>**/repository/components/**</exclude>
+ </excludes>
+ </fileSet>
+ <!-- Copying p2 profile and osgi bundles-->
+ <fileSet>
+ <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
+ <outputDirectory>apache-stratos-elb-${pom.version}/repository/components</outputDirectory>
+ <excludes>
+ <exclude>**/eclipse.ini</exclude>
+ <exclude>**/*.lock</exclude>
+ <exclude>**/.data</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/synapse-samples*</exclude>
+ <exclude>**/plugins/*.ui*</exclude>
</excludes>
</fileSet>
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c2059beb/products/elb/modules/distribution/src/main/assembly/dist.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/dist.xml b/products/elb/modules/distribution/src/main/assembly/dist.xml
deleted file mode 100644
index 7e68802..0000000
--- a/products/elb/modules/distribution/src/main/assembly/dist.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.
- -->
-<assembly>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <!-- Copying p2 profile and osgi bundles-->
- <fileSet>
- <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
- <outputDirectory>apache-stratos-elb-${pom.version}/repository/components</outputDirectory>
- <excludes>
- <exclude>**/eclipse.ini</exclude>
- <exclude>**/*.lock</exclude>
- <exclude>**/.data</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/synapse-samples*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c2059beb/products/elb/modules/distribution/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/src.xml b/products/elb/modules/distribution/src/main/assembly/src.xml
deleted file mode 100644
index 5075162..0000000
--- a/products/elb/modules/distribution/src/main/assembly/src.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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.
- -->
-<assembly>
- <id>src</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>target/sources</directory>
- <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
- <includes>
- <include>modules/**/*</include>
- <include>**/pom.xml</include>
- </includes>
- <excludes>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>**/build</exclude>
- <exclude>**/build/**/*</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.wtpmodules</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.settings/**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>../../LICENSE.txt</source>
- <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../../README.txt</source>
- <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../../INSTALL.txt</source>
- <outputDirectory>apache-stratos-elb-${pom.version}-src</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c2059beb/products/elb/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/p2-profile/pom.xml b/products/elb/modules/p2-profile/pom.xml
index 225c0a7..f88eb6c 100755
--- a/products/elb/modules/p2-profile/pom.xml
+++ b/products/elb/modules/p2-profile/pom.xml
@@ -62,7 +62,7 @@
</configuration>
</execution>
<execution>
- <id>2-unpack-kernel-patch</id>
+ <id>unpack-kernel-patch</id>
<phase>test</phase>
<goals>
<goal>unpack</goal>
@@ -94,7 +94,6 @@
<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>
@@ -210,14 +209,13 @@
</configuration>
</execution>
<execution>
- <id>3-p2-profile-generation</id>
+ <id>p2-profile-generation</id>
<phase>package</phase>
<goals>
<goal>p2-profile-gen</goal>
</goals>
<configuration>
<profile>WSO2CarbonProfile</profile>
- <p2AgentLocation>${basedir}/target/p2-agent</p2AgentLocation>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>