Adding distribution pom to the structure and related files
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9b734507 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9b734507 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9b734507 Branch: refs/heads/master Commit: 9b7345070f7917bb556f8226418156b459d67102 Parents: 357eb7d Author: Lahiru Sandaruwan <[email protected]> Authored: Tue May 26 18:09:52 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue May 26 18:09:52 2015 +0530 ---------------------------------------------------------------------- .../python-cartridge-agent/distribution/pom.xml | 81 ++++++++++++++++++++ .../distribution/src/main/assembly/bin.xml | 12 +++ products/python-cartridge-agent/pom.xml | 30 ++------ .../cartridge-docker-images/build.sh | 4 +- 4 files changed, 101 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9b734507/products/python-cartridge-agent/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/distribution/pom.xml b/products/python-cartridge-agent/distribution/pom.xml new file mode 100644 index 0000000..ba33d89 --- /dev/null +++ b/products/python-cartridge-agent/distribution/pom.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ 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>python-cartridge-agent-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>apache-stratos-python-cartridge-agent</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos - Python Cartridge Agent</name> + <url>http://apache.org</url> + <description>Apache Stratos Python Cartridge Agent Distribution</description> + + <build> + <plugins> + <!--plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-source</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <copy file="../../../components/org.apache.stratos.python.cartridge.agent/target/apache-stratos-python-cartridge-agent-${pom.version}.zip" + tofile="target/apache-stratos-python-cartridge-agent-${pom.version}.zip"/> + </target> + </configuration> + </execution> + </executions> + </plugin--> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>1-pre_dist</id> + <phase>test</phase> + <goals> + <goal>attached</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> + http://git-wip-us.apache.org/repos/asf/stratos/blob/9b734507/products/python-cartridge-agent/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/distribution/src/main/assembly/bin.xml b/products/python-cartridge-agent/distribution/src/main/assembly/bin.xml index 6f21621..bca0b25 100644 --- a/products/python-cartridge-agent/distribution/src/main/assembly/bin.xml +++ b/products/python-cartridge-agent/distribution/src/main/assembly/bin.xml @@ -39,5 +39,17 @@ <filtered>true</filtered> <fileMode>644</fileMode> </file> + <file> + <source>${project.basedir}/src/main/license/LICENSE</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> + <file> + <source>${project.basedir}/src/main/readme/README</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> </files> </assembly> http://git-wip-us.apache.org/repos/asf/stratos/blob/9b734507/products/python-cartridge-agent/pom.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/pom.xml b/products/python-cartridge-agent/pom.xml index 3321a08..c816674 100644 --- a/products/python-cartridge-agent/pom.xml +++ b/products/python-cartridge-agent/pom.xml @@ -27,34 +27,16 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>python-cartridge-agent</artifactId> + <artifactId>apache-stratos-python-cartridge-agent-parent</artifactId> <packaging>pom</packaging> <name>Apache Stratos - Python Cartridge Agent Product</name> <url>http://apache.org</url> <description>Apache Stratos Python Cartridge Agent Product</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy-source</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy file="../../components/org.apache.stratos.python.cartridge.agent/target/apache-stratos-python-cartridge-agent-${pom.version}.zip" - tofile="target/apache-stratos-python-cartridge-agent-${pom.version}.zip"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <modules> + <module> + distribution + </module> + </modules> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/9b734507/tools/docker-images/cartridge-docker-images/build.sh ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/build.sh b/tools/docker-images/cartridge-docker-images/build.sh index 530a099..4a4d057 100755 --- a/tools/docker-images/cartridge-docker-images/build.sh +++ b/tools/docker-images/cartridge-docker-images/build.sh @@ -22,9 +22,9 @@ set -e prgdir=`dirname "$0"` script_path=`cd "$prgdir"; pwd` -pca_source_path=`cd "$script_path/../../../components/org.apache.stratos.python.cartridge.agent/"; pwd` +pca_distribution_path=`cd "$script_path/../../../products/python-cartridge-agent/distribution/"; pwd` -pushd ${pca_source_path} +pushd ${pca_distribution_path} mvn clean install -Dmaven.test.skip=true cp -vf target/apache-stratos-python-cartridge-agent-4.1.0-SNAPSHOT.zip ${script_path}/base-image/packs/ popd
