removing nested distribution modules, this will be replaced by a single module which will use all required packages defined within an assembly
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8c4ea1f0 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8c4ea1f0 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8c4ea1f0 Branch: refs/heads/moduleRefactor Commit: 8c4ea1f0f53027c79eb4d54d08cbca2cea737ac1 Parents: 19afc7e Author: Suresh Marru <[email protected]> Authored: Wed Jun 3 22:00:38 2015 -0400 Committer: Suresh Marru <[email protected]> Committed: Wed Jun 3 22:00:38 2015 -0400 ---------------------------------------------------------------------- modules/distribution/api-server/pom.xml | 152 -- .../src/main/assembly/bin-assembly.xml | 123 - .../src/main/assembly/src-assembly.xml | 74 - .../api-server/src/main/resources/INSTALL | 55 - .../api-server/src/main/resources/LICENSE | 2387 ------------------ .../api-server/src/main/resources/NOTICE | 163 -- .../api-server/src/main/resources/README | 121 - .../src/main/resources/bin/api-server.sh | 118 - .../api-server/src/main/resources/bin/logo.txt | 34 - .../src/main/resources/bin/setenv.bat | 43 - .../api-server/src/main/resources/bin/setenv.sh | 77 - modules/distribution/client/java/pom.xml | 162 -- .../java/src/main/assembly/bin-assembly.xml | 166 -- .../java/src/main/assembly/src-assembly.xml | 75 - .../client/java/src/main/resources/LICENSE | 2272 ----------------- .../client/java/src/main/resources/NOTICE | 163 -- .../client/java/src/main/resources/README | 53 - modules/distribution/client/pom.xml | 39 - modules/distribution/gfac-server/pom.xml | 167 -- .../src/main/assembly/bin-assembly.xml | 176 -- .../src/main/assembly/src-assembly.xml | 75 - .../gfac-server/src/main/resources/INSTALL | 55 - .../gfac-server/src/main/resources/LICENSE | 2387 ------------------ .../gfac-server/src/main/resources/NOTICE | 163 -- .../gfac-server/src/main/resources/README | 121 - .../src/main/resources/bin/gfac-server.sh | 118 - .../gfac-server/src/main/resources/bin/logo.txt | 34 - .../src/main/resources/bin/setenv.bat | 43 - .../src/main/resources/bin/setenv.sh | 77 - modules/distribution/new-dist/pom.xml | 99 - .../main/assembly/airavata-common-component.xml | 100 - .../src/main/assembly/api-server-assembly.xml | 39 - .../src/main/assembly/api-server-component.xml | 35 - .../new-dist/src/main/assembly/src-assembly.xml | 75 - .../new-dist/src/main/resources/INSTALL | 30 - .../new-dist/src/main/resources/LICENSE | 2387 ------------------ .../new-dist/src/main/resources/NOTICE | 163 -- .../new-dist/src/main/resources/README | 145 -- .../src/main/resources/bin/airavata-server.bat | 55 - .../src/main/resources/bin/airavata-server.sh | 118 - .../new-dist/src/main/resources/bin/derby.sh | 23 - .../new-dist/src/main/resources/bin/logo.txt | 34 - .../new-dist/src/main/resources/bin/setenv.bat | 43 - .../new-dist/src/main/resources/bin/setenv.sh | 77 - .../src/main/resources/bin/startNetworkServer | 189 -- .../main/resources/samples/registerSample.sh | 25 - .../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 - .../distribution/orchestrator-server/pom.xml | 155 -- .../src/main/assembly/bin-assembly.xml | 146 -- .../src/main/assembly/src-assembly.xml | 75 - .../src/main/resources/INSTALL | 55 - .../src/main/resources/LICENSE | 2387 ------------------ .../src/main/resources/NOTICE | 163 -- .../src/main/resources/README | 121 - .../src/main/resources/bin/logo.txt | 34 - .../main/resources/bin/orchestrator-server.sh | 118 - .../src/main/resources/bin/setenv.bat | 43 - .../src/main/resources/bin/setenv.sh | 77 - modules/distribution/pom.xml | 46 - modules/distribution/release/pom.xml | 117 - modules/distribution/server/pom.xml | 587 ----- .../server/src/main/assembly/bin-assembly.xml | 189 -- .../server/src/main/assembly/src-assembly.xml | 75 - .../server/src/main/resources/INSTALL | 30 - .../server/src/main/resources/LICENSE | 2387 ------------------ .../server/src/main/resources/NOTICE | 163 -- .../server/src/main/resources/README | 145 -- .../src/main/resources/bin/airavata-server.bat | 55 - .../src/main/resources/bin/airavata-server.sh | 118 - .../server/src/main/resources/bin/api-server.sh | 118 - .../server/src/main/resources/bin/derby.sh | 23 - .../src/main/resources/bin/gfac-server.sh | 118 - .../server/src/main/resources/bin/logo.txt | 34 - .../main/resources/bin/orchestrator-server.sh | 118 - .../server/src/main/resources/bin/setenv.bat | 43 - .../server/src/main/resources/bin/setenv.sh | 77 - .../src/main/resources/bin/startNetworkServer | 189 -- .../src/main/resources/bin/workflow-server.sh | 118 - .../main/resources/samples/registerSample.sh | 25 - .../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/xbaya-gui/pom.xml | 239 -- .../src/main/assembly/bin-assembly.xml | 101 - .../airavata/distribution/xbaya/jnlp/Main.java | 156 -- .../xbaya-gui/src/main/resources/INSTALL | 44 - .../xbaya-gui/src/main/resources/LICENSE | 2273 ----------------- .../xbaya-gui/src/main/resources/NOTICE | 163 -- .../xbaya-gui/src/main/resources/README | 101 - .../src/main/resources/airavata-logo.gif | Bin 13895 -> 0 bytes .../xbaya-gui/src/main/resources/bin/setenv.bat | 42 - .../xbaya-gui/src/main/resources/bin/setenv.sh | 77 - .../src/main/resources/bin/xbaya-gui.bat | 23 - .../src/main/resources/bin/xbaya-gui.sh | 22 - .../src/main/resources/conf/log4j.properties | 40 - .../xbaya-gui/src/main/resources/jnlp/INSTALL | 48 - .../xbaya-gui/src/main/resources/jnlp/LICENSE | 2272 ----------------- .../xbaya-gui/src/main/resources/jnlp/NOTICE | 163 -- .../xbaya-gui/src/main/resources/jnlp/README | 91 - .../src/main/resources/jnlp/xbaya.jnlp | 42 - .../xbaya-gui/src/main/resources/xbaya.jks | Bin 2234 -> 0 bytes pom.xml | 2 - 106 files changed, 27552 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/api-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/api-server/pom.xml b/modules/distribution/api-server/pom.xml deleted file mode 100644 index e390f5e..0000000 --- a/modules/distribution/api-server/pom.xml +++ /dev/null @@ -1,152 +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>distribution</artifactId> - <version>0.16-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>apache-api-server</artifactId> - <name>API 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> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <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.airavata</groupId> - <artifactId>airavata-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-api-server</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <archieve.name>apache-api-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/8c4ea1f0/modules/distribution/api-server/src/main/assembly/bin-assembly.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/api-server/src/main/assembly/bin-assembly.xml b/modules/distribution/api-server/src/main/assembly/bin-assembly.xml deleted file mode 100644 index b362420..0000000 --- a/modules/distribution/api-server/src/main/assembly/bin-assembly.xml +++ /dev/null @@ -1,123 +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|includes)*> - <!ELEMENT directory (#PCDATA)> - <!ELEMENT outputDirectory (#PCDATA)> - <!ELEMENT includes (include)*> - <!ELEMENT include (#PCDATA)> - <!ELEMENT dependencySets (dependencySet)*> - <!ELEMENT dependencySet (outputDirectory|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>../../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>${project.build.directory}/conf</directory> - <outputDirectory>bin</outputDirectory> - <includes> - <include>airavata-server.properties</include> - <include>zoo.cfg</include> - <include>log4j.properties</include> - <include>persistence.xml</include> - <include>provenance.sql</include> - </includes> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <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> - <outputDirectory>lib</outputDirectory> - <includes> - <include>*:*:jar</include> - </includes> - </dependencySet> - - </dependencySets> - -</assembly> http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/api-server/src/main/assembly/src-assembly.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/api-server/src/main/assembly/src-assembly.xml b/modules/distribution/api-server/src/main/assembly/src-assembly.xml deleted file mode 100644 index c2bed4f..0000000 --- a/modules/distribution/api-server/src/main/assembly/src-assembly.xml +++ /dev/null @@ -1,74 +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>airavata-api/airavata-api-server/**</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/8c4ea1f0/modules/distribution/api-server/src/main/resources/INSTALL ---------------------------------------------------------------------- diff --git a/modules/distribution/api-server/src/main/resources/INSTALL b/modules/distribution/api-server/src/main/resources/INSTALL deleted file mode 100644 index 0324e61..0000000 --- a/modules/distribution/api-server/src/main/resources/INSTALL +++ /dev/null @@ -1,55 +0,0 @@ -Installing Apache Airavata 0.11 -------------------------------- - -Prerequisites -------------- -Java 1.5 or later -Maven (tested on v 3.0.2) - -Build Apache Airavata from Source ---------------------------------- -* Unzip/untar the source file or check out from svn. -* 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 -* The compressed binary distribution is created at <PROJECT DIR>/modules/distribution/airavata-server/target/apache-airavata-server-<airavata-version>-bin.zip - -Installing the Airavata Server ------------------------------- -No installation is necessary. Just extract the compressed distribution. -Note: For customizing the default configurations of the Airavata Server please - refer to Airavata web-site (http://airavata.apache.org/) and/or Airavata - mailing lists (http://airavata.apache.org/community/mailing-lists.html) - -Starting Apache Airavata Server -------------------------------- -* Navigate to <AIRAVATA_HOME>/bin -* type for following command to start the Airavata Server - MAC/Unix systems - $ sh airavata-server.sh - Windows - > airavata-server.bat - Note: Pass "-h" as parameters to see more options when starting the server - -Starting Apache Derby Server -------------------------------- -Users have the option to star the derby server separately -* Navigate to <AIRAVATA_HOME>/bin -* type for following command to start the Airavata Server - MAC/Unix systems - $ sh derby.sh - Windows - <Not supported in this version> - Note: Pass "-h" as parameters to see more options when starting the server - -Running Tests -------------- -Once the binary is unzipped, instructions to run the tests should be followed from README - -Tutorials ----------- -The airavata website has instructions for basic tutorials: -* For basic understanding of how Airavata works - http://airavata.apache.org/documentation/tutorials/airavata-in-5-minutes.html -* Describing and executing applications using Airavata - http://airavata.apache.org/documentation/tutorials/airavata-in-10-minutes.html -* Advanced tutorial to provide understanding of how to run sample workflows distributed with Airavata - http://airavata.apache.org/documentation/tutorials/advanced-workflow-samples.html
