Updating das extension distribution
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f05e7f6b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f05e7f6b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f05e7f6b Branch: refs/heads/stratos-4.1.x Commit: f05e7f6b56a298aa1e31d4f229bb7c510bc23e26 Parents: 7bb7a0f Author: Thanuja <[email protected]> Authored: Thu Oct 22 12:17:09 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Tue Nov 3 11:35:23 2015 +0530 ---------------------------------------------------------------------- extensions/das/modules/distribution/pom.xml | 10 +++++++- .../modules/distribution/src/assembly/bin.xml | 27 +++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f05e7f6b/extensions/das/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/distribution/pom.xml b/extensions/das/modules/distribution/pom.xml index 07d07dc..a12c4e0 100644 --- a/extensions/das/modules/distribution/pom.xml +++ b/extensions/das/modules/distribution/pom.xml @@ -22,7 +22,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.stratos</groupId> - <artifactId>stratos-das-extension</artifactId> + <artifactId>das-extension</artifactId> <version>4.1.5-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -51,6 +51,7 @@ <goal>attached</goal> </goals> <configuration> + <finalName>${project.artifactId}-${project.version}</finalName> <descriptors> <descriptor>${basedir}/src/assembly/bin.xml</descriptor> </descriptors> @@ -63,4 +64,11 @@ </build> </profile> </profiles> + + <dependencies> + <dependency> + <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.das.extension</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/f05e7f6b/extensions/das/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/distribution/src/assembly/bin.xml b/extensions/das/modules/distribution/src/assembly/bin.xml index 04d72b8..59e0a57 100755 --- a/extensions/das/modules/distribution/src/assembly/bin.xml +++ b/extensions/das/modules/distribution/src/assembly/bin.xml @@ -29,9 +29,12 @@ <outputDirectory>${project.artifactId}-${project.version}</outputDirectory> <includes> <include>metering-dashboard/jaggery-files/*.jag</include> + <include>monitoring-dashboard/jaggery-files/*.jag</include> <include>metering-dashboard/ues-patch/*.*</include> <include>**/*.sql</include> <include>**/*.md</include> + <include>wso2cep-300/**</include> + <include>wso2cep-310/**</include> </includes> <excludes> <exclude>pom.xml</exclude> @@ -45,6 +48,13 @@ <include>**/*.car</include> </includes> </fileSet> + <fileSet> + <directory>../artifacts/monitoring-dashboard/capps/target/</directory> + <outputDirectory>${project.artifactId}-${project.version}/monitoring-dashboard</outputDirectory> + <includes> + <include>**/*.car</include> + </includes> + </fileSet> </fileSets> <files> <file> @@ -54,16 +64,19 @@ <fileMode>644</fileMode> </file> <file> - <source>src/main/notice/NOTICE</source> - <outputDirectory>${project.artifactId}-${project.version}</outputDirectory> - <filtered>true</filtered> - <fileMode>644</fileMode> - </file> - <file> <source>src/main/license/LICENSE</source> <outputDirectory>${project.artifactId}-${project.version}</outputDirectory> <filtered>true</filtered> <fileMode>644</fileMode> </file> </files> -</assembly> \ No newline at end of file + + <dependencySets> + <dependencySet> + <outputDirectory>${project.artifactId}-${project.version}/lib</outputDirectory> + <includes> + <include>org.apache.stratos:org.apache.stratos.das.extension:jar</include> + </includes> + </dependencySet> + </dependencySets> +</assembly>
