From cf6304c6e59671793a8d36c24aa249a3d19fe3e5 Mon Sep 17 00:00:00 2001 From: Suresh Marru Date: Tue, 22 Mar 2016 16:10:39 -0400 Subject: [PATCH 1/5] excluding mysql from distribution --- .../src/main/assembly/bin-assembly.xml | 223 +++++++++--------- 1 file changed, 113 insertions(+), 110 deletions(-) diff --git a/distribution/src/main/assembly/bin-assembly.xml b/distribution/src/main/assembly/bin-assembly.xml index 8650793808..b9146d50fa 100644 --- a/distribution/src/main/assembly/bin-assembly.xml +++ b/distribution/src/main/assembly/bin-assembly.xml @@ -26,89 +26,89 @@ ]> - bin - true - ${archieve.name}-${version} - - tar.gz - zip - + bin + true + ${archieve.name}-${version} + + tar.gz + zip + - + - - - ../../../ - . - - RELEASE_NOTES - - - - - src/main/resources/ - . - - LICENSE - NOTICE - README - INSTALL - - + + + ../../../ + . + + RELEASE_NOTES + + + + + src/main/resources/ + . + + LICENSE + NOTICE + README + INSTALL + + - - - ../modules/registry/registry-core/src/main/resources/ - - bin/database_scripts - - - *sql* - - - - src/main/resources/bin - bin - 777 - - *.sh - *.bat - logo.txt - startNetworkServer - - - - src/main/resources/samples - samples - 777 - - *.sh - **/*.sh - - - - ${project.build.directory}/conf - bin - - airavata-server.properties - zoo.cfg - registry.properties - log4j.properties - host.xml - persistence.xml - provenance.sql - gfac-config.yaml - PBSTemplate.xslt - SLURMTemplate.xslt - LSFTemplate.xslt - UGETemplate.xslt - ForkTemplate.xslt - gsissh.properties - airavata.jks - client_truststore.jks - airavata-default-xacml-policy.xml - - + + + ../modules/registry/registry-core/src/main/resources/ + + bin/database_scripts + + + *sql* + + + + src/main/resources/bin + bin + 777 + + *.sh + *.bat + logo.txt + startNetworkServer + + + + src/main/resources/samples + samples + 777 + + *.sh + **/*.sh + + + + ${project.build.directory}/conf + bin + + airavata-server.properties + zoo.cfg + registry.properties + log4j.properties + host.xml + persistence.xml + provenance.sql + gfac-config.yaml + PBSTemplate.xslt + SLURMTemplate.xslt + LSFTemplate.xslt + UGETemplate.xslt + ForkTemplate.xslt + gsissh.properties + airavata.jks + client_truststore.jks + airavata-default-xacml-policy.xml + + @@ -119,39 +119,42 @@ - - - ${project.build.directory}/samples/applications - - samples - - *.sh - *.bat - - + + + ${project.build.directory}/samples/applications + + samples + + *.sh + *.bat + + - + - - - false - 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 - - - - false - lib - - *:*:jar + + + false + 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 - + + + false + lib + + *:*:jar + + + mysql:mysql-connector-java + + - + From b5bdad1a6c92c909701dad87d42cd18c529b3e86 Mon Sep 17 00:00:00 2001 From: Suresh Marru Date: Fri, 15 Apr 2016 15:38:41 -0400 Subject: [PATCH 2/5] closes apache/airavata#31 - merged with develop branch From 4845de489c539ca388e8b7d5746fd309209170aa Mon Sep 17 00:00:00 2001 From: Suresh Marru Date: Fri, 13 May 2016 11:05:46 -0700 Subject: [PATCH 3/5] adding travis yml file --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..9f7f8b7412 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: java + +sudo: false + +notifications: + email: + on_success: change + on_failure: always + +jdk: + - oraclejdk8 + +script: mvn clean install \ No newline at end of file From 0f962e737bf763f73f8a8674b8d981b25e6688ab Mon Sep 17 00:00:00 2001 From: Suresh Marru Date: Mon, 16 May 2016 15:47:01 -0400 Subject: [PATCH 4/5] making a trivial commit to trigger travis --- README | 1 - 1 file changed, 1 deletion(-) diff --git a/README b/README index dd051b6497..90b8270764 100644 --- a/README +++ b/README @@ -62,7 +62,6 @@ Airavata Source Distribution Directory Structure │ │ ├── orchestrator-server │ │ ├── server │ │ └── release - │ │ └── xbaya-gui │ ├── gfac │ │ ├── airavata-gfac-service │ │ ├── gfac-bes From ce74f3b1da45272cb76b5b717f062a1faad56100 Mon Sep 17 00:00:00 2001 From: Jeff Kinnison Date: Fri, 10 Jun 2016 14:16:17 -0400 Subject: [PATCH 5/5] added simstream submodule --- .gitmodules | 3 +++ modules/simstream | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 modules/simstream diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..cb4ea1f44f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "modules/simstream"] + path = modules/simstream + url = https://github.com/jeffkinnison/simstream.git diff --git a/modules/simstream b/modules/simstream new file mode 160000 index 0000000000..7ef74be523 --- /dev/null +++ b/modules/simstream @@ -0,0 +1 @@ +Subproject commit 7ef74be523e6ad985520fce679d5edc04623fdf8