Repository: airavata Updated Branches: refs/heads/master 4b048e149 -> 449eb7576
Intermediate commit of new modular distribution assemblies - AIRAVATA-1471 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c38b3b69 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c38b3b69 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c38b3b69 Branch: refs/heads/master Commit: c38b3b69885eb74a2cabec7079178b59697d56b4 Parents: 16b58b8 Author: Suresh Marru <[email protected]> Authored: Wed May 13 15:51:04 2015 -0400 Committer: Suresh Marru <[email protected]> Committed: Wed May 13 15:51:04 2015 -0400 ---------------------------------------------------------------------- modules/distribution/new-dist/pom.xml | 62 +------- .../main/assembly/airavata-common-component.xml | 100 +++++++++++++ .../src/main/assembly/api-server-assembly.xml | 147 +------------------ .../src/main/assembly/api-server-component.xml | 8 +- .../new-dist/src/main/assembly/src-assembly.xml | 2 +- modules/distribution/pom.xml | 2 +- 6 files changed, 113 insertions(+), 208 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c38b3b69/modules/distribution/new-dist/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/new-dist/pom.xml b/modules/distribution/new-dist/pom.xml index 0d95484..d80cd3e 100644 --- a/modules/distribution/new-dist/pom.xml +++ b/modules/distribution/new-dist/pom.xml @@ -31,7 +31,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> <executions> <execution> <id>unpack</id> @@ -55,29 +54,6 @@ </plugin> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <id>generate-timestamp</id> - <phase>package</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source> - import java.util.Date - import java.text.MessageFormat - project.properties['buildTimestamp'] = - MessageFormat.format("{0,date,dd-MM-yyyy}", new - Date()) - </source> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -88,10 +64,10 @@ <goal>single</goal> </goals> <configuration> - <finalName>${archieve.name}-${project.version}</finalName> + <finalName>${archive.name}-${project.version}</finalName> <descriptors> <descriptor>src/main/assembly/api-server-assembly.xml</descriptor> - <descriptor>src/main/assembly/src-assembly.xml</descriptor> + <!--<descriptor>src/main/assembly/src-assembly.xml</descriptor>--> </descriptors> <attach>false</attach> </configuration> @@ -99,34 +75,6 @@ </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${airavata.bin.zip}</file> - <type>zip</type> - <classifier>bin</classifier> - </artifact> - <artifact> - <file>${airavata.bin.tar.gz}</file> - <type>tar.gz</type> - <classifier>bin</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -147,10 +95,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <archieve.name>apache-airavata-server</archieve.name> - <airavata.dist.name>${archieve.name}-${project.version}</airavata.dist.name> - <airavata.work.dir>${project.build.directory}/tests/${airavata.dist.name}</airavata.work.dir> - <airavata.bin.zip>${project.build.directory}/${airavata.dist.name}-bin.zip</airavata.bin.zip> - <airavata.bin.tar.gz>${project.build.directory}/${airavata.dist.name}-bin.tar.gz</airavata.bin.tar.gz> + <archive.name>apache-airavata-api-server</archive.name> </properties> </project> http://git-wip-us.apache.org/repos/asf/airavata/blob/c38b3b69/modules/distribution/new-dist/src/main/assembly/airavata-common-component.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/new-dist/src/main/assembly/airavata-common-component.xml b/modules/distribution/new-dist/src/main/assembly/airavata-common-component.xml new file mode 100644 index 0000000..6b7f3c7 --- /dev/null +++ b/modules/distribution/new-dist/src/main/assembly/airavata-common-component.xml @@ -0,0 +1,100 @@ +<?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. +--> +<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd";> + + <fileSets> + + <!-- ********************** copy release notes files ********************** --> + <fileSet> + <directory>../../../</directory> + <outputDirectory>.</outputDirectory> + <includes> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <!-- ********************** copy licenses, readme etc. ********************** --> + <fileSet> + <directory>src/main/resources/</directory> + <outputDirectory>.</outputDirectory> + <includes> + <include>LICENSE</include> + <include>NOTICE</include> + <include>README</include> + <include>INSTALL</include> + </includes> + </fileSet> + + <!-- ********************** copy database scripts ********************** --> + <fileSet> + <directory>../../registry/airavata-jpa-registry/src/main/resources + </directory> + <outputDirectory>bin/database_scripts + </outputDirectory> + <includes> + <include>*sql*</include> + </includes> + </fileSet> + <fileSet> + <directory>../../app-catalog/app-catalog-data/src/main/resources + </directory> + <outputDirectory>bin/database_scripts + </outputDirectory> + <includes> + <include>*sql*</include> + </includes> + </fileSet> + <!-- ********************** copy startup scripts ********************** --> + <fileSet> + <directory>src/main/resources/bin</directory> + <outputDirectory>bin</outputDirectory> + <fileMode>777</fileMode> + <includes> + <include>*.sh</include> + <include>*.bat</include> + <include>logo.txt</include> + <include>startNetworkServer</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.build.directory}/conf</directory> + <outputDirectory>bin</outputDirectory> + <includes> + <include>airavata-server.properties</include> + <include>log4j.properties</include> + <include>zoo.cfg</include> + </includes> + </fileSet> + + </fileSets> + + <dependencySets> + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <includes> + <include>org.apache.airavata:*:jar</include> + <include>org.apache.derby:derby:jar</include> + <include>org.apache.derby:derbytools:jar</include> + <include>org.apache.derby:derbynet:jar</include> + <include>org.apache.derby:derbyclient:jar</include> + </includes> + </dependencySet> + </dependencySets> + +</component> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/c38b3b69/modules/distribution/new-dist/src/main/assembly/api-server-assembly.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/new-dist/src/main/assembly/api-server-assembly.xml b/modules/distribution/new-dist/src/main/assembly/api-server-assembly.xml index 1607799..9776919 100644 --- a/modules/distribution/new-dist/src/main/assembly/api-server-assembly.xml +++ b/modules/distribution/new-dist/src/main/assembly/api-server-assembly.xml @@ -15,146 +15,14 @@ <id>bin</id> <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>${archieve.name}-${version}</baseDirectory> + <baseDirectory>${archive.name}-${version}</baseDirectory> <formats> <format>tar.gz</format> <format>zip</format> </formats> - <fileSets> - - <!-- ********************** copy release notes files ********************** --> - <fileSet> - <directory>../../../</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>RELEASE_NOTES</include> - </includes> - </fileSet> - <!-- ********************** copy licenses, readme etc. ********************** --> - <fileSet> - <directory>src/main/resources/</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>LICENSE</include> - <include>NOTICE</include> - <include>README</include> - <include>INSTALL</include> - </includes> - </fileSet> - - <!-- ********************** copy database scripts ********************** --> - <fileSet> - <directory>../../ws-messenger/messagebroker/src/main/resources/database_scripts - </directory> - <outputDirectory>bin/database_scripts - </outputDirectory> - <includes> - <include>*sql*</include> - </includes> - </fileSet> - <fileSet> - <directory>../../ws-messenger/messagebox/src/main/resources/database_scripts - </directory> - <outputDirectory>bin/database_scripts - </outputDirectory> - <includes> - <include>*sql*</include> - </includes> - </fileSet> - <fileSet> - <directory>../../registry/airavata-jpa-registry/src/main/resources - </directory> - <outputDirectory>bin/database_scripts - </outputDirectory> - <includes> - <include>*sql*</include> - </includes> - </fileSet> - <fileSet> - <directory>../../app-catalog/app-catalog-data/src/main/resources - </directory> - <outputDirectory>bin/database_scripts - </outputDirectory> - <includes> - <include>*sql*</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/resources/bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>777</fileMode> - <includes> - <include>*.sh</include> - <include>*.bat</include> - <include>logo.txt</include> - <include>startNetworkServer</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/resources/samples</directory> - <outputDirectory>samples</outputDirectory> - <fileMode>777</fileMode> - <includes> - <include>*.sh</include> - <include>**/*.sh</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.build.directory}/conf</directory> - <outputDirectory>bin</outputDirectory> - <includes> - <include>airavata-server.properties</include> - <include>zoo.cfg</include> - <include>registry.properties</include> - <include>log4j.properties</include> - <include>host.xml</include> - <include>persistence.xml</include> - <include>provenance.sql</include> - <include>gfac-config.xml</include> - <include>PBSTemplate.xslt</include> - <include>SLURMTemplate.xslt</include> - <include>LSFTemplate.xslt</include> - <include>SGETemplate.xslt</include> - <include>gsissh.properties</include> - </includes> - </fileSet> - - <!-- ********************** Copy Axis2 startup scripts to stand alone server - ********************** --> - <fileSet> - <directory>src/main/resources/axis2-standalone-bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>777</fileMode> - <includes> - <include>*.sh</include> - <include>*.bat</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/resources/conf</directory> - <outputDirectory>bin</outputDirectory> - <includes> - <include>**/*</include> - </includes> - </fileSet> - - <!-- ********************** Copy samples ********************** --> - <fileSet> - <directory>${project.build.directory}/samples/applications - </directory> - <outputDirectory>samples</outputDirectory> - <includes> - <include>*.sh</include> - <include>*.bat</include> - </includes> - </fileSet> - - </fileSets> - <componentDescriptors> - <componentDescriptor>src/assembly/api-server-component.xml</componentDescriptor> + <componentDescriptor>airavata-common-component.xml</componentDescriptor> </componentDescriptors> <dependencySets> @@ -162,18 +30,9 @@ <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> - <include>org.apache.derby:derby:jar</include> - <include>org.apache.derby:derbytools:jar</include> - <include>org.apache.derby:derbynet:jar</include> - <include>org.apache.derby:derbyclient:jar</include> + <include>org.apache.airavata:*:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <includes> - <include>*:*:jar</include> - </includes> - </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/airavata/blob/c38b3b69/modules/distribution/new-dist/src/main/assembly/api-server-component.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/new-dist/src/main/assembly/api-server-component.xml b/modules/distribution/new-dist/src/main/assembly/api-server-component.xml index 199e321..148022f 100644 --- a/modules/distribution/new-dist/src/main/assembly/api-server-component.xml +++ b/modules/distribution/new-dist/src/main/assembly/api-server-component.xml @@ -23,9 +23,11 @@ <dependencySet> <outputDirectory>/lib</outputDirectory> <includes> - <!--<include>application:logging</include>--> - <!--<include>application:core</include>--> - <!--<include>application:utils</include>--> + <include>org.apache.airavata:*:jar</include> + <include>org.apache.derby:derby:jar</include> + <include>org.apache.derby:derbytools:jar</include> + <include>org.apache.derby:derbynet:jar</include> + <include>org.apache.derby:derbyclient:jar</include> </includes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/airavata/blob/c38b3b69/modules/distribution/new-dist/src/main/assembly/src-assembly.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/new-dist/src/main/assembly/src-assembly.xml b/modules/distribution/new-dist/src/main/assembly/src-assembly.xml index 6a093ed..eae89bf 100644 --- a/modules/distribution/new-dist/src/main/assembly/src-assembly.xml +++ b/modules/distribution/new-dist/src/main/assembly/src-assembly.xml @@ -19,7 +19,7 @@ <assembly> <id>src</id> <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>${archieve.name}-${version}</baseDirectory> + <baseDirectory>${archive.name}-${version}</baseDirectory> <formats> <format>tar.gz</format> <format>zip</format> http://git-wip-us.apache.org/repos/asf/airavata/blob/c38b3b69/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 6d4135d..d2445db 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -28,7 +28,7 @@ <activeByDefault>true</activeByDefault> </activation> <modules> - <!--<module>new-dist</module>--> + <module>new-dist</module> <module>server</module> <module>client</module> <module>xbaya-gui</module>
