Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 777E0189E0 for ; Thu, 4 Jun 2015 20:15:18 +0000 (UTC) Received: (qmail 55979 invoked by uid 500); 4 Jun 2015 20:15:18 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 55913 invoked by uid 500); 4 Jun 2015 20:15:18 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 55147 invoked by uid 99); 4 Jun 2015 20:15:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2015 20:15:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 64A4EE10AC; Thu, 4 Jun 2015 20:15:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: shameera@apache.org To: commits@airavata.apache.org Date: Thu, 04 Jun 2015 20:16:17 -0000 Message-Id: <163f924e935e47fd9871fee6ceea911f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [64/81] [abbrv] airavata git commit: removing nested distribution modules, this will be replaced by a single module which will use all required packages defined within an assembly 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/master Commit: 8c4ea1f0f53027c79eb4d54d08cbca2cea737ac1 Parents: 19afc7e Author: Suresh Marru Authored: Wed Jun 3 22:00:38 2015 -0400 Committer: Suresh Marru 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 @@ - - - - - - - org.apache.airavata - distribution - 0.16-SNAPSHOT - ../pom.xml - - - 4.0.0 - apache-api-server - API server distribution - pom - http://airavata.apache.org/ - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - unpack - compile - - unpack - - - - - org.apache.airavata - airavata-server-configuration - ${project.version} - jar - - - - ${project.build.directory}/conf - - - - - - - org.codehaus.gmaven - gmaven-plugin - 1.4 - - - generate-timestamp - package - - execute - - - - import java.util.Date - import java.text.MessageFormat - project.properties['buildTimestamp'] = - MessageFormat.format("{0,date,dd-MM-yyyy}", new - Date()) - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - distribution-package - package - - single - - - ${archieve.name}-${project.version} - - src/main/assembly/bin-assembly.xml - - - false - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - attach-artifacts - package - - attach-artifact - - - - - ${airavata.bin.zip} - zip - bin - - - ${airavata.bin.tar.gz} - tar.gz - bin - - - - - - - - - - - - org.apache.airavata - airavata-standalone-server - ${project.version} - - - org.apache.airavata - airavata-api-server - ${project.version} - - - - - - UTF-8 - apache-api-server - ${archieve.name}-${project.version} - ${project.build.directory}/tests/${airavata.dist.name} - ${project.build.directory}/${airavata.dist.name}-bin.zip - ${project.build.directory}/${airavata.dist.name}-bin.tar.gz - - 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 @@ - - - - - - - - - - - - - - - - - ]> - - bin - true - ${archieve.name}-${version} - - tar.gz - zip - - - - - - - ../../../ - . - - RELEASE_NOTES - - - - - src/main/resources/ - . - - LICENSE - NOTICE - README - INSTALL - - - - - - ../../registry/airavata-jpa-registry/src/main/resources - - bin/database_scripts - - - *sql* - - - - ../../app-catalog/app-catalog-data/src/main/resources - - bin/database_scripts - - - *sql* - - - - src/main/resources/bin - bin - 777 - - *.sh - *.bat - logo.txt - startNetworkServer - - - - ${project.build.directory}/conf - bin - - airavata-server.properties - zoo.cfg - log4j.properties - persistence.xml - provenance.sql - - - - - - - lib - ${artifact.artifactId}.${artifact.extension} - - - org.apache.derby:derby:jar - org.apache.derby:derbytools:jar - org.apache.derby:derbynet:jar - org.apache.derby:derbyclient:jar - - - - lib - - *:*:jar - - - - - - 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 @@ - - - - src - true - ${archieve.name}-${version} - - tar.gz - zip - - - - - ../.. - - - NOTICE - LICENSE - README - RELEASE_NOTES - DISCLAIMER - INSTALL - - true - - - ../.. - - true - - pom.xml - airavata-api/airavata-api-server/** - - - - - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup] - %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties] - - - - - 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 /modules/distribution/airavata-server/target/apache-airavata-server--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 /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 /bin -* type for following command to start the Airavata Server - MAC/Unix systems - $ sh derby.sh - Windows - - 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