You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2016/08/27 18:02:43 UTC
[5/5] airavata git commit: [AIRAVATA-2057] Move the distribution
directory to modules to slow down the distribution build
[AIRAVATA-2057] Move the distribution directory to modules to slow down the distribution build
Move the distrubtion to modules directory, now the build time moves back to few seconds from 15 minutes.
Test: ran mvn clean install and unpacked the distrubtion and started the server with
`airavata-server-start.sh all`, started fine.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a3950c99
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a3950c99
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a3950c99
Branch: refs/heads/develop
Commit: a3950c99ac6cef67c864f023fbd4f4a40291c6e8
Parents: c450f40
Author: Lahiru Ginnaliya Gamathige <la...@apache.org>
Authored: Fri Aug 26 08:37:25 2016 -0700
Committer: Lahiru Ginnaliya Gamathige <la...@apache.org>
Committed: Sat Aug 27 11:02:07 2016 -0700
----------------------------------------------------------------------
distribution/pom.xml | 582 -----
distribution/src/main/assembly/bin-assembly.xml | 160 --
distribution/src/main/assembly/src-assembly.xml | 75 -
distribution/src/main/resources/INSTALL | 30 -
distribution/src/main/resources/LICENSE | 2387 ------------------
distribution/src/main/resources/NOTICE | 163 --
distribution/src/main/resources/README | 145 --
.../main/resources/bin/airavata-server-start.sh | 123 -
.../main/resources/bin/airavata-server-stop.sh | 71 -
.../src/main/resources/bin/airavata-server.bat | 55 -
distribution/src/main/resources/bin/derby.sh | 23 -
distribution/src/main/resources/bin/logo.txt | 34 -
distribution/src/main/resources/bin/setenv.bat | 33 -
distribution/src/main/resources/bin/setenv.sh | 46 -
.../src/main/resources/bin/startNetworkServer | 189 --
.../main/resources/samples/registerSample.sh | 24 -
.../src/main/resources/samples/scripts/add.sh | 21 -
.../src/main/resources/samples/scripts/echo.sh | 22 -
.../main/resources/samples/scripts/multiply.sh | 22 -
.../main/resources/samples/scripts/subtract.sh | 22 -
modules/distribution/pom.xml | 582 +++++
.../src/main/assembly/bin-assembly.xml | 160 ++
.../src/main/assembly/src-assembly.xml | 75 +
modules/distribution/src/main/resources/INSTALL | 30 +
modules/distribution/src/main/resources/LICENSE | 2387 ++++++++++++++++++
modules/distribution/src/main/resources/NOTICE | 163 ++
modules/distribution/src/main/resources/README | 145 ++
.../main/resources/bin/airavata-server-start.sh | 123 +
.../main/resources/bin/airavata-server-stop.sh | 71 +
.../src/main/resources/bin/airavata-server.bat | 55 +
.../src/main/resources/bin/derby.sh | 23 +
.../src/main/resources/bin/logo.txt | 34 +
.../src/main/resources/bin/setenv.bat | 33 +
.../src/main/resources/bin/setenv.sh | 46 +
.../src/main/resources/bin/startNetworkServer | 189 ++
.../main/resources/samples/registerSample.sh | 24 +
.../src/main/resources/samples/scripts/add.sh | 21 +
.../src/main/resources/samples/scripts/echo.sh | 22 +
.../main/resources/samples/scripts/multiply.sh | 22 +
.../main/resources/samples/scripts/subtract.sh | 22 +
pom.xml | 97 +-
41 files changed, 4229 insertions(+), 4322 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a3950c99/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
deleted file mode 100644
index d3124eb..0000000
--- a/distribution/pom.xml
+++ /dev/null
@@ -1,582 +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. -->
-
-<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.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.17-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>apache-airavata-distribution</artifactId>
- <name>Airavata server distribution</name>
- <packaging>pom</packaging>
- <url>http://airavata.apache.org/</url>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <!--includes>**/*.war</includes -->
- <outputDirectory>${project.build.directory}/conf</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </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>
- <version>2.5.5</version>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${archieve.name}-${project.version}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
- <!-- <descriptor>src/main/assembly/src-assembly.xml</descriptor> -->
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- </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>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.9.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>0.8.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-standalone-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-cpi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-commons</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-service</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-service</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-data-models</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-credential-store</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
-<!-- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-bes</artifactId>
- <version>${project.version}</version>
- </dependency>-->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-service</artifactId>
- <version>${project.version}</version>
- </dependency>
-<!-- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-model-core</artifactId>
- <version>${project.version}</version>
- </dependency>-->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-model-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
- <version>2.2.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>7.0.22</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-jasper</artifactId>
- <version>7.0.22</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
-
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <!--dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version> </dependency -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.4.4</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>12.0</version>
- </dependency>
-
- <!-- Hadoop provider related dependencies -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.whirr</groupId>
- <artifactId>whirr-core</artifactId>
- <version>0.7.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-bouncycastle</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.whirr</groupId>
- <artifactId>whirr-hadoop</artifactId>
- <version>0.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.ebaysf.web</groupId>
- <artifactId>cors-filter</artifactId>
- <version>${ebay.cors.filter}</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.53</version>
- </dependency>
- <!-- dependency> <groupId>org.ogce</groupId> <artifactId>bcgss</artifactId>
- <version>146</version> </dependency> -->
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${xmlbeans.version}</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.0.0</version>
- </dependency>
- <!-- zookeeper dependencies -->
-
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.4.0</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${amqp.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <!-- ======================== Sample =================== -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-samples</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-
- <properties>
- <jersey.version>1.13</jersey.version>
- <grizzly.version>2.0.0-M3</grizzly.version>
- <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>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/a3950c99/distribution/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/bin-assembly.xml b/distribution/src/main/assembly/bin-assembly.xml
deleted file mode 100644
index b9146d5..0000000
--- a/distribution/src/main/assembly/bin-assembly.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!--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. -->
-
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${archieve.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>../modules/registry/registry-core/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.yaml</include>
- <include>PBSTemplate.xslt</include>
- <include>SLURMTemplate.xslt</include>
- <include>LSFTemplate.xslt</include>
- <include>UGETemplate.xslt</include>
- <include>ForkTemplate.xslt</include>
- <include>gsissh.properties</include>
- <include>airavata.jks</include>
- <include>client_truststore.jks</include>
- <include>airavata-default-xacml-policy.xml</include>
- </includes>
- </fileSet>
-
- <!-- Create logs directory -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- <!-- ********************** Copy samples ********************** -->
- <fileSet>
- <directory>${project.build.directory}/samples/applications
- </directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- </includes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <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>
- </includes>
- </dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
- </includes>
- <excludes>
- <exclude>mysql:mysql-connector-java</exclude>
- </excludes>
- </dependencySet>
-
- </dependencySets>
-
-</assembly>
http://git-wip-us.apache.org/repos/asf/airavata/blob/a3950c99/distribution/src/main/assembly/src-assembly.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/src-assembly.xml b/distribution/src/main/assembly/src-assembly.xml
deleted file mode 100644
index 6a093ed..0000000
--- a/distribution/src/main/assembly/src-assembly.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--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>true</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- <include>DISCLAIMER</include>
- <include>INSTALL</include>
- </includes>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory></outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>pom.xml</include>
- <include>modules/**</include>
- <include>samples/**</include>
- </includes>
-
- <excludes>
- <!-- Exclusions from org.apache.resources:apache-source-release-assembly-descriptor.
- Note that they assume that all sources are located under an "src" directory. This
- is not the case for Axis2, which doesn't use the standard Maven 2 conventions.
- Thus we may still encounter some issues here. -->
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
- <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
- </excludes>
-
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/airavata/blob/a3950c99/distribution/src/main/resources/INSTALL
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/INSTALL b/distribution/src/main/resources/INSTALL
deleted file mode 100644
index 53d0550..0000000
--- a/distribution/src/main/resources/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-Installing Apache Airavata 0.14
--------------------------------
-
-Prerequisites
--------------
-Java 1.5 or later
-Maven (tested on v 3.0.2)
-
-Build Apache Airavata from Source
----------------------------------
-* Unzip/untar the source file or clone from git.
-* cd to project folder and type
- $ mvn clean install
- Note: in order to skip tests use the command
- $ mvn clean install -Dmaven.test.skip=true
-* Alternatively, all compressed binary distributions can be found at <PROJECT DIR>/modules/distribution/release/target/release-artifacts
-
-Running Tests
--------------
-* Unit tests & integrations tests will run while Apache Airavata is built from source (without "-Dmaven.test.skip=true").
-* To run the test samples
- - You can find the binary distributions at <PROJECT DIR>/modules/distribution/release/target/release-artifacts or from
- the Apache Airavata download site.
- - Extract the binary distributions and once the binary is unzipped, instructions to run the tests should be followed
- from README files found within.
-
-Tutorials
-----------
-The airavata website has instructions for basic tutorials:
-* Describing and executing applications using Airavata - follow "XBAYA Quick-Start Tutorial" tutorial at https://cwiki.apache.org/confluence/display/AIRAVATA/XBAYA+Quick-Start+Tutorial
\ No newline at end of file