You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2019/04/30 18:19:40 UTC
[airavata] branch master updated: Bringing all distributions into
one module
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 62c0182 Bringing all distributions into one module
62c0182 is described below
commit 62c01825a2ad570b6ab910ed24d8d71deba48643
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Tue Apr 30 14:19:30 2019 -0400
Bringing all distributions into one module
---
modules/airavata-helix/helix-distribution/pom.xml | 155 -------------------
.../src/main/assembly/controller-bin-assembly.xml | 86 -----------
.../src/main/assembly/parser-wm-bin-assembly.xml | 85 -----------
.../src/main/assembly/participant-bin-assembly.xml | 87 -----------
.../assembly/platform-monitor-bin-assembly.xml | 86 -----------
.../src/main/assembly/post-wm-bin-assembly.xml | 85 -----------
.../src/main/assembly/pre-wm-bin-assembly.xml | 86 -----------
modules/airavata-helix/pom.xml | 1 -
modules/distribution/pom.xml | 157 +++++++++++++++----
...in-assembly.xml => api-server-bin-assembly.xml} | 27 +---
...rc-assembly.xml => api-server-src-assembly.xml} | 2 +-
.../src/main/assembly/controller-bin-assembly.xml} | 119 ++++++++++-----
.../main/assembly/email-monitor-bin-assembly.xml | 2 +-
.../main/assembly/participant-bin-assembly.xml} | 120 ++++++++++-----
.../assembly/platform-monitor-bin-assembly.xml} | 119 ++++++++++-----
.../src/main/assembly/post-wm-bin-assembly.xml} | 120 ++++++++++-----
.../src/main/assembly/pre-wm-bin-assembly.xml | 167 +++++++++++++++++++++
.../assembly/realtime-monitor-bin-assembly.xml | 2 +-
.../src/main/resources/{ => api-server}/INSTALL | 0
.../src/main/resources/{ => api-server}/LICENSE | 0
.../src/main/resources/{ => api-server}/NOTICE | 0
.../src/main/resources/{ => api-server}/README | 0
.../{ => api-server}/bin/airavata-server-start.sh | 0
.../{ => api-server}/bin/airavata-server-stop.sh | 0
.../{ => api-server}/bin/airavata-server.bat | 0
.../main/resources/{ => api-server}/bin/derby.sh | 2 +-
.../main/resources/{ => api-server}/bin/logo.txt | 0
.../main/resources/{ => api-server}/bin/setenv.bat | 0
.../src/main/resources/api-server}/bin/setenv.sh | 0
.../{ => api-server}/bin/startNetworkServer | 0
.../resources/controller/bin/controller-daemon.sh | 0
.../main/resources/controller/bin/controller.sh | 0
.../src/main/resources/controller}/bin/setenv.sh | 0
.../controller/conf/airavata-server.properties | 0
.../main/resources/controller}/conf/logback.xml | 0
.../email-monitor/bin/email-monitor-daemon.sh | 0
.../resources/email-monitor/bin/email-monitor.sh | 0
.../resources/{ => email-monitor}/bin/setenv.sh | 0
.../email-monitor/conf/airavata-server.properties | 0
.../resources/email-monitor/conf/email-config.yaml | 0
.../main/resources/email-monitor/conf/logback.xml | 0
.../resources/parser-wm/bin/parser-wm-daemon.sh | 0
.../src/main/resources/parser-wm/bin/parser-wm.sh | 0
.../src/main/resources/parser-wm/bin/setenv.sh | 0
.../parser-wm/conf/airavata-server.properties | 0
.../src/main/resources/parser-wm}/conf/logback.xml | 0
.../participant/bin/participant-daemon.sh | 0
.../main/resources/participant/bin/participant.sh | 0
.../src/main/resources/participant}/bin/setenv.sh | 0
.../participant/conf/airavata-server.properties | 0
.../main/resources/participant/conf/cred_store.jks | Bin
.../main/resources/participant}/conf/logback.xml | 0
.../bin/platform-monitor-daemon.sh | 0
.../platform-monitor/bin/platform-monitor.sh | 0
.../main/resources/platform-monitor}/bin/setenv.sh | 0
.../conf/airavata-server.properties | 0
.../resources/platform-monitor/conf/logback.xml | 0
.../main/resources/post-wm/bin/post-wm-daemon.sh | 0
.../src/main/resources/post-wm/bin/post-wm.sh | 0
.../src/main/resources/post-wm}/bin/setenv.sh | 0
.../post-wm/conf/airavata-server.properties | 0
.../src/main/resources/post-wm}/conf/logback.xml | 0
.../src/main/resources/pre-wm/bin/pre-wm-daemon.sh | 0
.../src/main/resources/pre-wm/bin/pre-wm.sh | 0
.../src/main/resources/pre-wm}/bin/setenv.sh | 0
.../pre-wm/conf/airavata-server.properties | 0
.../src/main/resources/pre-wm}/conf/logback.xml | 0
.../bin/realtime-monitor-daemon.sh | 0
.../realtime-monitor/bin/realtime-monitor.sh | 0
.../main/resources/realtime-monitor}/bin/setenv.sh | 0
.../conf/airavata-server.properties | 0
.../resources/realtime-monitor}/conf/logback.xml | 0
.../src/main/resources/samples/registerSample.sh | 24 ---
.../src/main/resources/samples/scripts/add.sh | 21 ---
.../src/main/resources/samples/scripts/echo.sh | 22 ---
.../src/main/resources/samples/scripts/multiply.sh | 22 ---
.../src/main/resources/samples/scripts/subtract.sh | 22 ---
.../job-monitor/job-monitor-distribution/pom.xml | 91 -----------
modules/job-monitor/pom.xml | 1 -
79 files changed, 626 insertions(+), 1085 deletions(-)
diff --git a/modules/airavata-helix/helix-distribution/pom.xml b/modules/airavata-helix/helix-distribution/pom.xml
deleted file mode 100644
index 0b24400..0000000
--- a/modules/airavata-helix/helix-distribution/pom.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>airavata-helix</artifactId>
- <groupId>org.apache.airavata</groupId>
- <version>0.18-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Helix Distribution</name>
- <artifactId>helix-distribution</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>helix-spectator</artifactId>
- <version>0.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>platform-monitor</artifactId>
- <version>0.18-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.5</version>
- <executions>
- <execution>
- <id>controller-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${controller.archieve.name}-${project.version}</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.archieve.name}-${project.version}</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.archieve.name}-${project.version}</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.archieve.name}-${project.version}</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.archive.name}-${project.version}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/parser-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>platform-monitor-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${platform.monitor.archive.name}-${project.version}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/platform-monitor-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <controller.archieve.name>helix-controller</controller.archieve.name>
- <participant.archieve.name>helix-participant</participant.archieve.name>
- <pre.wm.archieve.name>helix-pre-wm</pre.wm.archieve.name>
- <post.wm.archieve.name>helix-post-wm</post.wm.archieve.name>
- <parser.wm.archive.name>helix-parser-wm</parser.wm.archive.name>
- <platform.monitor.archive.name>platform-monitor</platform.monitor.archive.name>
- </properties>
-</project>
\ No newline at end of file
diff --git a/modules/airavata-helix/helix-distribution/src/main/assembly/controller-bin-assembly.xml b/modules/airavata-helix/helix-distribution/src/main/assembly/controller-bin-assembly.xml
deleted file mode 100644
index 4683c68..0000000
--- a/modules/airavata-helix/helix-distribution/src/main/assembly/controller-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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${controller.archieve.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/controller/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/controller/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>logback.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
- </includes>
- <excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
- <exclude>log4j:log4j:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/airavata-helix/helix-distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/airavata-helix/helix-distribution/src/main/assembly/parser-wm-bin-assembly.xml
deleted file mode 100644
index a731d09..0000000
--- a/modules/airavata-helix/helix-distribution/src/main/assembly/parser-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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${parser.wm.archive.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/parser-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/parser-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>logback.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
- </includes>
- <excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
- <exclude>log4j:log4j:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/modules/airavata-helix/helix-distribution/src/main/assembly/participant-bin-assembly.xml b/modules/airavata-helix/helix-distribution/src/main/assembly/participant-bin-assembly.xml
deleted file mode 100644
index ab06bec..0000000
--- a/modules/airavata-helix/helix-distribution/src/main/assembly/participant-bin-assembly.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${participant.archieve.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/participant/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/participant/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>logback.xml</include>
- <include>cred_store.jks</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
- </includes>
- <excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
- <exclude>log4j:log4j:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/airavata-helix/helix-distribution/src/main/assembly/platform-monitor-bin-assembly.xml b/modules/airavata-helix/helix-distribution/src/main/assembly/platform-monitor-bin-assembly.xml
deleted file mode 100644
index 08dfcb0..0000000
--- a/modules/airavata-helix/helix-distribution/src/main/assembly/platform-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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${platform.monitor.archive.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/platform-monitor/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/platform-monitor/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>logback.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
- </includes>
- <excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
- <exclude>log4j:log4j:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/airavata-helix/helix-distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/airavata-helix/helix-distribution/src/main/assembly/post-wm-bin-assembly.xml
deleted file mode 100644
index 07bec56..0000000
--- a/modules/airavata-helix/helix-distribution/src/main/assembly/post-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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${post.wm.archieve.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/post-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/post-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>logback.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
- </includes>
- <excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
- <exclude>log4j:log4j:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
diff --git a/modules/airavata-helix/helix-distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/airavata-helix/helix-distribution/src/main/assembly/pre-wm-bin-assembly.xml
deleted file mode 100644
index b2187e8..0000000
--- a/modules/airavata-helix/helix-distribution/src/main/assembly/pre-wm-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.
-
--->
-<!DOCTYPE assembly [
- <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
- <!ELEMENT id (#PCDATA)>
- <!ELEMENT includeBaseDirectory (#PCDATA)>
- <!ELEMENT baseDirectory (#PCDATA)>
- <!ELEMENT formats (format)*>
- <!ELEMENT format (#PCDATA)>
- <!ELEMENT fileSets (fileSet)*>
- <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
- <!ELEMENT directory (#PCDATA)>
- <!ELEMENT outputDirectory (#PCDATA)>
- <!ELEMENT includes (include)*>
- <!ELEMENT include (#PCDATA)>
- <!ELEMENT dependencySets (dependencySet)*>
- <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
- ]>
-<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${pre.wm.archieve.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/pre-wm/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/pre-wm/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>logback.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./</directory>
- <outputDirectory>logs</outputDirectory>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*:*:jar</include>
- </includes>
- <excludes>
- <exclude>mysql:mysql-connector-java:jar</exclude>
- <exclude>log4j:log4j:jar</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
diff --git a/modules/airavata-helix/pom.xml b/modules/airavata-helix/pom.xml
index 1d2ec0a..219e6bf 100644
--- a/modules/airavata-helix/pom.xml
+++ b/modules/airavata-helix/pom.xml
@@ -40,7 +40,6 @@
<module>task-core</module>
<module>workflow-impl</module>
<module>helix-spectator</module>
- <module>helix-distribution</module>
<module>platform-monitor</module>
</modules>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 6b6e2c0..4a2f061 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -444,6 +444,24 @@
<artifactId>db-event-manager</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>helix-spectator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>email-monitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>realtime-monitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<url>http://airavata.apache.org/</url>
@@ -483,48 +501,124 @@
<version>${maven.assembly.plugin}</version>
<executions>
<execution>
- <id>distribution-package</id>
+ <id>api-server-distribution-package</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
- <finalName>${archieve.name}-${project.version}</finalName>
+ <finalName>${api.server.dist.name}</finalName>
<descriptors>
- <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
+ <descriptor>src/main/assembly/api-server-bin-assembly.xml</descriptor>
<!-- <descriptor>src/main/assembly/src-assembly.xml</descriptor> -->
</descriptors>
<attach>false</attach>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
<execution>
- <id>attach-artifacts</id>
+ <id>controller-distribution-package</id>
<phase>package</phase>
<goals>
- <goal>attach-artifact</goal>
+ <goal>single</goal>
</goals>
<configuration>
- <artifacts>
- <artifact>
- <file>${airavata.bin.zip}</file>
- <type>zip</type>
- <classifier>bin</classifier>
- </artifact>
- <artifact>
- <file>${airavata.bin.tar.gz}</file>
- <type>tar.gz</type>
- <classifier>bin</classifier>
- </artifact>
- </artifacts>
+ <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}-${project.version}</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}-${project.version}</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}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/post-wm-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ <execution>
+ <id>platform-monitor-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${platform.monitor.dist.name}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/platform-monitor-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}-${project.version}</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}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/realtime-monitor-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
</configuration>
</execution>
</executions>
@@ -537,10 +631,13 @@
<jersey.version>1.13</jersey.version>
<grizzly.version>2.0.0-M3</grizzly.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <archieve.name>apache-airavata-server</archieve.name>
- <airavata.dist.name>${archieve.name}-${project.version}</airavata.dist.name>
- <airavata.work.dir>${project.build.directory}/tests/${airavata.dist.name}</airavata.work.dir>
- <airavata.bin.zip>${project.build.directory}/${airavata.dist.name}-bin.zip</airavata.bin.zip>
- <airavata.bin.tar.gz>${project.build.directory}/${airavata.dist.name}-bin.tar.gz</airavata.bin.tar.gz>
+ <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>
+ <platform.monitor.dist.name>apache-airavata-platform-monitor-${project.version}</platform.monitor.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>
</properties>
</project>
diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
similarity index 86%
rename from modules/distribution/src/main/assembly/bin-assembly.xml
rename to modules/distribution/src/main/assembly/api-server-bin-assembly.xml
index 918396e..bca1c76 100644
--- a/modules/distribution/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/api-server-bin-assembly.xml
@@ -38,7 +38,7 @@
<assembly>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${api.server.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -56,7 +56,7 @@
</fileSet>
<!-- ********************** copy licenses, readme etc. ********************** -->
<fileSet>
- <directory>src/main/resources/</directory>
+ <directory>src/main/resources/api-server</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>LICENSE</include>
@@ -86,7 +86,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/bin</directory>
+ <directory>src/main/resources/api-server/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
@@ -97,15 +97,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- <include>**/*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>${project.build.directory}/conf</directory>
<outputDirectory>bin</outputDirectory>
<includes>
@@ -137,18 +128,6 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
-
- <!-- ********************** Copy samples ********************** -->
- <fileSet>
- <directory>${project.build.directory}/samples/applications
- </directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- </includes>
- </fileSet>
-
</fileSets>
<dependencySets>
diff --git a/modules/distribution/src/main/assembly/src-assembly.xml b/modules/distribution/src/main/assembly/api-server-src-assembly.xml
similarity index 98%
rename from modules/distribution/src/main/assembly/src-assembly.xml
rename to modules/distribution/src/main/assembly/api-server-src-assembly.xml
index 02a71be..ba27b2f 100644
--- a/modules/distribution/src/main/assembly/src-assembly.xml
+++ b/modules/distribution/src/main/assembly/api-server-src-assembly.xml
@@ -22,7 +22,7 @@
<assembly>
<id>src</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${api.server.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
similarity index 50%
copy from modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
copy to modules/distribution/src/main/assembly/controller-bin-assembly.xml
index b0835b9..48145e0 100644
--- a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -1,4 +1,5 @@
<!--
+
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
@@ -36,16 +37,15 @@
<assembly>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${email.monitor.archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${controller.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<fileSets>
-
<fileSet>
- <directory>src/main/resources/email-monitor/bin</directory>
+ <directory>src/main/resources/controller/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
@@ -53,17 +53,13 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/email-monitor/conf</directory>
+ <directory>src/main/resources/controller/conf</directory>
<outputDirectory>conf</outputDirectory>
- <fileMode>777</fileMode>
<includes>
<include>airavata-server.properties</include>
- <include>email-config.yaml</include>
<include>logback.xml</include>
</includes>
</fileSet>
-
- <!-- Create logs directory -->
<fileSet>
<directory>./</directory>
<outputDirectory>logs</outputDirectory>
@@ -71,53 +67,100 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
-
</fileSets>
<dependencySets>
-
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.airavata:email-monitor:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
-
+ <include>javax.activation:activation:jar</include>
+ <include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-pool:commons-pool</include>
+ <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
-
- <include>javax.mail:mail:jar</include>
- <include>javax.activation:activation:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
-
- <!-- kafka specific jars -->
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
-
- <!-- curator and zookeeper jars -->
- <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.airavata:airavata-messaging-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-cpi:jar</include>
+ <include>org.apache.airavata:airavata-server-configuration:jar</include>
+ <include>com.rabbitmq:amqp-client:jar</include>
+ <include>asm:asm:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
+ <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>commons-cli:commons-cli:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
+ <include>commons-collections:commons-collections:jar</include>
+ <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>commons-io:commons-io:jar</include>
+ <include>commons-lang:commons-lang:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.apache.commons:commons-math:jar</include>
+ <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
+ <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>net.i2p.crypto:eddsa:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
+ <include>org.codehaus.groovy:groovy:jar</include>
+ <include>org.codehaus.groovy:groovy-templates:jar</include>
+ <include>org.codehaus.groovy:groovy-xml:jar</include>
+ <include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
+ <include>org.hamcrest:hamcrest-core:jar</include>
+ <include>org.apache.helix:helix-core:jar</include>
+ <include>org.apache.airavata:helix-spectator:jar</include>
+ <include>org.apache.httpcomponents:httpclient:jar</include>
+ <include>org.apache.httpcomponents:httpcore:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
+ <include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
- <include>org.jboss.netty:netty:jar</include>
-
- <include>com.google.code.gson:gson:jar</include>
-
- <!-- logging jars -->
- <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.apache.airavata:job-monitor-api:jar</include>
+ <include>junit:junit:jar</include>
+ <include>com.jcraft:jzlib:jar</include>
+ <include>org.apache.kafka:kafka-clients:jar</include>
+ <include>org.apache.thrift:libthrift:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>ch.qos.logback:logback-classic:jar</include>
<include>ch.qos.logback:logback-core:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
+ <include>org.lz4:lz4-java:jar</include>
+ <include>javax.mail:mail:jar</include>
+ <include>io.dropwizard.metrics:metrics-core:jar</include>
+ <include>org.jboss.netty:netty:jar</include>
+ <include>org.apache.openjpa:openjpa:jar</include>
+ <include>org.apache.airavata:platform-monitor:jar</include>
+ <include>org.apache.airavata:registry-api-service:jar</include>
+ <include>org.apache.airavata:registry-api-stubs:jar</include>
+ <include>net.sourceforge.serp:serp:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.yaml:snakeyaml:jar</include>
+ <include>org.xerial.snappy:snappy-java:jar</include>
+ <include>ssh-agent:jar</include>
+ <include>com.hierynomus:sshj:jar</include>
+ <include>org.apache.airavata:sshj-agent:jar</include>
+ <include>org.apache.airavata:task-api:jar</include>
+ <include>org.apache.airavata:task-core:jar</include>
+ <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
+ <include>org.apache.airavata:workflow-impl:jar</include>
+ <include>org.ogce:xpp3:jar</include>
+ <include>org.ogce:xpp5:jar</include>
+ <include>com.101tec:zkclient:jar</include>
+ <include>org.apache.zookeeper:zookeeper:jar</include>
</includes>
+ <excludes>
+ <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>log4j:log4j:jar</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
similarity index 98%
copy from modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
copy to modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
index b0835b9..03588ee 100644
--- a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -36,7 +36,7 @@
<assembly>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${email.monitor.archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${email.monitor.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
similarity index 50%
copy from modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
copy to modules/distribution/src/main/assembly/participant-bin-assembly.xml
index b0835b9..0feff38 100644
--- a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -1,4 +1,5 @@
<!--
+
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
@@ -36,16 +37,15 @@
<assembly>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${email.monitor.archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${participant.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<fileSets>
-
<fileSet>
- <directory>src/main/resources/email-monitor/bin</directory>
+ <directory>src/main/resources/participant/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
@@ -53,17 +53,14 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/email-monitor/conf</directory>
+ <directory>src/main/resources/participant/conf</directory>
<outputDirectory>conf</outputDirectory>
- <fileMode>777</fileMode>
<includes>
<include>airavata-server.properties</include>
- <include>email-config.yaml</include>
<include>logback.xml</include>
+ <include>cred_store.jks</include>
</includes>
</fileSet>
-
- <!-- Create logs directory -->
<fileSet>
<directory>./</directory>
<outputDirectory>logs</outputDirectory>
@@ -71,53 +68,100 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
-
</fileSets>
<dependencySets>
-
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.airavata:email-monitor:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
-
+ <include>javax.activation:activation:jar</include>
+ <include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-pool:commons-pool</include>
+ <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
-
- <include>javax.mail:mail:jar</include>
- <include>javax.activation:activation:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
-
- <!-- kafka specific jars -->
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
-
- <!-- curator and zookeeper jars -->
- <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.airavata:airavata-messaging-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-cpi:jar</include>
+ <include>org.apache.airavata:airavata-server-configuration:jar</include>
+ <include>com.rabbitmq:amqp-client:jar</include>
+ <include>asm:asm:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
+ <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>commons-cli:commons-cli:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
+ <include>commons-collections:commons-collections:jar</include>
+ <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>commons-io:commons-io:jar</include>
+ <include>commons-lang:commons-lang:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.apache.commons:commons-math:jar</include>
+ <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
+ <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>net.i2p.crypto:eddsa:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
+ <include>org.codehaus.groovy:groovy:jar</include>
+ <include>org.codehaus.groovy:groovy-templates:jar</include>
+ <include>org.codehaus.groovy:groovy-xml:jar</include>
+ <include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
+ <include>org.hamcrest:hamcrest-core:jar</include>
+ <include>org.apache.helix:helix-core:jar</include>
+ <include>org.apache.airavata:helix-spectator:jar</include>
+ <include>org.apache.httpcomponents:httpclient:jar</include>
+ <include>org.apache.httpcomponents:httpcore:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
+ <include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
- <include>org.jboss.netty:netty:jar</include>
-
- <include>com.google.code.gson:gson:jar</include>
-
- <!-- logging jars -->
- <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.apache.airavata:job-monitor-api:jar</include>
+ <include>junit:junit:jar</include>
+ <include>com.jcraft:jzlib:jar</include>
+ <include>org.apache.kafka:kafka-clients:jar</include>
+ <include>org.apache.thrift:libthrift:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>ch.qos.logback:logback-classic:jar</include>
<include>ch.qos.logback:logback-core:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
+ <include>org.lz4:lz4-java:jar</include>
+ <include>javax.mail:mail:jar</include>
+ <include>io.dropwizard.metrics:metrics-core:jar</include>
+ <include>org.jboss.netty:netty:jar</include>
+ <include>org.apache.openjpa:openjpa:jar</include>
+ <include>org.apache.airavata:platform-monitor:jar</include>
+ <include>org.apache.airavata:registry-api-service:jar</include>
+ <include>org.apache.airavata:registry-api-stubs:jar</include>
+ <include>net.sourceforge.serp:serp:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.yaml:snakeyaml:jar</include>
+ <include>org.xerial.snappy:snappy-java:jar</include>
+ <include>ssh-agent:jar</include>
+ <include>com.hierynomus:sshj:jar</include>
+ <include>org.apache.airavata:sshj-agent:jar</include>
+ <include>org.apache.airavata:task-api:jar</include>
+ <include>org.apache.airavata:task-core:jar</include>
+ <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
+ <include>org.apache.airavata:workflow-impl:jar</include>
+ <include>org.ogce:xpp3:jar</include>
+ <include>org.ogce:xpp5:jar</include>
+ <include>com.101tec:zkclient:jar</include>
+ <include>org.apache.zookeeper:zookeeper:jar</include>
</includes>
+ <excludes>
+ <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>log4j:log4j:jar</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
similarity index 50%
copy from modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
copy to modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
index b0835b9..2e2362d 100644
--- a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
@@ -1,4 +1,5 @@
<!--
+
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
@@ -36,16 +37,15 @@
<assembly>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${email.monitor.archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${platform.monitor.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<fileSets>
-
<fileSet>
- <directory>src/main/resources/email-monitor/bin</directory>
+ <directory>src/main/resources/platform-monitor/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
@@ -53,17 +53,13 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/email-monitor/conf</directory>
+ <directory>src/main/resources/platform-monitor/conf</directory>
<outputDirectory>conf</outputDirectory>
- <fileMode>777</fileMode>
<includes>
<include>airavata-server.properties</include>
- <include>email-config.yaml</include>
<include>logback.xml</include>
</includes>
</fileSet>
-
- <!-- Create logs directory -->
<fileSet>
<directory>./</directory>
<outputDirectory>logs</outputDirectory>
@@ -71,53 +67,100 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
-
</fileSets>
<dependencySets>
-
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.airavata:email-monitor:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
-
+ <include>javax.activation:activation:jar</include>
+ <include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-pool:commons-pool</include>
+ <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
-
- <include>javax.mail:mail:jar</include>
- <include>javax.activation:activation:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
-
- <!-- kafka specific jars -->
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
-
- <!-- curator and zookeeper jars -->
- <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.airavata:airavata-messaging-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-cpi:jar</include>
+ <include>org.apache.airavata:airavata-server-configuration:jar</include>
+ <include>com.rabbitmq:amqp-client:jar</include>
+ <include>asm:asm:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
+ <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>commons-cli:commons-cli:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
+ <include>commons-collections:commons-collections:jar</include>
+ <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>commons-io:commons-io:jar</include>
+ <include>commons-lang:commons-lang:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.apache.commons:commons-math:jar</include>
+ <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
+ <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>net.i2p.crypto:eddsa:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
+ <include>org.codehaus.groovy:groovy:jar</include>
+ <include>org.codehaus.groovy:groovy-templates:jar</include>
+ <include>org.codehaus.groovy:groovy-xml:jar</include>
+ <include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
+ <include>org.hamcrest:hamcrest-core:jar</include>
+ <include>org.apache.helix:helix-core:jar</include>
+ <include>org.apache.airavata:helix-spectator:jar</include>
+ <include>org.apache.httpcomponents:httpclient:jar</include>
+ <include>org.apache.httpcomponents:httpcore:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
+ <include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
- <include>org.jboss.netty:netty:jar</include>
-
- <include>com.google.code.gson:gson:jar</include>
-
- <!-- logging jars -->
- <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.apache.airavata:job-monitor-api:jar</include>
+ <include>junit:junit:jar</include>
+ <include>com.jcraft:jzlib:jar</include>
+ <include>org.apache.kafka:kafka-clients:jar</include>
+ <include>org.apache.thrift:libthrift:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>ch.qos.logback:logback-classic:jar</include>
<include>ch.qos.logback:logback-core:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
+ <include>org.lz4:lz4-java:jar</include>
+ <include>javax.mail:mail:jar</include>
+ <include>io.dropwizard.metrics:metrics-core:jar</include>
+ <include>org.jboss.netty:netty:jar</include>
+ <include>org.apache.openjpa:openjpa:jar</include>
+ <include>org.apache.airavata:platform-monitor:jar</include>
+ <include>org.apache.airavata:registry-api-service:jar</include>
+ <include>org.apache.airavata:registry-api-stubs:jar</include>
+ <include>net.sourceforge.serp:serp:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.yaml:snakeyaml:jar</include>
+ <include>org.xerial.snappy:snappy-java:jar</include>
+ <include>ssh-agent:jar</include>
+ <include>com.hierynomus:sshj:jar</include>
+ <include>org.apache.airavata:sshj-agent:jar</include>
+ <include>org.apache.airavata:task-api:jar</include>
+ <include>org.apache.airavata:task-core:jar</include>
+ <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
+ <include>org.apache.airavata:workflow-impl:jar</include>
+ <include>org.ogce:xpp3:jar</include>
+ <include>org.ogce:xpp5:jar</include>
+ <include>com.101tec:zkclient:jar</include>
+ <include>org.apache.zookeeper:zookeeper:jar</include>
</includes>
+ <excludes>
+ <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>log4j:log4j:jar</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
similarity index 50%
rename from modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
rename to modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index b0835b9..b9c1d8a 100644
--- a/modules/job-monitor/job-monitor-distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -1,4 +1,5 @@
<!--
+
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
@@ -36,16 +37,15 @@
<assembly>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${email.monitor.archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${post.wm.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<fileSets>
-
<fileSet>
- <directory>src/main/resources/email-monitor/bin</directory>
+ <directory>src/main/resources/post-wm/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
@@ -53,17 +53,13 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/resources/email-monitor/conf</directory>
+ <directory>src/main/resources/post-wm/conf</directory>
<outputDirectory>conf</outputDirectory>
- <fileMode>777</fileMode>
<includes>
<include>airavata-server.properties</include>
- <include>email-config.yaml</include>
<include>logback.xml</include>
</includes>
</fileSet>
-
- <!-- Create logs directory -->
<fileSet>
<directory>./</directory>
<outputDirectory>logs</outputDirectory>
@@ -71,54 +67,100 @@
<exclude>*/**</exclude>
</excludes>
</fileSet>
-
</fileSets>
<dependencySets>
-
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.airavata:email-monitor:jar</include>
- <include>org.apache.airavata:job-monitor-api:jar</include>
- <include>org.apache.airavata:task-core:jar</include>
- <include>org.apache.airavata:registry-api-stubs:jar</include>
-
+ <include>javax.activation:activation:jar</include>
+ <include>org.apache.airavata:agent-api:jar</include>
<include>org.apache.airavata:airavata-commons:jar</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-pool:commons-pool</include>
+ <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
<include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.thrift:libthrift:jar</include>
-
- <include>javax.mail:mail:jar</include>
- <include>javax.activation:activation:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
-
- <!-- kafka specific jars -->
- <include>org.apache.kafka:kafka-clients:jar</include>
- <include>org.lz4:lz4-java:jar</include>
- <include>org.xerial.snappy:snappy-java:jar</include>
-
- <!-- curator and zookeeper jars -->
- <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.airavata:airavata-messaging-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-cpi:jar</include>
+ <include>org.apache.airavata:airavata-server-configuration:jar</include>
+ <include>com.rabbitmq:amqp-client:jar</include>
+ <include>asm:asm:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
+ <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>commons-cli:commons-cli:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
+ <include>commons-collections:commons-collections:jar</include>
+ <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>commons-io:commons-io:jar</include>
+ <include>commons-lang:commons-lang:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.apache.commons:commons-math:jar</include>
+ <include>commons-pool:commons-pool:jar</include>
<include>org.apache.curator:curator-client:jar</include>
+ <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>net.i2p.crypto:eddsa:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
+ <include>org.codehaus.groovy:groovy:jar</include>
+ <include>org.codehaus.groovy:groovy-templates:jar</include>
+ <include>org.codehaus.groovy:groovy-xml:jar</include>
+ <include>com.google.code.gson:gson:jar</include>
<include>com.google.guava:guava:jar</include>
- <include>org.apache.zookeeper:zookeeper:jar</include>
+ <include>org.hamcrest:hamcrest-core:jar</include>
+ <include>org.apache.helix:helix-core:jar</include>
+ <include>org.apache.airavata:helix-spectator:jar</include>
+ <include>org.apache.httpcomponents:httpclient:jar</include>
+ <include>org.apache.httpcomponents:httpcore:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
+ <include>jakarta-regexp:jakarta-regexp:jar</include>
<include>jline:jline:jar</include>
- <include>org.jboss.netty:netty:jar</include>
-
- <include>com.google.code.gson:gson:jar</include>
-
- <!-- logging jars -->
- <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.apache.airavata:job-monitor-api:jar</include>
+ <include>junit:junit:jar</include>
+ <include>com.jcraft:jzlib:jar</include>
+ <include>org.apache.kafka:kafka-clients:jar</include>
+ <include>org.apache.thrift:libthrift:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>ch.qos.logback:logback-classic:jar</include>
<include>ch.qos.logback:logback-core:jar</include>
- <include>org.slf4j:log4j-over-slf4j:jar</include>
<include>com.github.danielwegener:logback-kafka-appender:jar</include>
<include>net.logstash.logback:logstash-logback-encoder:jar</include>
+ <include>org.lz4:lz4-java:jar</include>
+ <include>javax.mail:mail:jar</include>
+ <include>io.dropwizard.metrics:metrics-core:jar</include>
+ <include>org.jboss.netty:netty:jar</include>
+ <include>org.apache.openjpa:openjpa:jar</include>
+ <include>org.apache.airavata:platform-monitor:jar</include>
+ <include>org.apache.airavata:registry-api-service:jar</include>
+ <include>org.apache.airavata:registry-api-stubs:jar</include>
+ <include>net.sourceforge.serp:serp:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.yaml:snakeyaml:jar</include>
+ <include>org.xerial.snappy:snappy-java:jar</include>
+ <include>ssh-agent:jar</include>
+ <include>com.hierynomus:sshj:jar</include>
+ <include>org.apache.airavata:sshj-agent:jar</include>
+ <include>org.apache.airavata:task-api:jar</include>
+ <include>org.apache.airavata:task-core:jar</include>
+ <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
+ <include>org.apache.airavata:workflow-impl:jar</include>
+ <include>org.ogce:xpp3:jar</include>
+ <include>org.ogce:xpp5:jar</include>
+ <include>com.101tec:zkclient:jar</include>
+ <include>org.apache.zookeeper:zookeeper:jar</include>
</includes>
+ <excludes>
+ <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>log4j:log4j:jar</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
-
</assembly>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
new file mode 100644
index 0000000..ddaa103
--- /dev/null
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -0,0 +1,167 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE assembly [
+ <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
+ <!ELEMENT id (#PCDATA)>
+ <!ELEMENT includeBaseDirectory (#PCDATA)>
+ <!ELEMENT baseDirectory (#PCDATA)>
+ <!ELEMENT formats (format)*>
+ <!ELEMENT format (#PCDATA)>
+ <!ELEMENT fileSets (fileSet)*>
+ <!ELEMENT fileSet (directory|outputDirectory|fileMode|includes)*>
+ <!ELEMENT directory (#PCDATA)>
+ <!ELEMENT outputDirectory (#PCDATA)>
+ <!ELEMENT includes (include)*>
+ <!ELEMENT include (#PCDATA)>
+ <!ELEMENT dependencySets (dependencySet)*>
+ <!ELEMENT dependencySet (outputDirectory|outputFileNameMapping|includes)*>
+ ]>
+<assembly>
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${pre.wm.dist.name}</baseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources/pre-wm/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>777</fileMode>
+ <includes>
+ <include>javax.activation:activation:jar</include>
+ <include>org.apache.airavata:agent-api:jar</include>
+ <include>org.apache.airavata:airavata-commons:jar</include>
+ <include>org.apache.airavata:airavata-credential-store-stubs:jar</include>
+ <include>org.apache.airavata:airavata-data-models:jar</include>
+ <include>org.apache.airavata:airavata-messaging-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-core:jar</include>
+ <include>org.apache.airavata:airavata-registry-cpi:jar</include>
+ <include>org.apache.airavata:airavata-server-configuration:jar</include>
+ <include>com.rabbitmq:amqp-client:jar</include>
+ <include>asm:asm:jar</include>
+ <include>org.bouncycastle:bcpkix-jdk15on:jar</include>
+ <include>org.bouncycastle:bcprov-jdk15on:jar</include>
+ <include>commons-cli:commons-cli:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
+ <include>commons-collections:commons-collections:jar</include>
+ <include>commons-dbcp:commons-dbcp:jar</include>
+ <include>commons-io:commons-io:jar</include>
+ <include>commons-lang:commons-lang:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.apache.commons:commons-math:jar</include>
+ <include>commons-pool:commons-pool:jar</include>
+ <include>org.apache.curator:curator-client:jar</include>
+ <include>org.apache.curator:curator-framework:jar</include>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>net.i2p.crypto:eddsa:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
+ <include>org.codehaus.groovy:groovy:jar</include>
+ <include>org.codehaus.groovy:groovy-templates:jar</include>
+ <include>org.codehaus.groovy:groovy-xml:jar</include>
+ <include>com.google.code.gson:gson:jar</include>
+ <include>com.google.guava:guava:jar</include>
+ <include>org.hamcrest:hamcrest-core:jar</include>
+ <include>org.apache.helix:helix-core:jar</include>
+ <include>org.apache.airavata:helix-spectator:jar</include>
+ <include>org.apache.httpcomponents:httpclient:jar</include>
+ <include>org.apache.httpcomponents:httpcore:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-core:jar</include>
+ <include>org.codehaus.jackson:jackson-core-asl:jar</include>
+ <include>com.fasterxml.jackson.core:jackson-databind:jar</include>
+ <include>org.codehaus.jackson:jackson-mapper-asl:jar</include>
+ <include>jakarta-regexp:jakarta-regexp:jar</include>
+ <include>jline:jline:jar</include>
+ <include>org.apache.airavata:job-monitor-api:jar</include>
+ <include>junit:junit:jar</include>
+ <include>com.jcraft:jzlib:jar</include>
+ <include>org.apache.kafka:kafka-clients:jar</include>
+ <include>org.apache.thrift:libthrift:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
+ <include>ch.qos.logback:logback-classic:jar</include>
+ <include>ch.qos.logback:logback-core:jar</include>
+ <include>com.github.danielwegener:logback-kafka-appender:jar</include>
+ <include>net.logstash.logback:logstash-logback-encoder:jar</include>
+ <include>org.lz4:lz4-java:jar</include>
+ <include>javax.mail:mail:jar</include>
+ <include>io.dropwizard.metrics:metrics-core:jar</include>
+ <include>org.jboss.netty:netty:jar</include>
+ <include>org.apache.openjpa:openjpa:jar</include>
+ <include>org.apache.airavata:platform-monitor:jar</include>
+ <include>org.apache.airavata:registry-api-service:jar</include>
+ <include>org.apache.airavata:registry-api-stubs:jar</include>
+ <include>net.sourceforge.serp:serp:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.yaml:snakeyaml:jar</include>
+ <include>org.xerial.snappy:snappy-java:jar</include>
+ <include>ssh-agent:jar</include>
+ <include>com.hierynomus:sshj:jar</include>
+ <include>org.apache.airavata:sshj-agent:jar</include>
+ <include>org.apache.airavata:task-api:jar</include>
+ <include>org.apache.airavata:task-core:jar</include>
+ <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include>
+ <include>org.apache.airavata:workflow-impl:jar</include>
+ <include>org.ogce:xpp3:jar</include>
+ <include>org.ogce:xpp5:jar</include>
+ <include>com.101tec:zkclient:jar</include>
+ <include>org.apache.zookeeper:zookeeper:jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/pre-wm/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <includes>
+ <include>airavata-server.properties</include>
+ <include>logback.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>./</directory>
+ <outputDirectory>logs</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*:*:jar</include>
+ </includes>
+ <excludes>
+ <exclude>mysql:mysql-connector-java:jar</exclude>
+ <exclude>log4j:log4j:jar</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
similarity index 98%
rename from modules/job-monitor/job-monitor-distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
rename to modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
index a80d675..926638b 100644
--- a/modules/job-monitor/job-monitor-distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
@@ -36,7 +36,7 @@
<assembly>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${realtime.monitor.archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${realtime.monitor.dist.name}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
diff --git a/modules/distribution/src/main/resources/INSTALL b/modules/distribution/src/main/resources/api-server/INSTALL
similarity index 100%
rename from modules/distribution/src/main/resources/INSTALL
rename to modules/distribution/src/main/resources/api-server/INSTALL
diff --git a/modules/distribution/src/main/resources/LICENSE b/modules/distribution/src/main/resources/api-server/LICENSE
similarity index 100%
rename from modules/distribution/src/main/resources/LICENSE
rename to modules/distribution/src/main/resources/api-server/LICENSE
diff --git a/modules/distribution/src/main/resources/NOTICE b/modules/distribution/src/main/resources/api-server/NOTICE
similarity index 100%
rename from modules/distribution/src/main/resources/NOTICE
rename to modules/distribution/src/main/resources/api-server/NOTICE
diff --git a/modules/distribution/src/main/resources/README b/modules/distribution/src/main/resources/api-server/README
similarity index 100%
rename from modules/distribution/src/main/resources/README
rename to modules/distribution/src/main/resources/api-server/README
diff --git a/modules/distribution/src/main/resources/bin/airavata-server-start.sh b/modules/distribution/src/main/resources/api-server/bin/airavata-server-start.sh
similarity index 100%
rename from modules/distribution/src/main/resources/bin/airavata-server-start.sh
rename to modules/distribution/src/main/resources/api-server/bin/airavata-server-start.sh
diff --git a/modules/distribution/src/main/resources/bin/airavata-server-stop.sh b/modules/distribution/src/main/resources/api-server/bin/airavata-server-stop.sh
similarity index 100%
rename from modules/distribution/src/main/resources/bin/airavata-server-stop.sh
rename to modules/distribution/src/main/resources/api-server/bin/airavata-server-stop.sh
diff --git a/modules/distribution/src/main/resources/bin/airavata-server.bat b/modules/distribution/src/main/resources/api-server/bin/airavata-server.bat
similarity index 100%
rename from modules/distribution/src/main/resources/bin/airavata-server.bat
rename to modules/distribution/src/main/resources/api-server/bin/airavata-server.bat
diff --git a/modules/distribution/src/main/resources/bin/derby.sh b/modules/distribution/src/main/resources/api-server/bin/derby.sh
similarity index 97%
rename from modules/distribution/src/main/resources/bin/derby.sh
rename to modules/distribution/src/main/resources/api-server/bin/derby.sh
index 134f7b9..0d00ec4 100644
--- a/modules/distribution/src/main/resources/bin/derby.sh
+++ b/modules/distribution/src/main/resources/api-server/bin/derby.sh
@@ -20,4 +20,4 @@
. `dirname $0`/setenv.sh
export DERBY_HOME=$AIRAVATA_HOME/standalone-server
cd $AIRAVATA_HOME/bin
-./startNetworkServer $*
\ No newline at end of file
+startNetworkServer $*
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/bin/logo.txt b/modules/distribution/src/main/resources/api-server/bin/logo.txt
similarity index 100%
rename from modules/distribution/src/main/resources/bin/logo.txt
rename to modules/distribution/src/main/resources/api-server/bin/logo.txt
diff --git a/modules/distribution/src/main/resources/bin/setenv.bat b/modules/distribution/src/main/resources/api-server/bin/setenv.bat
similarity index 100%
rename from modules/distribution/src/main/resources/bin/setenv.bat
rename to modules/distribution/src/main/resources/api-server/bin/setenv.bat
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/bin/setenv.sh b/modules/distribution/src/main/resources/api-server/bin/setenv.sh
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/bin/setenv.sh
rename to modules/distribution/src/main/resources/api-server/bin/setenv.sh
diff --git a/modules/distribution/src/main/resources/bin/startNetworkServer b/modules/distribution/src/main/resources/api-server/bin/startNetworkServer
similarity index 100%
rename from modules/distribution/src/main/resources/bin/startNetworkServer
rename to modules/distribution/src/main/resources/api-server/bin/startNetworkServer
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/controller/bin/controller-daemon.sh b/modules/distribution/src/main/resources/controller/bin/controller-daemon.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/controller/bin/controller-daemon.sh
rename to modules/distribution/src/main/resources/controller/bin/controller-daemon.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/controller/bin/controller.sh b/modules/distribution/src/main/resources/controller/bin/controller.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/controller/bin/controller.sh
rename to modules/distribution/src/main/resources/controller/bin/controller.sh
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/bin/setenv.sh b/modules/distribution/src/main/resources/controller/bin/setenv.sh
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/bin/setenv.sh
rename to modules/distribution/src/main/resources/controller/bin/setenv.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/controller/conf/airavata-server.properties b/modules/distribution/src/main/resources/controller/conf/airavata-server.properties
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/controller/conf/airavata-server.properties
rename to modules/distribution/src/main/resources/controller/conf/airavata-server.properties
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/conf/logback.xml b/modules/distribution/src/main/resources/controller/conf/logback.xml
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/conf/logback.xml
rename to modules/distribution/src/main/resources/controller/conf/logback.xml
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh b/modules/distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh
rename to modules/distribution/src/main/resources/email-monitor/bin/email-monitor-daemon.sh
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/bin/email-monitor.sh b/modules/distribution/src/main/resources/email-monitor/bin/email-monitor.sh
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/bin/email-monitor.sh
rename to modules/distribution/src/main/resources/email-monitor/bin/email-monitor.sh
diff --git a/modules/distribution/src/main/resources/bin/setenv.sh b/modules/distribution/src/main/resources/email-monitor/bin/setenv.sh
similarity index 100%
rename from modules/distribution/src/main/resources/bin/setenv.sh
rename to modules/distribution/src/main/resources/email-monitor/bin/setenv.sh
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/airavata-server.properties b/modules/distribution/src/main/resources/email-monitor/conf/airavata-server.properties
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/airavata-server.properties
rename to modules/distribution/src/main/resources/email-monitor/conf/airavata-server.properties
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/email-config.yaml b/modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/email-config.yaml
rename to modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/logback.xml b/modules/distribution/src/main/resources/email-monitor/conf/logback.xml
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/logback.xml
rename to modules/distribution/src/main/resources/email-monitor/conf/logback.xml
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh b/modules/distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh
rename to modules/distribution/src/main/resources/parser-wm/bin/parser-wm-daemon.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/bin/parser-wm.sh b/modules/distribution/src/main/resources/parser-wm/bin/parser-wm.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/bin/parser-wm.sh
rename to modules/distribution/src/main/resources/parser-wm/bin/parser-wm.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/bin/setenv.sh b/modules/distribution/src/main/resources/parser-wm/bin/setenv.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/bin/setenv.sh
rename to modules/distribution/src/main/resources/parser-wm/bin/setenv.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/conf/airavata-server.properties b/modules/distribution/src/main/resources/parser-wm/conf/airavata-server.properties
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/conf/airavata-server.properties
rename to modules/distribution/src/main/resources/parser-wm/conf/airavata-server.properties
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/conf/logback.xml b/modules/distribution/src/main/resources/parser-wm/conf/logback.xml
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/conf/logback.xml
rename to modules/distribution/src/main/resources/parser-wm/conf/logback.xml
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/participant/bin/participant-daemon.sh b/modules/distribution/src/main/resources/participant/bin/participant-daemon.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/participant/bin/participant-daemon.sh
rename to modules/distribution/src/main/resources/participant/bin/participant-daemon.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/participant/bin/participant.sh b/modules/distribution/src/main/resources/participant/bin/participant.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/participant/bin/participant.sh
rename to modules/distribution/src/main/resources/participant/bin/participant.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/bin/setenv.sh b/modules/distribution/src/main/resources/participant/bin/setenv.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/bin/setenv.sh
rename to modules/distribution/src/main/resources/participant/bin/setenv.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/participant/conf/airavata-server.properties b/modules/distribution/src/main/resources/participant/conf/airavata-server.properties
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/participant/conf/airavata-server.properties
rename to modules/distribution/src/main/resources/participant/conf/airavata-server.properties
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/participant/conf/cred_store.jks b/modules/distribution/src/main/resources/participant/conf/cred_store.jks
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/participant/conf/cred_store.jks
rename to modules/distribution/src/main/resources/participant/conf/cred_store.jks
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/post-wm/conf/logback.xml b/modules/distribution/src/main/resources/participant/conf/logback.xml
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/post-wm/conf/logback.xml
rename to modules/distribution/src/main/resources/participant/conf/logback.xml
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/bin/platform-monitor-daemon.sh b/modules/distribution/src/main/resources/platform-monitor/bin/platform-monitor-daemon.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/bin/platform-monitor-daemon.sh
rename to modules/distribution/src/main/resources/platform-monitor/bin/platform-monitor-daemon.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/bin/platform-monitor.sh b/modules/distribution/src/main/resources/platform-monitor/bin/platform-monitor.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/bin/platform-monitor.sh
rename to modules/distribution/src/main/resources/platform-monitor/bin/platform-monitor.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/post-wm/bin/setenv.sh b/modules/distribution/src/main/resources/platform-monitor/bin/setenv.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/post-wm/bin/setenv.sh
rename to modules/distribution/src/main/resources/platform-monitor/bin/setenv.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/conf/airavata-server.properties b/modules/distribution/src/main/resources/platform-monitor/conf/airavata-server.properties
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/conf/airavata-server.properties
rename to modules/distribution/src/main/resources/platform-monitor/conf/airavata-server.properties
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/conf/logback.xml b/modules/distribution/src/main/resources/platform-monitor/conf/logback.xml
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/conf/logback.xml
rename to modules/distribution/src/main/resources/platform-monitor/conf/logback.xml
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh b/modules/distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh
rename to modules/distribution/src/main/resources/post-wm/bin/post-wm-daemon.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/post-wm/bin/post-wm.sh b/modules/distribution/src/main/resources/post-wm/bin/post-wm.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/post-wm/bin/post-wm.sh
rename to modules/distribution/src/main/resources/post-wm/bin/post-wm.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/bin/setenv.sh b/modules/distribution/src/main/resources/post-wm/bin/setenv.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/platform-monitor/bin/setenv.sh
rename to modules/distribution/src/main/resources/post-wm/bin/setenv.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/post-wm/conf/airavata-server.properties b/modules/distribution/src/main/resources/post-wm/conf/airavata-server.properties
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/post-wm/conf/airavata-server.properties
rename to modules/distribution/src/main/resources/post-wm/conf/airavata-server.properties
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/participant/conf/logback.xml b/modules/distribution/src/main/resources/post-wm/conf/logback.xml
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/participant/conf/logback.xml
rename to modules/distribution/src/main/resources/post-wm/conf/logback.xml
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh b/modules/distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh
rename to modules/distribution/src/main/resources/pre-wm/bin/pre-wm-daemon.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/bin/pre-wm.sh b/modules/distribution/src/main/resources/pre-wm/bin/pre-wm.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/bin/pre-wm.sh
rename to modules/distribution/src/main/resources/pre-wm/bin/pre-wm.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/participant/bin/setenv.sh b/modules/distribution/src/main/resources/pre-wm/bin/setenv.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/participant/bin/setenv.sh
rename to modules/distribution/src/main/resources/pre-wm/bin/setenv.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/conf/airavata-server.properties b/modules/distribution/src/main/resources/pre-wm/conf/airavata-server.properties
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/pre-wm/conf/airavata-server.properties
rename to modules/distribution/src/main/resources/pre-wm/conf/airavata-server.properties
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/conf/logback.xml b/modules/distribution/src/main/resources/pre-wm/conf/logback.xml
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/parser-wm/conf/logback.xml
rename to modules/distribution/src/main/resources/pre-wm/conf/logback.xml
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh b/modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh
rename to modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor-daemon.sh
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh b/modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh
rename to modules/distribution/src/main/resources/realtime-monitor/bin/realtime-monitor.sh
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/controller/bin/setenv.sh b/modules/distribution/src/main/resources/realtime-monitor/bin/setenv.sh
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/controller/bin/setenv.sh
rename to modules/distribution/src/main/resources/realtime-monitor/bin/setenv.sh
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties b/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
similarity index 100%
rename from modules/job-monitor/job-monitor-distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
rename to modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
diff --git a/modules/airavata-helix/helix-distribution/src/main/resources/controller/conf/logback.xml b/modules/distribution/src/main/resources/realtime-monitor/conf/logback.xml
similarity index 100%
rename from modules/airavata-helix/helix-distribution/src/main/resources/controller/conf/logback.xml
rename to modules/distribution/src/main/resources/realtime-monitor/conf/logback.xml
diff --git a/modules/distribution/src/main/resources/samples/registerSample.sh b/modules/distribution/src/main/resources/samples/registerSample.sh
deleted file mode 100644
index 384ec0e..0000000
--- a/modules/distribution/src/main/resources/samples/registerSample.sh
+++ /dev/null
@@ -1,24 +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.
-
-. `dirname $0`/../bin/setenv.sh
-JAVA_OPTS=""
-
-java -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.client.samples.RegisterSampleData $*
diff --git a/modules/distribution/src/main/resources/samples/scripts/add.sh b/modules/distribution/src/main/resources/samples/scripts/add.sh
deleted file mode 100755
index daa140b..0000000
--- a/modules/distribution/src/main/resources/samples/scripts/add.sh
+++ /dev/null
@@ -1,21 +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.
-
-# add two numbers
-sleep 10
-/bin/echo "Result=`expr $1 + $2`"
diff --git a/modules/distribution/src/main/resources/samples/scripts/echo.sh b/modules/distribution/src/main/resources/samples/scripts/echo.sh
deleted file mode 100755
index 9dbaab9..0000000
--- a/modules/distribution/src/main/resources/samples/scripts/echo.sh
+++ /dev/null
@@ -1,22 +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.
-
-#echo wrapper
-sleep 10
-/bin/echo "Echoed_Output=$1"
diff --git a/modules/distribution/src/main/resources/samples/scripts/multiply.sh b/modules/distribution/src/main/resources/samples/scripts/multiply.sh
deleted file mode 100755
index a5b5f7f..0000000
--- a/modules/distribution/src/main/resources/samples/scripts/multiply.sh
+++ /dev/null
@@ -1,22 +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.
-
-# mutiply two numbers
-sleep 10
-/bin/echo "Result=`expr $1 \* $2`"
diff --git a/modules/distribution/src/main/resources/samples/scripts/subtract.sh b/modules/distribution/src/main/resources/samples/scripts/subtract.sh
deleted file mode 100755
index a21bec7..0000000
--- a/modules/distribution/src/main/resources/samples/scripts/subtract.sh
+++ /dev/null
@@ -1,22 +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.
-
-# substract two numbers
-sleep 10
-/bin/echo "Result=`expr $1 - $2`"
diff --git a/modules/job-monitor/job-monitor-distribution/pom.xml b/modules/job-monitor/job-monitor-distribution/pom.xml
deleted file mode 100644
index 093676e..0000000
--- a/modules/job-monitor/job-monitor-distribution/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>job-monitor</artifactId>
- <groupId>org.apache.airavata</groupId>
- <version>0.18-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>job-monitor-distribution</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>email-monitor</artifactId>
- <version>0.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>realtime-monitor</artifactId>
- <version>0.18-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.5</version>
- <executions>
- <execution>
- <id>email-monitor-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${email.monitor.archieve.name}-${project.version}</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.archieve.name}-${project.version}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/realtime-monitor-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <email.monitor.archieve.name>email-monitor</email.monitor.archieve.name>
- <realtime.monitor.archieve.name>realtime-monitor</realtime.monitor.archieve.name>
- </properties>
-</project>
\ No newline at end of file
diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml
index ac07f93..c0ebf87 100644
--- a/modules/job-monitor/pom.xml
+++ b/modules/job-monitor/pom.xml
@@ -34,7 +34,6 @@
<module>job-monitor-api</module>
<module>email-monitor</module>
<module>real-time-monitor</module>
- <module>job-monitor-distribution</module>
</modules>
<dependencyManagement>