You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/06/30 05:34:40 UTC
(airavata) 02/07: consolidate airavata-api assembly into single tar.gz
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch distribution-improvements
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 241665203038c10ec519b759995fdfdb8a17711c
Author: yasithdev <ya...@icloud.com>
AuthorDate: Sun Jun 29 02:45:02 2025 -0500
consolidate airavata-api assembly into single tar.gz
---
...countprovisioning.SSHAccountProvisionerProvider | 22 --
airavata-api/src/main/resources/log4j.properties | 41 ---
...countprovisioning.SSHAccountProvisionerProvider | 21 --
.../src/test/resources/credential-store/client.xml | 35 ---
.../resources/api-server/bin/logo.txt => logo.txt | 0
modules/agent-framework/agent-service/pom.xml | 16 --
modules/distribution/pom.xml | 293 +--------------------
.../src/main/assembly/api-server-bin-assembly.xml | 54 ++--
.../src/main/assembly/controller-bin-assembly.xml | 85 ------
.../main/assembly/email-monitor-bin-assembly.xml | 86 ------
.../src/main/assembly/parser-wm-bin-assembly.xml | 84 ------
.../src/main/assembly/participant-bin-assembly.xml | 86 ------
.../src/main/assembly/post-wm-bin-assembly.xml | 84 ------
.../src/main/assembly/pre-wm-bin-assembly.xml | 85 ------
.../assembly/realtime-monitor-bin-assembly.xml | 85 ------
.../assembly/sharing-registry-bin-assembly.xml | 96 -------
.../api-server/bin/airavata-server-start.sh | 6 +-
.../api-server/bin/airavata-server-stop.sh | 2 +-
.../bin/controller-daemon.sh | 4 +-
.../{controller => api-server}/bin/controller.sh | 4 +-
.../bin/email-monitor-daemon.sh | 4 +-
.../bin/email-monitor.sh | 4 +-
.../bin/parser-wm-daemon.sh | 4 +-
.../{parser-wm => api-server}/bin/parser-wm.sh | 4 +-
.../bin/participant-daemon.sh | 4 +-
.../{participant => api-server}/bin/participant.sh | 4 +-
.../{post-wm => api-server}/bin/post-wm-daemon.sh | 4 +-
.../{post-wm => api-server}/bin/post-wm.sh | 4 +-
.../{pre-wm => api-server}/bin/pre-wm-daemon.sh | 4 +-
.../resources/{pre-wm => api-server}/bin/pre-wm.sh | 4 +-
.../bin/realtime-monitor-daemon.sh | 4 +-
.../bin/realtime-monitor.sh | 4 +-
.../bin/sharing-registry.sh | 2 +-
...{startNetworkServer => start-network-server.sh} | 0
.../api-server/conf/airavata-server.properties | 102 +++++++
.../conf/email-config.yaml | 0
.../{controller => api-server}/conf/log4j2.xml | 0
.../src/main/resources/controller/bin/setenv.sh | 46 ----
.../controller/conf/airavata-server.properties | 31 ---
.../src/main/resources/email-monitor/bin/setenv.sh | 46 ----
.../email-monitor/conf/airavata-server.properties | 36 ---
.../main/resources/email-monitor/conf/log4j2.xml | 53 ----
.../src/main/resources/parser-wm/bin/setenv.sh | 46 ----
.../parser-wm/conf/airavata-server.properties | 65 -----
.../src/main/resources/parser-wm/conf/log4j2.xml | 53 ----
.../src/main/resources/participant/bin/setenv.sh | 46 ----
.../participant/conf/airavata-server.properties | 77 ------
.../main/resources/participant/conf/cred_store.jks | Bin 501 -> 0 bytes
.../src/main/resources/participant/conf/log4j2.xml | 53 ----
.../src/main/resources/post-wm/bin/setenv.sh | 46 ----
.../post-wm/conf/airavata-server.properties | 58 ----
.../src/main/resources/post-wm/conf/log4j2.xml | 53 ----
.../src/main/resources/pre-wm/bin/setenv.sh | 46 ----
.../pre-wm/conf/airavata-server.properties | 55 ----
.../src/main/resources/pre-wm/conf/log4j2.xml | 53 ----
.../main/resources/realtime-monitor/bin/setenv.sh | 46 ----
.../conf/airavata-server.properties | 34 ---
.../resources/realtime-monitor/conf/log4j2.xml | 53 ----
.../main/resources/sharing-registry/bin/setenv.sh | 61 -----
modules/ide-integration/pom.xml | 1 +
.../research-framework/research-service/pom.xml | 16 --
pom.xml | 45 ----
62 files changed, 167 insertions(+), 2293 deletions(-)
diff --git a/airavata-api/src/main/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider b/airavata-api/src/main/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
deleted file mode 100644
index d042cd1702..0000000000
--- a/airavata-api/src/main/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
+++ /dev/null
@@ -1,22 +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.
-#
-#
-
-
-org.apache.airavata.accountprovisioning.provisioner.IULdapSSHAccountProvisionerProvider
\ No newline at end of file
diff --git a/airavata-api/src/main/resources/log4j.properties b/airavata-api/src/main/resources/log4j.properties
deleted file mode 100644
index a625c4f932..0000000000
--- a/airavata-api/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,41 +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.
-#
-
-# Set root category priority to INFO and its only appender to CONSOLE.
-log4j.rootCategory=INFO, CONSOLE,LOGFILE
-log4j.rootLogger=INFO, CONSOLE, LOGFILE
-
-# Set the enterprise logger priority to FATAL
-log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
-log4j.logger.httpclient.wire.header=FATAL
-log4j.logger.org.apache.commons.httpclient=FATAL
-log4j.logger.org.apache.zookeeper=FATAL
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %m%n
-
-# LOGFILE is set to be a File appender using a PatternLayout.
-log4j.appender.LOGFILE=org.apache.log4j.FileAppender
-log4j.appender.LOGFILE.File=../../bin/airavata.log
-log4j.appender.LOGFILE.Append=true
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
diff --git a/airavata-api/src/test/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider b/airavata-api/src/test/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
deleted file mode 100644
index c920421a77..0000000000
--- a/airavata-api/src/test/resources/META-INF/services/org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider
+++ /dev/null
@@ -1,21 +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.
-#
-#
-
-org.apache.airavata.accountprovisioning.provisioner.TestSSHAccountProvisionerProvider
\ No newline at end of file
diff --git a/airavata-api/src/test/resources/credential-store/client.xml b/airavata-api/src/test/resources/credential-store/client.xml
deleted file mode 100644
index 8b934e6efb..0000000000
--- a/airavata-api/src/test/resources/credential-store/client.xml
+++ /dev/null
@@ -1,35 +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. -->
-
-<config>
- <client name="acs">
- <logging
- logFileName="../logs/oa4mp.log"
- logName="oa4mp"
- logSize="1000000"
- logFileCount="2"
- debug="true"/>
- <id>myproxy:oa4mp,2012:/client/24c45c2eb65d93231d02d423e94d0362</id>
- <serviceUri>https://oa4mp.xsede.org/oauth</serviceUri>
- <callbackUri>https://localhost:8443/airavata/callback</callbackUri>
- <lifetime>864000</lifetime>
- <publicKeyFile>../webapps/airavata/WEB-INF/classes/credential-store/oauth-pubkey.pem</publicKeyFile>
- <privateKeyFile>../webapps/airavata/WEB-INF/classes/credential-store/oauth-privkey.pk8</privateKeyFile>
- </client>
-
- <credential-store>
- <successUri>/credential-store/success.jsp</successUri>
- <errorUri>/credential-store/error.jsp</errorUri>
- <redirectUri>/credential-store/show-redirect.jsp</redirectUri>
- </credential-store>
-
-</config>
diff --git a/modules/distribution/src/main/resources/api-server/bin/logo.txt b/logo.txt
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/logo.txt
rename to logo.txt
diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml
index d6443957da..773d55d6ca 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -178,22 +178,6 @@ under the License.
<release>17</release>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/*.*</include>
- </includes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index efcfe0e0e6..48667872f5 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -31,6 +31,7 @@ under the License.
<artifactId>apache-airavata-distribution</artifactId>
<name>Airavata Distribution</name>
<packaging>pom</packaging>
+ <url>https://airavata.apache.org/</url>
<dependencies>
<!-- Core Airavata API - this will transitively include most dependencies -->
@@ -39,7 +40,6 @@ under the License.
<artifactId>airavata-api</artifactId>
<version>${project.version}</version>
</dependency>
-
<!-- Additional dependencies that may be needed for specific components -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -63,14 +63,10 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
- <url>http://airavata.apache.org/</url>
-
<build>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -90,126 +86,6 @@ under the License.
<attach>false</attach>
</configuration>
</execution>
- <execution>
- <id>controller-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${controller.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/controller-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>participant-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${participant.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/participant-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>pre-wm-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${pre.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/pre-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>post-wm-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${post.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/post-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>parser-wm-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${parser.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/parser-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>email-monitor-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${email.monitor.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/email-monitor-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>realtime-monitor-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${realtime.monitor.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/realtime-monitor-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>sharing-registry-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${sharing.registry.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/sharing-registry-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -237,116 +113,6 @@ under the License.
</resources>
</configuration>
</execution>
- <execution>
- <id>copy-controller-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.controller.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.controller.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${session.executionRootDirectory}/distribution</directory>
- <includes>
- <include>${controller.dist.name}.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-pre-wm-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.pre.wm.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.pre.wm.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${session.executionRootDirectory}/distribution</directory>
- <includes>
- <include>${pre.wm.dist.name}.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-post-wm-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.post.wm.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.post.wm.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${session.executionRootDirectory}/distribution</directory>
- <includes>
- <include>${post.wm.dist.name}.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-participant-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.participant.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.participant.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${session.executionRootDirectory}/distribution</directory>
- <includes>
- <include>${participant.dist.name}.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-email-monitor-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.email.monitor.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.email.monitor.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${session.executionRootDirectory}/distribution</directory>
- <includes>
- <include>${email.monitor.dist.name}.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -362,71 +128,16 @@ under the License.
<dockerFile>${docker.api.server.build.directory}/Dockerfile</dockerFile>
</build>
</image>
- <image>
- <name>airavata/controller</name>
- <build>
- <dockerFile>${docker.controller.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/pre-wm</name>
- <build>
- <dockerFile>${docker.pre.wm.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/post-wm</name>
- <build>
- <dockerFile>${docker.post.wm.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/participant</name>
- <build>
- <dockerFile>${docker.participant.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/email-monitor</name>
- <build>
- <dockerFile>${docker.email.monitor.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
</images>
</configuration>
</plugin>
</plugins>
</build>
-
<properties>
-
<docker.api.server.build.directory>${project.build.directory}/api_server_docker_img_build</docker.api.server.build.directory>
<docker.api.server.image.src.root>src/main/docker/api-server</docker.api.server.image.src.root>
-
- <docker.controller.build.directory>${project.build.directory}/controller_docker_img_build</docker.controller.build.directory>
- <docker.controller.image.src.root>src/main/docker/controller</docker.controller.image.src.root>
-
- <docker.pre.wm.build.directory>${project.build.directory}/pre_wm_docker_img_build</docker.pre.wm.build.directory>
- <docker.pre.wm.image.src.root>src/main/docker/pre-wm</docker.pre.wm.image.src.root>
-
- <docker.post.wm.build.directory>${project.build.directory}/post_wm_docker_img_build</docker.post.wm.build.directory>
- <docker.post.wm.image.src.root>src/main/docker/post-wm</docker.post.wm.image.src.root>
-
- <docker.participant.build.directory>${project.build.directory}/participant_docker_img_build</docker.participant.build.directory>
- <docker.participant.image.src.root>src/main/docker/participant</docker.participant.image.src.root>
-
- <docker.email.monitor.build.directory>${project.build.directory}/email_monitor_docker_img_build</docker.email.monitor.build.directory>
- <docker.email.monitor.image.src.root>src/main/docker/email-monitor</docker.email.monitor.image.src.root>
-
<api.server.dist.name>apache-airavata-api-server-${project.version}</api.server.dist.name>
- <controller.dist.name>apache-airavata-controller-${project.version}</controller.dist.name>
- <participant.dist.name>apache-airavata-participant-${project.version}</participant.dist.name>
- <pre.wm.dist.name>apache-airavata-pre-wm-${project.version}</pre.wm.dist.name>
- <post.wm.dist.name>apache-airavata-post-wm-${project.version}</post.wm.dist.name>
- <parser.wm.dist.name>apache-airavata-parser-wm-${project.version}</parser.wm.dist.name>
- <email.monitor.dist.name>apache-airavata-email-monitor-${project.version}</email.monitor.dist.name>
- <realtime.monitor.dist.name>apache-airavata-realtime-monitor-${project.version}</realtime.monitor.dist.name>
- <sharing.registry.dist.name>apache-airavata-sharing-registry-${project.version}</sharing.registry.dist.name>
</properties>
+
</project>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
index e4db5adaed..862f9d2b86 100644
--- a/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
@@ -24,7 +24,6 @@
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${api.server.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
</formats>
@@ -41,15 +40,39 @@
<include>NOTICE</include>
<include>RELEASE_NOTES</include>
<include>README.md</include>
+ <include>logo.txt</include>
+ </includes>
+ </fileSet>
+
+ <!-- ********************** copy keystore files ********************** -->
+ <fileSet>
+ <directory>../../keystores</directory>
+ <outputDirectory>conf</outputDirectory>
+ <includes>
+ <include>*.jks</include>
+ <include>*.p12</include>
+ <include>*.pem</include>
+ </includes>
+ </fileSet>
+
+ <!-- ********************** copy config files ********************** -->
+ <fileSet>
+ <directory>../../airavata-api/src/main/resources</directory>
+ <outputDirectory>conf</outputDirectory>
+ <includes>
+ <include>META-INF/persistence.xml</include>
+ <include>*.properties</include>
+ <include>*.xml</include>
+ <include>*.template</include>
</includes>
</fileSet>
<!-- ********************** copy database scripts ********************** -->
<fileSet>
<directory>../../airavata-api/src/main/resources</directory>
- <outputDirectory>bin/database_scripts</outputDirectory>
+ <outputDirectory>database_scripts</outputDirectory>
<includes>
- <include>*sql*</include>
+ <include>*.sql</include>
</includes>
</fileSet>
@@ -61,34 +84,15 @@
<includes>
<include>*.sh</include>
<include>*.bat</include>
- <include>logo.txt</include>
- <include>startNetworkServer</include>
</includes>
</fileSet>
<!-- ********************** copy config files ********************** -->
<fileSet>
- <directory>../../airavata-api/src/main/resources</directory>
- <outputDirectory>bin</outputDirectory>
+ <directory>src/main/resources/api-server/conf</directory>
+ <outputDirectory>conf</outputDirectory>
<includes>
- <include>airavata-server.properties</include>
- <include>zoo.cfg</include>
- <include>registry.properties</include>
- <include>log4j2.xml</include>
- <include>host.xml</include>
- <include>persistence.xml</include>
- <include>provenance.sql</include>
- <include>gfac-config.yaml</include>
- <include>PBS_Groovy.template</include>
- <include>SLURM_Groovy.template</include>
- <include>LSF_Groovy.template</include>
- <include>UGE_Groovy.template</include>
- <include>FORK_Groovy.template</include>
- <include>gsissh.properties</include>
- <include>airavata.jks</include>
- <include>client_truststore.jks</include>
- <include>airavata-default-xacml-policy.xml</include>
- <include>enableLegacyTLS.properties</include>
+ <include>*</include>
</includes>
</fileSet>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
deleted file mode 100644
index 87f3dc0358..0000000000
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ /dev/null
@@ -1,85 +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 xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${controller.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy metadata files ********************** -->
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- <include>README.md</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy bin files ********************** -->
- <fileSet>
- <directory>src/main/resources/controller/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy config files ********************** -->
- <fileSet>
- <directory>src/main/resources/controller/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy logs ********************** -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
deleted file mode 100644
index 4a21955079..0000000000
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ /dev/null
@@ -1,86 +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 xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${email.monitor.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy metadata files ********************** -->
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- <include>README.md</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy bin files ********************** -->
- <fileSet>
- <directory>src/main/resources/email-monitor/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy config files ********************** -->
- <fileSet>
- <directory>src/main/resources/email-monitor/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>airavata-server.properties</include>
- <include>email-config.yaml</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy logs ********************** -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
deleted file mode 100644
index cadc2b83e1..0000000000
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ /dev/null
@@ -1,84 +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 xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${parser.wm.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy metadata files ********************** -->
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- <include>README.md</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy bin files ********************** -->
- <fileSet>
- <directory>src/main/resources/parser-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy config files ********************** -->
- <fileSet>
- <directory>src/main/resources/parser-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy logs ********************** -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
deleted file mode 100644
index 6e6b1d5404..0000000000
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ /dev/null
@@ -1,86 +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 xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${participant.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy metadata files ********************** -->
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- <include>README.md</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy bin files ********************** -->
- <fileSet>
- <directory>src/main/resources/participant/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy config files ********************** -->
- <fileSet>
- <directory>src/main/resources/participant/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- <include>cred_store.jks</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy logs ********************** -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
deleted file mode 100644
index 96bbf27029..0000000000
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ /dev/null
@@ -1,84 +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 xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${post.wm.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy metadata files ********************** -->
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- <include>README.md</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy bin files ********************** -->
- <fileSet>
- <directory>src/main/resources/post-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy config files ********************** -->
- <fileSet>
- <directory>src/main/resources/post-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy logs ********************** -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
deleted file mode 100644
index 3cfbb65af4..0000000000
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ /dev/null
@@ -1,85 +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 xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${pre.wm.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy metadata files ********************** -->
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- <include>README.md</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy bin files ********************** -->
- <fileSet>
- <directory>src/main/resources/pre-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy config files ********************** -->
- <fileSet>
- <directory>src/main/resources/pre-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy logs ********************** -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
deleted file mode 100644
index f25aeaf1d4..0000000000
--- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ /dev/null
@@ -1,85 +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 xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${realtime.monitor.dist.name}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy metadata files ********************** -->
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- <include>README.md</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy bin files ********************** -->
- <fileSet>
- <directory>src/main/resources/realtime-monitor/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy config files ********************** -->
- <fileSet>
- <directory>src/main/resources/realtime-monitor/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j2.xml</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy logs ********************** -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/sharing-registry-bin-assembly.xml b/modules/distribution/src/main/assembly/sharing-registry-bin-assembly.xml
deleted file mode 100644
index 240004e37b..0000000000
--- a/modules/distribution/src/main/assembly/sharing-registry-bin-assembly.xml
+++ /dev/null
@@ -1,96 +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 xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>sharing-registry</baseDirectory>
- <formats>
- <format>tar.gz</format>
- </formats>
-
- <fileSets>
-
- <!-- ********************** copy metadata files ********************** -->
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- <include>README.md</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy database scripts ********************** -->
- <fileSet>
- <directory>../../airavata-api/src/main/resources</directory>
- <outputDirectory>bin/database_scripts</outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy bin files ********************** -->
- <fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- <fileMode>755</fileMode>
- </fileSet>
-
- <!-- ********************** copy config files ********************** -->
- <fileSet>
- <directory>src/main/resources/sharing-registry/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>log4j.properties</include>
- <include>airavata.jks</include>
- <include>client_truststore.jks</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy logs ********************** -->
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
-
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/api-server/bin/airavata-server-start.sh b/modules/distribution/src/main/resources/api-server/bin/airavata-server-start.sh
index cd9c035671..3aceb86d15 100644
--- a/modules/distribution/src/main/resources/api-server/bin/airavata-server-start.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/airavata-server-start.sh
@@ -21,9 +21,9 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
-JAVA_OPTS=""
+JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
SERVERS=""
@@ -31,7 +31,7 @@ IS_DAEMON_MODE=false
LOGO=true
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/output.log"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-server.log"
LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
diff --git a/modules/distribution/src/main/resources/api-server/bin/airavata-server-stop.sh b/modules/distribution/src/main/resources/api-server/bin/airavata-server-stop.sh
index 7f83f48e73..4d83bae7cf 100644
--- a/modules/distribution/src/main/resources/api-server/bin/airavata-server-stop.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/airavata-server-stop.sh
@@ -20,7 +20,7 @@
. `dirname $0`/setenv.sh
cd ${AIRAVATA_HOME}/bin
-JAVA_OPTS=""
+JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
FORCE=false
diff --git a/modules/distribution/src/main/resources/controller/bin/controller-daemon.sh b/modules/distribution/src/main/resources/api-server/bin/controller-daemon.sh
similarity index 97%
rename from modules/distribution/src/main/resources/controller/bin/controller-daemon.sh
rename to modules/distribution/src/main/resources/api-server/bin/controller-daemon.sh
index 80856e1f52..2a93fa9c8d 100644
--- a/modules/distribution/src/main/resources/controller/bin/controller-daemon.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/controller-daemon.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -30,7 +30,7 @@ SERVERS=""
LOGO=true
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-daemon.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-controller.log"
LOG_FILE=$DEFAULT_LOG_FILE
SERVICE_NAME="Helix Controller"
diff --git a/modules/distribution/src/main/resources/controller/bin/controller.sh b/modules/distribution/src/main/resources/api-server/bin/controller.sh
similarity index 95%
rename from modules/distribution/src/main/resources/controller/bin/controller.sh
rename to modules/distribution/src/main/resources/api-server/bin/controller.sh
index 56a17b7d3b..7ce09a51b3 100644
--- a/modules/distribution/src/main/resources/controller/bin/controller.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/controller.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -29,7 +29,7 @@ EXTRA_ARGS=""
SERVERS=""
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-controller.log"
LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
diff --git a/modules/distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh b/modules/distribution/src/main/resources/api-server/bin/email-monitor-daemon.sh
similarity index 97%
rename from modules/distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh
rename to modules/distribution/src/main/resources/api-server/bin/email-monitor-daemon.sh
index a30193b313..0e14878071 100644
--- a/modules/distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/email-monitor-daemon.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -30,7 +30,7 @@ SERVERS=""
LOGO=true
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-daemon.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-email-monitor.log"
LOG_FILE=$DEFAULT_LOG_FILE
SERVICE_NAME="Email Monitor"
diff --git a/modules/distribution/src/main/resources/email-monitor/bin/email-monitor.sh b/modules/distribution/src/main/resources/api-server/bin/email-monitor.sh
similarity index 95%
rename from modules/distribution/src/main/resources/email-monitor/bin/email-monitor.sh
rename to modules/distribution/src/main/resources/api-server/bin/email-monitor.sh
index 7818e5f230..38be7ded57 100644
--- a/modules/distribution/src/main/resources/email-monitor/bin/email-monitor.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/email-monitor.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -29,7 +29,7 @@ EXTRA_ARGS=""
SERVERS=""
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-email-monitor.log"
LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
diff --git a/modules/distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh b/modules/distribution/src/main/resources/api-server/bin/parser-wm-daemon.sh
similarity index 97%
rename from modules/distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh
rename to modules/distribution/src/main/resources/api-server/bin/parser-wm-daemon.sh
index 98c5efdfbd..2a6d5a5374 100644
--- a/modules/distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/parser-wm-daemon.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -30,7 +30,7 @@ SERVERS=""
LOGO=true
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-daemon.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-parser-wm.log"
LOG_FILE=$DEFAULT_LOG_FILE
SERVICE_NAME="Parser Workflow Manager"
diff --git a/modules/distribution/src/main/resources/parser-wm/bin/parser-wm.sh b/modules/distribution/src/main/resources/api-server/bin/parser-wm.sh
similarity index 95%
rename from modules/distribution/src/main/resources/parser-wm/bin/parser-wm.sh
rename to modules/distribution/src/main/resources/api-server/bin/parser-wm.sh
index 2d73401eb6..9044e35be3 100644
--- a/modules/distribution/src/main/resources/parser-wm/bin/parser-wm.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/parser-wm.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -29,7 +29,7 @@ EXTRA_ARGS=""
SERVERS=""
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-parser-wm.log"
LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
diff --git a/modules/distribution/src/main/resources/participant/bin/participant-daemon.sh b/modules/distribution/src/main/resources/api-server/bin/participant-daemon.sh
similarity index 97%
rename from modules/distribution/src/main/resources/participant/bin/participant-daemon.sh
rename to modules/distribution/src/main/resources/api-server/bin/participant-daemon.sh
index 4efd413ea6..7c294045b2 100644
--- a/modules/distribution/src/main/resources/participant/bin/participant-daemon.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/participant-daemon.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -30,7 +30,7 @@ SERVERS=""
LOGO=true
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-daemon.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-participant.log"
LOG_FILE=$DEFAULT_LOG_FILE
SERVICE_NAME="Helix Participant"
diff --git a/modules/distribution/src/main/resources/participant/bin/participant.sh b/modules/distribution/src/main/resources/api-server/bin/participant.sh
similarity index 95%
rename from modules/distribution/src/main/resources/participant/bin/participant.sh
rename to modules/distribution/src/main/resources/api-server/bin/participant.sh
index b840c1a056..dd5e551292 100644
--- a/modules/distribution/src/main/resources/participant/bin/participant.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/participant.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -29,7 +29,7 @@ EXTRA_ARGS=""
SERVERS=""
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-participant.log"
LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
diff --git a/modules/distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh b/modules/distribution/src/main/resources/api-server/bin/post-wm-daemon.sh
similarity index 97%
rename from modules/distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh
rename to modules/distribution/src/main/resources/api-server/bin/post-wm-daemon.sh
index dcc602cd09..ed95822e32 100644
--- a/modules/distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/post-wm-daemon.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -30,7 +30,7 @@ SERVERS=""
LOGO=true
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-daemon.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-post-wm.log"
LOG_FILE=$DEFAULT_LOG_FILE
SERVICE_NAME="Post Workflow Manager"
diff --git a/modules/distribution/src/main/resources/post-wm/bin/post-wm.sh b/modules/distribution/src/main/resources/api-server/bin/post-wm.sh
similarity index 95%
rename from modules/distribution/src/main/resources/post-wm/bin/post-wm.sh
rename to modules/distribution/src/main/resources/api-server/bin/post-wm.sh
index f206227bb4..9680231657 100644
--- a/modules/distribution/src/main/resources/post-wm/bin/post-wm.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/post-wm.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -29,7 +29,7 @@ EXTRA_ARGS=""
SERVERS=""
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-post-wm.log"
LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
diff --git a/modules/distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh b/modules/distribution/src/main/resources/api-server/bin/pre-wm-daemon.sh
similarity index 97%
rename from modules/distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh
rename to modules/distribution/src/main/resources/api-server/bin/pre-wm-daemon.sh
index e831b878bb..c8aa736a24 100644
--- a/modules/distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/pre-wm-daemon.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -30,7 +30,7 @@ SERVERS=""
LOGO=true
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-daemon.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-pre-wm.log"
LOG_FILE=$DEFAULT_LOG_FILE
SERVICE_NAME="Pre Workflow Manager"
diff --git a/modules/distribution/src/main/resources/pre-wm/bin/pre-wm.sh b/modules/distribution/src/main/resources/api-server/bin/pre-wm.sh
similarity index 95%
rename from modules/distribution/src/main/resources/pre-wm/bin/pre-wm.sh
rename to modules/distribution/src/main/resources/api-server/bin/pre-wm.sh
index 8c1c2dbae2..386bd01cda 100644
--- a/modules/distribution/src/main/resources/pre-wm/bin/pre-wm.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/pre-wm.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -29,7 +29,7 @@ EXTRA_ARGS=""
SERVERS=""
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-pre-wm.log"
LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
diff --git a/modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh b/modules/distribution/src/main/resources/api-server/bin/realtime-monitor-daemon.sh
similarity index 97%
rename from modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh
rename to modules/distribution/src/main/resources/api-server/bin/realtime-monitor-daemon.sh
index f1cb326227..1ce5e5d9d6 100644
--- a/modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/realtime-monitor-daemon.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -30,7 +30,7 @@ SERVERS=""
LOGO=true
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-daemon.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-realtime-monitor.log"
LOG_FILE=$DEFAULT_LOG_FILE
SERVICE_NAME="Realtime Monitor"
diff --git a/modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh b/modules/distribution/src/main/resources/api-server/bin/realtime-monitor.sh
similarity index 95%
rename from modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh
rename to modules/distribution/src/main/resources/api-server/bin/realtime-monitor.sh
index 351029ff77..c46b53b897 100644
--- a/modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/realtime-monitor.sh
@@ -21,7 +21,7 @@
# Capture user's working dir before changing directory
CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
-LOGO_FILE="logo.txt"
+LOGO_FILE="${AIRAVATA_HOME}/logo.txt"
JAVA_OPTS="-Dairavata.config.dir=${AIRAVATA_HOME}/conf -Dairavata.home=${AIRAVATA_HOME} -Dlog4j.configurationFile=file:${AIRAVATA_HOME}/conf/log4j2.xml"
AIRAVATA_COMMAND=""
@@ -29,7 +29,7 @@ EXTRA_ARGS=""
SERVERS=""
IS_SUBSET=false
SUBSET=""
-DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata.out"
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/airavata-realtime-monitor.log"
LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
diff --git a/modules/distribution/src/main/resources/sharing-registry/bin/sharing-registry.sh b/modules/distribution/src/main/resources/api-server/bin/sharing-registry.sh
similarity index 98%
rename from modules/distribution/src/main/resources/sharing-registry/bin/sharing-registry.sh
rename to modules/distribution/src/main/resources/api-server/bin/sharing-registry.sh
index 07c76127c1..f8d1d72506 100644
--- a/modules/distribution/src/main/resources/sharing-registry/bin/sharing-registry.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/sharing-registry.sh
@@ -83,7 +83,7 @@ then
else
if $IS_DAEMON_MODE ; then
echo "Starting Sharing Registry Server in daemon mode..."
- $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath "$SHARING_REGISTRY_CLASSPATH" org.apache.airavata.sharing.registry.server.ServerMain $* > /dev/null 2>&1 &
+ $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath "$SHARING_REGISTRY_CLASSPATH" org.apache.airavata.sharing.registry.server.ServerMain $* > $LOG_FILE 2>&1 &
else
$JAVA_HOME/bin/java ${JAVA_OPTS} -classpath "$SHARING_REGISTRY_CLASSPATH" org.apache.airavata.sharing.registry.server.ServerMain $*
fi
diff --git a/modules/distribution/src/main/resources/api-server/bin/startNetworkServer b/modules/distribution/src/main/resources/api-server/bin/start-network-server.sh
similarity index 100%
rename from modules/distribution/src/main/resources/api-server/bin/startNetworkServer
rename to modules/distribution/src/main/resources/api-server/bin/start-network-server.sh
diff --git a/modules/distribution/src/main/resources/api-server/conf/airavata-server.properties b/modules/distribution/src/main/resources/api-server/conf/airavata-server.properties
new file mode 100644
index 0000000000..da74d52d63
--- /dev/null
+++ b/modules/distribution/src/main/resources/api-server/conf/airavata-server.properties
@@ -0,0 +1,102 @@
+# 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.
+#
+
+
+# Helix Configuration
+helix.cluster.name=AiravataDemoCluster
+helix.controller.name=helixcontroller
+helix.participant.name=helixparticipant
+
+# Zookeeper Configuration
+embedded.zk=false
+zookeeper.server.connection=airavata.host:2181
+zookeeper.timeout=30000
+
+# RabbitMQ Configuration
+rabbitmq.broker.url=amqp://airavata:123456@airavata.host:5672/master
+rabbitmq.status.exchange.name=status_exchange
+rabbitmq.process.exchange.name=process_exchange
+rabbitmq.experiment.exchange.name=experiment_exchange
+durable.queue=false
+prefetch.count=200
+process.launch.queue.name=process.launch.queue
+experiment.launch.queue.name=experiment.launch.queue
+
+# Kafka Configuration
+kafka.broker.url=airavata.host:9092
+kafka.broker.topic=parsed-data
+kafka.broker.consumer.group=MonitoringConsumer
+kafka.parsing.broker.url=airavata.host:9092
+kafka.parser.topic=CHANGE_ME
+kafka.parsing.broker.publisher.id=CHANGE_ME
+kafka.parser.broker.consumer.group=CHANGE_ME
+
+# Job Monitor Configuration
+job.notification.emailids=
+job.notification.enable=true
+job.status.publish.endpoint=http://airavata.host:8082/topics/helix-airavata-mq
+job.monitor.broker.url=airavata.host:9092
+job.monitor.broker.topic=parsed-data
+job.monitor.broker.publisher.id=RealtimeProducer
+# job.monitor.broker.publisher.id=EmailBasedProducer
+
+# Job Monitor Configuration - Email Monitor
+email.based.monitor.host=imap.gmail.com
+email.based.monitor.address=ansibletestairavata@gmail.com
+email.based.monitor.password=CHANGEME
+email.based.monitor.folder.name=INBOX
+email.based.monitor.store.protocol=imaps
+email.based.monitoring.period=10000
+email.expiration.minutes=60
+
+# Job Monitor Configuration - Realtime Monitor
+realtime.monitor.broker.url=airavata.host:9092
+realtime.monitor.broker.consumer.group=monitor
+realtime.monitor.broker.topic=helix-airavata-mq
+
+# Registry
+regserver.server.host=airavata.host
+regserver.server.port=8970
+
+# Parser WM
+parser.workflow.manager.monitoring.host=airavata.host
+parser.workflow.manager.monitoring.port=9095
+parser.workflow.manager.monitoring.enabled=true
+parser.workflow.manager.name=parserwm
+parser.storage.resource.id=CHANGE_ME
+
+# Credential Store
+credential.store.server.host=airavata.host
+credential.store.server.port=8960
+
+# Participant
+participant.monitoring.host=airavata.host
+participant.monitoring.port=9096
+participant.monitoring.enabled=true
+
+# Pre WM
+pre.workflow.manager.monitoring.host=airavata.host
+pre.workflow.manager.monitoring.port=9093
+pre.workflow.manager.monitoring.enabled=true
+pre.workflow.manager.name=prewm
+
+# Post WM
+post.workflow.manager.monitoring.host=airavata.host
+post.workflow.manager.monitoring.port=9094
+post.workflow.manager.monitoring.enabled=true
+post.workflow.manager.name=postwm
diff --git a/modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml b/modules/distribution/src/main/resources/api-server/conf/email-config.yaml
similarity index 100%
rename from modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml
rename to modules/distribution/src/main/resources/api-server/conf/email-config.yaml
diff --git a/modules/distribution/src/main/resources/controller/conf/log4j2.xml b/modules/distribution/src/main/resources/api-server/conf/log4j2.xml
similarity index 100%
rename from modules/distribution/src/main/resources/controller/conf/log4j2.xml
rename to modules/distribution/src/main/resources/api-server/conf/log4j2.xml
diff --git a/modules/distribution/src/main/resources/controller/bin/setenv.sh b/modules/distribution/src/main/resources/controller/bin/setenv.sh
deleted file mode 100755
index 9e894e1db7..0000000000
--- a/modules/distribution/src/main/resources/controller/bin/setenv.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-AIRAVATA_CLASSPATH=""
-
-for f in "$AIRAVATA_HOME"/lib/*.jar
-do
- AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
-done
-
-export AIRAVATA_HOME
-export AIRAVATA_CLASSPATH
diff --git a/modules/distribution/src/main/resources/controller/conf/airavata-server.properties b/modules/distribution/src/main/resources/controller/conf/airavata-server.properties
deleted file mode 100644
index eda8e2d20a..0000000000
--- a/modules/distribution/src/main/resources/controller/conf/airavata-server.properties
+++ /dev/null
@@ -1,31 +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.
-#
-
-###########################################################################
-# Helix Controller configurations
-###########################################################################
-
-helix.cluster.name=AiravataDemoCluster
-helix.controller.name=helixcontroller
-
-###########################################################################
-# Zookeeper Server Configuration
-###########################################################################
-embedded.zk=false
-zookeeper.server.connection=192.168.99.103:2181
-zookeeper.timeout=30000
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/email-monitor/bin/setenv.sh b/modules/distribution/src/main/resources/email-monitor/bin/setenv.sh
deleted file mode 100755
index 9e894e1db7..0000000000
--- a/modules/distribution/src/main/resources/email-monitor/bin/setenv.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-AIRAVATA_CLASSPATH=""
-
-for f in "$AIRAVATA_HOME"/lib/*.jar
-do
- AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
-done
-
-export AIRAVATA_HOME
-export AIRAVATA_CLASSPATH
diff --git a/modules/distribution/src/main/resources/email-monitor/conf/airavata-server.properties b/modules/distribution/src/main/resources/email-monitor/conf/airavata-server.properties
deleted file mode 100644
index 8c32e869f5..0000000000
--- a/modules/distribution/src/main/resources/email-monitor/conf/airavata-server.properties
+++ /dev/null
@@ -1,36 +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.
-#
-
-#These properties will be used to enable email based monitoring
-email.based.monitor.host=imap.gmail.com
-email.based.monitor.address=CHANGEME
-email.based.monitor.password=CHANGEME
-email.based.monitor.folder.name=INBOX
-# either imaps or pop3
-email.based.monitor.store.protocol=imaps
-#These property will be used to query the email server periodically. value in milliseconds(ms).
-email.based.monitoring.period=10000
-
-#These properties will be used to published parsed email messages to job monitor queue
-job.monitor.broker.url=CHANGEME
-job.monitor.broker.topic=parsed-data
-job.monitor.broker.publisher.id=EmailBasedProducer
-
-zookeeper.server.connection=localhost:2181
-zookeeper.timeout=30000
-email.expiration.minutes=60
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/email-monitor/conf/log4j2.xml b/modules/distribution/src/main/resources/email-monitor/conf/log4j2.xml
deleted file mode 100644
index e38f7ff011..0000000000
--- a/modules/distribution/src/main/resources/email-monitor/conf/log4j2.xml
+++ /dev/null
@@ -1,53 +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.
-
--->
-<Configuration status="WARN">
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
- filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <Root level="INFO">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="RollingFileAppender"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/parser-wm/bin/setenv.sh b/modules/distribution/src/main/resources/parser-wm/bin/setenv.sh
deleted file mode 100644
index 0621135514..0000000000
--- a/modules/distribution/src/main/resources/parser-wm/bin/setenv.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-AIRAVATA_CLASSPATH=""
-
-for f in "$AIRAVATA_HOME"/lib/*.jar
-do
- AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
-done
-
-export AIRAVATA_HOME
-export AIRAVATA_CLASSPATH
diff --git a/modules/distribution/src/main/resources/parser-wm/conf/airavata-server.properties b/modules/distribution/src/main/resources/parser-wm/conf/airavata-server.properties
deleted file mode 100644
index 7b2d975b2c..0000000000
--- a/modules/distribution/src/main/resources/parser-wm/conf/airavata-server.properties
+++ /dev/null
@@ -1,65 +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.
-#
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver.server.host=192.168.1.8
-regserver.server.port=8970
-
-###########################################################################
-# Helix workflow manager configurations
-###########################################################################
-kafka.broker.url=192.168.99.103:9092
-helix.cluster.name=AiravataDemoCluster
-parser.workflow.manager.name=parserwm
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-#for simple scenarios we can use the guest user
-#rabbitmq.broker.url=amqp://localhost:5672
-#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
-# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-rabbitmq.broker.url=amqp://airavata:123456@192.168.1.8:5672/master
-rabbitmq.status.exchange.name=status_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.experiment.exchange.name=experiment_exchange
-durable.queue=false
-prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
-
-###########################################################################
-# Zookeeper Server Configuration
-###########################################################################
-zookeeper.server.connection=192.168.99.103:2181
-zookeeper.timeout=30000
-
-###########################################################################
-# Data Parser Configurations
-###########################################################################
-kafka.parsing.broker.url=CHANGE_ME
-kafka.parser.broker.consumer.group=CHANGE_ME
-kafka.parser.topic=CHANGE_ME
-parser.storage.resource.id=CHANGE_ME
-kafka.parsing.broker.publisher.id=CHANGE_ME
-
-parser.workflow.manager.monitoring.enabled=true
-parser.workflow.manager.monitoring.host=localhost
-parser.workflow.manager.monitoring.port=9095
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/parser-wm/conf/log4j2.xml b/modules/distribution/src/main/resources/parser-wm/conf/log4j2.xml
deleted file mode 100644
index e38f7ff011..0000000000
--- a/modules/distribution/src/main/resources/parser-wm/conf/log4j2.xml
+++ /dev/null
@@ -1,53 +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.
-
--->
-<Configuration status="WARN">
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
- filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <Root level="INFO">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="RollingFileAppender"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/participant/bin/setenv.sh b/modules/distribution/src/main/resources/participant/bin/setenv.sh
deleted file mode 100755
index 9e894e1db7..0000000000
--- a/modules/distribution/src/main/resources/participant/bin/setenv.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-AIRAVATA_CLASSPATH=""
-
-for f in "$AIRAVATA_HOME"/lib/*.jar
-do
- AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
-done
-
-export AIRAVATA_HOME
-export AIRAVATA_CLASSPATH
diff --git a/modules/distribution/src/main/resources/participant/conf/airavata-server.properties b/modules/distribution/src/main/resources/participant/conf/airavata-server.properties
deleted file mode 100644
index dc8a4654ce..0000000000
--- a/modules/distribution/src/main/resources/participant/conf/airavata-server.properties
+++ /dev/null
@@ -1,77 +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.
-#
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver.server.host=192.168.99.103
-regserver.server.port=8970
-
-###########################################################################
-# Credential Store module Configuration
-###########################################################################
-credential.store.server.host=192.168.99.103
-credential.store.server.port=8960
-
-###########################################################################
-# Monitoring module Configuration
-###########################################################################
-email.based.monitor.address=ansibletestairavata@gmail.com
-job.notification.emailids=
-job.notification.enable=true
-
-###########################################################################
-# Helix workflow manager configurations
-###########################################################################
-helix.cluster.name=AiravataDemoCluster
-helix.participant.name=helixparticipant
-job.status.publish.endpoint=http://149.165.156.211:8082/topics/helix-airavata-mq
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-#for simple scenarios we can use the guest user
-#rabbitmq.broker.url=amqp://localhost:5672
-#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
-# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-rabbitmq.broker.url=amqp://airavata:123456@192.168.99.103:5672/master
-rabbitmq.status.exchange.name=status_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.experiment.exchange.name=experiment_exchange
-durable.queue=false
-prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch.queue.name=experiment.launch.queue
-
-###########################################################################
-# Zookeeper Server Configuration
-###########################################################################
-zookeeper.server.connection=192.168.99.103:2181
-zookeeper.timeout=30000
-
-###########################################################################
-# Data Parser Configurations
-###########################################################################
-kafka.parsing.broker.url=CHANGE_ME
-kafka.parser.broker.consumer.group=CHANGE_ME
-kafka.parser.topic=CHANGE_ME
-parser.storage.resource.id=CHANGE_ME
-
-participant.monitoring.enabled=true
-participant.monitoring.host=localhost
-participant.monitoring.port=9096
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/participant/conf/cred_store.jks b/modules/distribution/src/main/resources/participant/conf/cred_store.jks
deleted file mode 100644
index aeb124dd58..0000000000
Binary files a/modules/distribution/src/main/resources/participant/conf/cred_store.jks and /dev/null differ
diff --git a/modules/distribution/src/main/resources/participant/conf/log4j2.xml b/modules/distribution/src/main/resources/participant/conf/log4j2.xml
deleted file mode 100644
index e38f7ff011..0000000000
--- a/modules/distribution/src/main/resources/participant/conf/log4j2.xml
+++ /dev/null
@@ -1,53 +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.
-
--->
-<Configuration status="WARN">
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
- filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <Root level="INFO">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="RollingFileAppender"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/post-wm/bin/setenv.sh b/modules/distribution/src/main/resources/post-wm/bin/setenv.sh
deleted file mode 100755
index 9e894e1db7..0000000000
--- a/modules/distribution/src/main/resources/post-wm/bin/setenv.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-AIRAVATA_CLASSPATH=""
-
-for f in "$AIRAVATA_HOME"/lib/*.jar
-do
- AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
-done
-
-export AIRAVATA_HOME
-export AIRAVATA_CLASSPATH
diff --git a/modules/distribution/src/main/resources/post-wm/conf/airavata-server.properties b/modules/distribution/src/main/resources/post-wm/conf/airavata-server.properties
deleted file mode 100644
index 849860f255..0000000000
--- a/modules/distribution/src/main/resources/post-wm/conf/airavata-server.properties
+++ /dev/null
@@ -1,58 +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.
-#
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver.server.host=192.168.99.103
-regserver.server.port=8970
-
-###########################################################################
-# Helix workflow manager configurations
-###########################################################################
-kafka.broker.url=192.168.99.103:9092
-kafka.broker.topic=parsed-data
-kafka.broker.consumer.group=MonitoringConsumer
-helix.cluster.name=AiravataDemoCluster
-post.workflow.manager.name=postwm
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-#for simple scenarios we can use the guest user
-#rabbitmq.broker.url=amqp://localhost:5672
-#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
-# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-rabbitmq.broker.url=amqp://airavata:123456@192.168.99.103:5672/master
-rabbitmq.status.exchange.name=status_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.experiment.exchange.name=experiment_exchange
-durable.queue=false
-prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
-
-###########################################################################
-# Zookeeper Server Configuration
-###########################################################################
-zookeeper.server.connection=192.168.99.103:2181
-zookeeper.timeout=30000
-
-post.workflow.manager.monitoring.enabled=true
-post.workflow.manager.monitoring.host=localhost
-post.workflow.manager.monitoring.port=9094
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/post-wm/conf/log4j2.xml b/modules/distribution/src/main/resources/post-wm/conf/log4j2.xml
deleted file mode 100644
index e38f7ff011..0000000000
--- a/modules/distribution/src/main/resources/post-wm/conf/log4j2.xml
+++ /dev/null
@@ -1,53 +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.
-
--->
-<Configuration status="WARN">
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
- filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <Root level="INFO">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="RollingFileAppender"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/pre-wm/bin/setenv.sh b/modules/distribution/src/main/resources/pre-wm/bin/setenv.sh
deleted file mode 100755
index 9e894e1db7..0000000000
--- a/modules/distribution/src/main/resources/pre-wm/bin/setenv.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-AIRAVATA_CLASSPATH=""
-
-for f in "$AIRAVATA_HOME"/lib/*.jar
-do
- AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
-done
-
-export AIRAVATA_HOME
-export AIRAVATA_CLASSPATH
diff --git a/modules/distribution/src/main/resources/pre-wm/conf/airavata-server.properties b/modules/distribution/src/main/resources/pre-wm/conf/airavata-server.properties
deleted file mode 100644
index 2eca988cb2..0000000000
--- a/modules/distribution/src/main/resources/pre-wm/conf/airavata-server.properties
+++ /dev/null
@@ -1,55 +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.
-#
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver.server.host=192.168.99.103
-regserver.server.port=8970
-
-###########################################################################
-# Helix workflow manager configurations
-###########################################################################
-helix.cluster.name=AiravataDemoCluster
-pre.workflow.manager.name=prewm
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-#for simple scenarios we can use the guest user
-#rabbitmq.broker.url=amqp://localhost:5672
-#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
-# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-rabbitmq.broker.url=amqp://airavata:123456@192.168.99.103:5672/master
-rabbitmq.status.exchange.name=status_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.experiment.exchange.name=experiment_exchange
-durable.queue=false
-prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
-
-###########################################################################
-# Zookeeper Server Configuration
-###########################################################################
-zookeeper.server.connection=192.168.99.103:2181
-zookeeper.timeout=30000
-
-pre.workflow.manager.monitoring.enabled=true
-pre.workflow.manager.monitoring.host=localhost
-pre.workflow.manager.monitoring.port=9093
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/pre-wm/conf/log4j2.xml b/modules/distribution/src/main/resources/pre-wm/conf/log4j2.xml
deleted file mode 100644
index e38f7ff011..0000000000
--- a/modules/distribution/src/main/resources/pre-wm/conf/log4j2.xml
+++ /dev/null
@@ -1,53 +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.
-
--->
-<Configuration status="WARN">
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
- filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <Root level="INFO">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="RollingFileAppender"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/realtime-monitor/bin/setenv.sh b/modules/distribution/src/main/resources/realtime-monitor/bin/setenv.sh
deleted file mode 100755
index 9e894e1db7..0000000000
--- a/modules/distribution/src/main/resources/realtime-monitor/bin/setenv.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-AIRAVATA_CLASSPATH=""
-
-for f in "$AIRAVATA_HOME"/lib/*.jar
-do
- AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
-done
-
-export AIRAVATA_HOME
-export AIRAVATA_CLASSPATH
diff --git a/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties b/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
deleted file mode 100644
index 3e2764d04a..0000000000
--- a/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
+++ /dev/null
@@ -1,34 +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.
-#
-
-zookeeper.server.connection=localhost:2181
-zookeeper.timeout=30000
-
-realtime.monitor.broker.url=localhost:9092
-realtime.monitor.broker.consumer.group=monitor
-realtime.monitor.broker.topic=helix-airavata-mq
-
-job.monitor.broker.url=localhost:9092
-job.monitor.broker.topic=parsed-data
-job.monitor.broker.publisher.id=RealtimeProducer
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver.server.host=localhost
-regserver.server.port=8970
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/realtime-monitor/conf/log4j2.xml b/modules/distribution/src/main/resources/realtime-monitor/conf/log4j2.xml
deleted file mode 100644
index e38f7ff011..0000000000
--- a/modules/distribution/src/main/resources/realtime-monitor/conf/log4j2.xml
+++ /dev/null
@@ -1,53 +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.
-
--->
-<Configuration status="WARN">
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
- </Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
- filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="50 MB" />
- </Policies>
- <DefaultRolloverStrategy max="20" />
- </RollingFile>
- </Appenders>
- <Loggers>
- <logger name="ch.qos.logback" level="WARN"/>
- <logger name="org.apache.helix" level="WARN"/>
- <logger name="org.apache.zookeeper" level="ERROR"/>
- <logger name="org.apache.airavata" level="INFO"/>
- <logger name="org.hibernate" level="ERROR"/>
- <Root level="INFO">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="RollingFileAppender"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/sharing-registry/bin/setenv.sh b/modules/distribution/src/main/resources/sharing-registry/bin/setenv.sh
deleted file mode 100644
index 1e5475d9de..0000000000
--- a/modules/distribution/src/main/resources/sharing-registry/bin/setenv.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# 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.
-
-# Get standard environment variables
-# if JAVA_HOME is not set we're not happy
-if [ -z "$JAVA_HOME" ]; then
- echo "You must set the JAVA_HOME variable before running sharing-registry scripts."
- exit 1
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false
-os400=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set SHARING_REGISTRY_HOME if not already set
-[ -z "$SHARING_REGISTRY_HOME" ] && SHARING_REGISTRY_HOME=`cd "$PRGDIR/.." ; pwd`
-
-SHARING_REGISTRY_CLASSPATH=""
-
-for f in "$SHARING_REGISTRY_HOME"/lib/*.jar
-do
- SHARING_REGISTRY_CLASSPATH="$SHARING_REGISTRY_CLASSPATH":$f
-done
-
-export SHARING_REGISTRY_HOME
-export SHARING_REGISTRY_CLASSPATH
\ No newline at end of file
diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml
index cf453cef77..01108b8191 100644
--- a/modules/ide-integration/pom.xml
+++ b/modules/ide-integration/pom.xml
@@ -26,6 +26,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<artifactId>ide-integration</artifactId>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
diff --git a/modules/research-framework/research-service/pom.xml b/modules/research-framework/research-service/pom.xml
index c50c6cb530..58b756a7ee 100644
--- a/modules/research-framework/research-service/pom.xml
+++ b/modules/research-framework/research-service/pom.xml
@@ -191,22 +191,6 @@ under the License.
<release>17</release>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/*.*</include>
- </includes>
- </configuration>
- </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 8775d8f26a..bbbda4741d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,46 +560,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/*.*</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <!-- here the phase you need -->
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/assembly/dist</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -702,11 +662,6 @@ under the License.
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>