You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/06/25 05:58:24 UTC
(airavata) 04/09: merge modules/messaging into airavata-api
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch fat-airavata-api
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 680dd8ac8b980367d4066eca61dcd6da13dfcae3
Author: yasithdev <ya...@icloud.com>
AuthorDate: Tue Jun 24 23:52:04 2025 -0500
merge modules/messaging into airavata-api
---
airavata-api/pom.xml | 85 +-
.../messaging/client/RabbitMQListener.java | 0
.../airavata/messaging/client/TestReader.java | 0
.../airavata/messaging/core/MessageContext.java | 0
.../airavata/messaging/core/MessageHandler.java | 0
.../messaging/core/MessagingConstants.java | 0
.../airavata/messaging/core/MessagingFactory.java | 0
.../apache/airavata/messaging/core/Publisher.java | 0
.../messaging/core/RabbitMQProperties.java | 0
.../apache/airavata/messaging/core/Subscriber.java | 0
.../apache/airavata/messaging/core/TestClient.java | 0
.../org/apache/airavata/messaging/core/Type.java | 0
.../messaging/core/impl/ExperimentConsumer.java | 0
.../messaging/core/impl/MessageConsumer.java | 0
.../messaging/core/impl/ProcessConsumer.java | 0
.../messaging/core/impl/RabbitMQPublisher.java | 0
.../messaging/core/impl/RabbitMQSubscriber.java | 0
.../messaging/core/impl/StatusConsumer.java | 0
.../messaging/core/stats/CountWriterTask.java | 0
.../messaging/core/stats/LatencyWriterTask.java | 0
.../airavata/messaging/core/stats/StatCounter.java | 0
.../messaging/core/util/DBEventPublisherUtils.java | 0
.../client/OrchestratorClientFactory.java | 0
.../sample/OrchestratorClientSample.java | 0
.../profile-service/profile-service-server/pom.xml | 5 -
modules/airavata-helix/helix-spectator/pom.xml | 2 +-
.../metadata-analyzer/pom.xml | 5 -
.../metascheduler-core/pom.xml | 5 -
modules/db-event-manager/pom.xml | 5 -
modules/distribution/pom.xml | 1429 ++++++++++----------
.../src/main/assembly/controller-bin-assembly.xml | 1 -
.../src/main/assembly/parser-wm-bin-assembly.xml | 1 -
.../src/main/assembly/participant-bin-assembly.xml | 1 -
.../src/main/assembly/post-wm-bin-assembly.xml | 1 -
.../src/main/assembly/pre-wm-bin-assembly.xml | 1 -
modules/messaging/client/README | 15 -
modules/messaging/client/pom.xml | 93 --
modules/messaging/core/pom.xml | 57 -
modules/messaging/pom.xml | 50 -
modules/orchestrator/orchestrator-client/pom.xml | 102 --
modules/orchestrator/orchestrator-core/pom.xml | 5 -
modules/orchestrator/orchestrator-service/pom.xml | 5 -
modules/orchestrator/pom.xml | 1 -
.../registry-server/registry-api-service/pom.xml | 5 -
modules/server/pom.xml | 91 +-
.../sharing-registry-server/pom.xml | 5 -
pom.xml | 1 -
47 files changed, 784 insertions(+), 1187 deletions(-)
diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml
index 6fdc83e067..b55dc8ed12 100644
--- a/airavata-api/pom.xml
+++ b/airavata-api/pom.xml
@@ -22,16 +22,6 @@
<dependencies>
<!-- Airavata clients & stubs -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-security</artifactId>
@@ -64,6 +54,11 @@
</dependency>
<!-- Core libraries -->
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-client-configuration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -286,6 +281,11 @@
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>${amqp.client.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -322,6 +322,24 @@
<arg
value="${project.basedir}/../thrift-interface-descriptions/service-cpis/credential-store-cpi.thrift" />
</exec>
+ <exec executable="thrift">
+ <arg value="-r" />
+ <arg value="--gen" />
+ <arg value="java:beans,generated_annotations=undated" />
+ <arg value="-out" />
+ <arg value="${project.build.directory}/generated-sources/thrift" />
+ <arg
+ value="${project.basedir}/../thrift-interface-descriptions/service-cpis/registry-api.thrift" />
+ </exec>
+ <exec executable="thrift">
+ <arg value="-r" />
+ <arg value="--gen" />
+ <arg value="java:beans,generated_annotations=undated" />
+ <arg value="-out" />
+ <arg value="${project.build.directory}/generated-sources/thrift" />
+ <arg
+ value="${project.basedir}/../thrift-interface-descriptions/service-cpis/orchestrator-cpi.thrift" />
+ </exec>
</tasks>
</configuration>
</execution>
@@ -390,53 +408,6 @@
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
</configuration>
</plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>generate-thrift-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.directory}/generated-sources/thrift" />
- <exec executable="thrift">
- <arg value="-r" />
- <arg value="--gen" />
- <arg value="java:beans,generated_annotations=undated" />
- <arg value="-out" />
- <arg value="${project.build.directory}/generated-sources/thrift" />
- <arg
- value="${project.basedir}/../thrift-interface-descriptions/service-cpis/registry-api.thrift" />
- </exec>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
- <execution>
- <id>add-thrift-generated-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/thrift</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java b/airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
similarity index 100%
rename from modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java b/airavata-api/src/main/java/org/apache/airavata/messaging/client/TestReader.java
similarity index 100%
rename from modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/client/TestReader.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessageContext.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessageContext.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessageHandler.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageHandler.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessageHandler.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageHandler.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingConstants.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingConstants.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingConstants.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingConstants.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Publisher.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/Publisher.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Publisher.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/Publisher.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/RabbitMQProperties.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/RabbitMQProperties.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/RabbitMQProperties.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/RabbitMQProperties.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Subscriber.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/Subscriber.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Subscriber.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/Subscriber.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/TestClient.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/TestClient.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/TestClient.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Type.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/Type.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Type.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/Type.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/ProcessConsumer.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/StatusConsumer.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java
similarity index 100%
rename from modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java
rename to airavata-api/src/main/java/org/apache/airavata/messaging/core/util/DBEventPublisherUtils.java
diff --git a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java b/airavata-api/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java
similarity index 100%
rename from modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java
rename to airavata-api/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java
diff --git a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java b/airavata-api/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java
similarity index 100%
rename from modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java
rename to airavata-api/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java
diff --git a/airavata-services/profile-service/profile-service-server/pom.xml b/airavata-services/profile-service/profile-service-server/pom.xml
index afbe879f8c..e4a86a5dbc 100644
--- a/airavata-services/profile-service/profile-service-server/pom.xml
+++ b/airavata-services/profile-service/profile-service-server/pom.xml
@@ -50,11 +50,6 @@ under the License.
<artifactId>profile-tenant-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>iam-admin-services-core</artifactId>
diff --git a/modules/airavata-helix/helix-spectator/pom.xml b/modules/airavata-helix/helix-spectator/pom.xml
index bc4a092282..eab63b10c0 100644
--- a/modules/airavata-helix/helix-spectator/pom.xml
+++ b/modules/airavata-helix/helix-spectator/pom.xml
@@ -62,7 +62,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
+ <artifactId>airavata-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
index 2aa63f225f..b04280b11f 100644
--- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml
+++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
@@ -50,11 +50,6 @@ under the License.
<artifactId>quartz</artifactId>
<version>2.3.2</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>metascheduler-core</artifactId>
diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml
index 78f4b39722..db37f4d651 100644
--- a/modules/airavata-metascheduler/metascheduler-core/pom.xml
+++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml
@@ -51,11 +51,6 @@ under the License.
<artifactId>quartz</artifactId>
<version>2.3.2</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/modules/db-event-manager/pom.xml b/modules/db-event-manager/pom.xml
index 1c5e393871..3189a54650 100644
--- a/modules/db-event-manager/pom.xml
+++ b/modules/db-event-manager/pom.xml
@@ -37,11 +37,6 @@ under the License.
<artifactId>airavata-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 15db069d82..5b530a9b72 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -16,746 +16,739 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>apache-airavata-distribution</artifactId>
- <name>Airavata server distribution</name>
- <packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>0.8.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-standalone-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-cpi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-service</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-api-service</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>apache-airavata-distribution</artifactId>
+ <name>Airavata server distribution</name>
+ <packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ <version>0.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-standalone-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-registry-cpi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-orchestrator-service</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-orchestrator-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>registry-api-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!--Cloud module -->
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${json.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
- <!-- end Cloud module -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>
+ <!--Cloud
+ module -->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <!-- end Cloud module -->
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-sharing-registry-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>1.13.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>7.0.22</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-jasper</artifactId>
- <version>7.0.22</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>${jakarta.activation.api.version}</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.12.2</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.4.4</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>1.13.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>${jakarta.activation.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.ebaysf.web</groupId>
- <artifactId>cors-filter</artifactId>
- <version>${ebay.cors.filter}</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.54</version>
- </dependency>
- <!-- dependency> <groupId>org.ogce</groupId> <artifactId>bcgss</artifactId>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ebaysf.web</groupId>
+ <artifactId>cors-filter</artifactId>
+ <version>${ebay.cors.filter}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.54</version>
+ </dependency>
+ <!-- dependency> <groupId>org.ogce</groupId> <artifactId>bcgss</artifactId>
<version>146</version> </dependency> -->
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
- </dependency>
- <!-- Keycloak admin client requires Jackson 2.8.6 -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <!-- zookeeper dependencies -->
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${thrift.version}</version>
+ </dependency>
+ <!-- Keycloak admin client requires Jackson 2.8.6 -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <!-- zookeeper dependencies -->
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zk.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zk.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${amqp.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-templates</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <!-- ======================== Profile Service module =================== -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>profile-service-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- Needed for IamAdminServices Keycloak client -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>db-event-manager</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>${amqp.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>${kafka-clients.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <!-- ======================== Profile Service module =================== -->
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>profile-service-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- Needed for IamAdminServices Keycloak client -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.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>db-event-manager</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>helix-spectator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>realtime-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>email-monitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!-- For thrift client pool -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>realtime-monitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!-- For Helix -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${codehaus.jackson.version}</version>
- </dependency>
- </dependencies>
+ <!-- For thrift client pool -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
- <url>http://airavata.apache.org/</url>
+ <!-- For Helix -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${codehaus.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${codehaus.jackson.version}</version>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <!--includes>**/*.war</includes -->
- <outputDirectory>${project.build.directory}/conf</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <url>http://airavata.apache.org/</url>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.plugin}</version>
- <executions>
- <execution>
- <id>api-server-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${api.server.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/api-server-bin-assembly.xml</descriptor>
- <!-- <descriptor>src/main/assembly/src-assembly.xml</descriptor> -->
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>controller-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${controller.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/controller-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>participant-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${participant.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/participant-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>pre-wm-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${pre.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/pre-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>post-wm-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${post.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/post-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>parser-wm-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${parser.wm.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/parser-wm-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>email-monitor-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${email.monitor.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/email-monitor-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- <execution>
- <id>realtime-monitor-distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <tarLongFileMode>posix</tarLongFileMode>
- <finalName>${realtime.monitor.dist.name}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/realtime-monitor-bin-assembly.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-api-server-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.api.server.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.api.server.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${api.server.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-controller-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.controller.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.controller.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${controller.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-pre-wm-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.pre.wm.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.pre.wm.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${pre.wm.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-post-wm-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.post.wm.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.post.wm.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${post.wm.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-participant-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.participant.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.participant.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${participant.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-email-monitor-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${docker.email.monitor.build.directory}</outputDirectory>
- <resources>
- <resource>
- <directory>${docker.email.monitor.image.src.root}</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>${email.monitor.dist.name}-bin.tar.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.33.0</version>
- <configuration>
- <verbose>true</verbose>
- <images>
- <image>
- <name>airavata/api-server</name>
- <build>
- <dockerFile>${docker.api.server.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/controller</name>
- <build>
- <dockerFile>${docker.controller.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/pre-wm</name>
- <build>
- <dockerFile>${docker.pre.wm.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/post-wm</name>
- <build>
- <dockerFile>${docker.post.wm.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/participant</name>
- <build>
- <dockerFile>${docker.participant.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- <image>
- <name>airavata/email-monitor</name>
- <build>
- <dockerFile>${docker.email.monitor.build.directory}/Dockerfile</dockerFile>
- </build>
- </image>
- </images>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <!--includes>**/*.war</includes -->
+ <outputDirectory>${project.build.directory}/conf</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven.assembly.plugin}</version>
+ <executions>
+ <execution>
+ <id>api-server-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${api.server.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/api-server-bin-assembly.xml</descriptor>
+ <!-- <descriptor>src/main/assembly/src-assembly.xml</descriptor> -->
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ <execution>
+ <id>controller-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${controller.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/controller-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ <execution>
+ <id>participant-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${participant.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/participant-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-wm-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${pre.wm.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/pre-wm-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-wm-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${post.wm.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/post-wm-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ <execution>
+ <id>parser-wm-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${parser.wm.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/parser-wm-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ <execution>
+ <id>email-monitor-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${email.monitor.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/email-monitor-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ <execution>
+ <id>realtime-monitor-distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
+ <finalName>${realtime.monitor.dist.name}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/realtime-monitor-bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-api-server-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.api.server.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${docker.api.server.image.src.root}</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${api.server.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-controller-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.controller.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${docker.controller.image.src.root}</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${controller.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-pre-wm-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.pre.wm.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${docker.pre.wm.image.src.root}</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${pre.wm.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-post-wm-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.post.wm.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${docker.post.wm.image.src.root}</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${post.wm.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-participant-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.participant.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${docker.participant.image.src.root}</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${participant.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-email-monitor-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${docker.email.monitor.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${docker.email.monitor.image.src.root}</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${email.monitor.dist.name}-bin.tar.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.33.0</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>airavata/api-server</name>
+ <build>
+ <dockerFile>${docker.api.server.build.directory}/Dockerfile</dockerFile>
+ </build>
+ </image>
+ <image>
+ <name>airavata/controller</name>
+ <build>
+ <dockerFile>${docker.controller.build.directory}/Dockerfile</dockerFile>
+ </build>
+ </image>
+ <image>
+ <name>airavata/pre-wm</name>
+ <build>
+ <dockerFile>${docker.pre.wm.build.directory}/Dockerfile</dockerFile>
+ </build>
+ </image>
+ <image>
+ <name>airavata/post-wm</name>
+ <build>
+ <dockerFile>${docker.post.wm.build.directory}/Dockerfile</dockerFile>
+ </build>
+ </image>
+ <image>
+ <name>airavata/participant</name>
+ <build>
+ <dockerFile>${docker.participant.build.directory}/Dockerfile</dockerFile>
+ </build>
+ </image>
+ <image>
+ <name>airavata/email-monitor</name>
+ <build>
+ <dockerFile>${docker.email.monitor.build.directory}/Dockerfile</dockerFile>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <properties>
- <docker.api.server.build.directory>${project.build.directory}/api_server_docker_img_build</docker.api.server.build.directory>
- <docker.api.server.image.src.root>src/main/docker/api-server</docker.api.server.image.src.root>
+ <properties>
- <docker.controller.build.directory>${project.build.directory}/controller_docker_img_build</docker.controller.build.directory>
- <docker.controller.image.src.root>src/main/docker/controller</docker.controller.image.src.root>
+ <docker.api.server.build.directory>${project.build.directory}/api_server_docker_img_build</docker.api.server.build.directory>
+ <docker.api.server.image.src.root>src/main/docker/api-server</docker.api.server.image.src.root>
- <docker.pre.wm.build.directory>${project.build.directory}/pre_wm_docker_img_build</docker.pre.wm.build.directory>
- <docker.pre.wm.image.src.root>src/main/docker/pre-wm</docker.pre.wm.image.src.root>
+ <docker.controller.build.directory>${project.build.directory}/controller_docker_img_build</docker.controller.build.directory>
+ <docker.controller.image.src.root>src/main/docker/controller</docker.controller.image.src.root>
- <docker.post.wm.build.directory>${project.build.directory}/post_wm_docker_img_build</docker.post.wm.build.directory>
- <docker.post.wm.image.src.root>src/main/docker/post-wm</docker.post.wm.image.src.root>
+ <docker.pre.wm.build.directory>${project.build.directory}/pre_wm_docker_img_build</docker.pre.wm.build.directory>
+ <docker.pre.wm.image.src.root>src/main/docker/pre-wm</docker.pre.wm.image.src.root>
- <docker.participant.build.directory>${project.build.directory}/participant_docker_img_build</docker.participant.build.directory>
- <docker.participant.image.src.root>src/main/docker/participant</docker.participant.image.src.root>
+ <docker.post.wm.build.directory>${project.build.directory}/post_wm_docker_img_build</docker.post.wm.build.directory>
+ <docker.post.wm.image.src.root>src/main/docker/post-wm</docker.post.wm.image.src.root>
- <docker.email.monitor.build.directory>${project.build.directory}/email_monitor_docker_img_build</docker.email.monitor.build.directory>
- <docker.email.monitor.image.src.root>src/main/docker/email-monitor</docker.email.monitor.image.src.root>
+ <docker.participant.build.directory>${project.build.directory}/participant_docker_img_build</docker.participant.build.directory>
+ <docker.participant.image.src.root>src/main/docker/participant</docker.participant.image.src.root>
- <jersey.version>1.13</jersey.version>
- <grizzly.version>2.0.0-M3</grizzly.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <api.server.dist.name>apache-airavata-api-server-${project.version}</api.server.dist.name>
- <controller.dist.name>apache-airavata-controller-${project.version}</controller.dist.name>
- <participant.dist.name>apache-airavata-participant-${project.version}</participant.dist.name>
- <pre.wm.dist.name>apache-airavata-pre-wm-${project.version}</pre.wm.dist.name>
- <post.wm.dist.name>apache-airavata-post-wm-${project.version}</post.wm.dist.name>
- <parser.wm.dist.name>apache-airavata-parser-wm-${project.version}</parser.wm.dist.name>
- <email.monitor.dist.name>apache-airavata-email-monitor-${project.version}</email.monitor.dist.name>
- <realtime.monitor.dist.name>apache-airavata-realtime-monitor-${project.version}</realtime.monitor.dist.name>
- </properties>
-</project>
+ <docker.email.monitor.build.directory>${project.build.directory}/email_monitor_docker_img_build</docker.email.monitor.build.directory>
+ <docker.email.monitor.image.src.root>src/main/docker/email-monitor</docker.email.monitor.image.src.root>
+
+ <jersey.version>1.13</jersey.version>
+ <grizzly.version>2.0.0-M3</grizzly.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <api.server.dist.name>apache-airavata-api-server-${project.version}</api.server.dist.name>
+ <controller.dist.name>apache-airavata-controller-${project.version}</controller.dist.name>
+ <participant.dist.name>apache-airavata-participant-${project.version}</participant.dist.name>
+ <pre.wm.dist.name>apache-airavata-pre-wm-${project.version}</pre.wm.dist.name>
+ <post.wm.dist.name>apache-airavata-post-wm-${project.version}</post.wm.dist.name>
+ <parser.wm.dist.name>apache-airavata-parser-wm-${project.version}</parser.wm.dist.name>
+ <email.monitor.dist.name>apache-airavata-email-monitor-${project.version}</email.monitor.dist.name>
+ <realtime.monitor.dist.name>apache-airavata-realtime-monitor-${project.version}</realtime.monitor.dist.name>
+ </properties>
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index c4286623fc..daec034c81 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -77,7 +77,6 @@
<include>javax.activation:activation:jar</include>
<include>org.apache.airavata:airavata-api:jar</include>
<include>org.apache.airavata:agent-api: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>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
index e61ff6d292..6573f08c2a 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -77,7 +77,6 @@
<include>javax.activation:activation:jar</include>
<include>org.apache.airavata:airavata-api:jar</include>
<include>org.apache.airavata:agent-api: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>
diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index af59887fb2..0f75092b5c 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -78,7 +78,6 @@
<include>javax.activation:activation:jar</include>
<include>org.apache.airavata:airavata-api:jar</include>
<include>org.apache.airavata:agent-api: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>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index 11c8e35a6c..d7450b4c46 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -77,7 +77,6 @@
<include>javax.activation:activation:jar</include>
<include>org.apache.airavata:airavata-api:jar</include>
<include>org.apache.airavata:agent-api: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>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index 65acb2a6a3..041c75f83a 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -77,7 +77,6 @@
<include>javax.activation:activation:jar</include>
<include>org.apache.airavata:airavata-api:jar</include>
<include>org.apache.airavata:agent-api: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>
diff --git a/modules/messaging/client/README b/modules/messaging/client/README
deleted file mode 100644
index 86a9f1a2dd..0000000000
--- a/modules/messaging/client/README
+++ /dev/null
@@ -1,15 +0,0 @@
-How to run
-========================
-
-1. Copy airavata-messaging-client-0.15-SNAPSHOT-jar-with-dependencies.jar to a location
-2. Create a folder called "resources" in the same location and copy airavata-server.properties with updated broker url in to the resources folder.
-3. To run the jar, in the command line type :
- java -Xmx1024m -jar airavata-messaging-client-0.15-SNAPSHOT-jar-with-dependencies.jar -a
-
- You can provide different parameters.
- -a = to listen to all the messages
- -gId = to listen to all the messages for given gateway Id
- -eId = to listen to all the messages for given experiment Id
- -jId = to listen to all the messages for given job Id
-
-
diff --git a/modules/messaging/client/pom.xml b/modules/messaging/client/pom.xml
deleted file mode 100644
index 8bdbb961ef..0000000000
--- a/modules/messaging/client/pom.xml
+++ /dev/null
@@ -1,93 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>messaging</artifactId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>airavata-messaging-client</artifactId>
- <packaging>jar</packaging>
- <name>Airavata Messaging Client</name>
- <url>http://airavata.apache.org/</url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${amqp.client.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.airavata.messaging.client.RabbitMQListener</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging phase -->
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/modules/messaging/core/pom.xml b/modules/messaging/core/pom.xml
deleted file mode 100644
index b1f6fcd2a3..0000000000
--- a/modules/messaging/core/pom.xml
+++ /dev/null
@@ -1,57 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>messaging</artifactId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>airavata-messaging-core</artifactId>
- <packaging>jar</packaging>
- <name>Airavata Messaging Framework Core</name>
- <url>http://airavata.apache.org/</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${amqp.client.version}</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/modules/messaging/pom.xml b/modules/messaging/pom.xml
deleted file mode 100644
index a817990b34..0000000000
--- a/modules/messaging/pom.xml
+++ /dev/null
@@ -1,50 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>messaging</artifactId>
- <packaging>pom</packaging>
- <name>Airavata Messaging Framework</name>
- <url>http://airavata.apache.org/</url>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>core</module>
- <module>client</module>
- </modules>
- </profile>
- </profiles>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
-</project>
diff --git a/modules/orchestrator/orchestrator-client/pom.xml b/modules/orchestrator/orchestrator-client/pom.xml
deleted file mode 100644
index e926863c72..0000000000
--- a/modules/orchestrator/orchestrator-client/pom.xml
+++ /dev/null
@@ -1,102 +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.
--->
-<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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>orchestrator</artifactId>
- <groupId>org.apache.airavata</groupId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <name>Airavata Orchestrator Client SDK</name>
- <artifactId>airavata-orchestrator-client</artifactId>
- <packaging>jar</packaging>
- <url>http://airavata.apache.org/</url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-configuration</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>generate-thrift-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.directory}/generated-sources/thrift"/>
- <exec executable="thrift">
- <arg value="-r"/>
- <arg value="--gen"/>
- <arg value="java:beans,generated_annotations=undated"/>
- <arg value="-out"/>
- <arg value="${project.build.directory}/generated-sources/thrift"/>
- <arg value="${project.basedir}/../../../thrift-interface-descriptions/service-cpis/orchestrator-cpi.thrift"/>
- </exec>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
- <execution>
- <id>add-thrift-generated-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/thrift</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml
index 41e3d4d5e9..2e03ca06a4 100644
--- a/modules/orchestrator/orchestrator-core/pom.xml
+++ b/modules/orchestrator/orchestrator-core/pom.xml
@@ -32,11 +32,6 @@ under the License.
<url>http://airavata.apache.org/</url>
<dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-api</artifactId>
diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml
index a687193d55..3c08ccd8ce 100644
--- a/modules/orchestrator/orchestrator-service/pom.xml
+++ b/modules/orchestrator/orchestrator-service/pom.xml
@@ -48,11 +48,6 @@ under the License.
<artifactId>airavata-orchestrator-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-server-configuration</artifactId>
diff --git a/modules/orchestrator/pom.xml b/modules/orchestrator/pom.xml
index 53571514dc..7405165eec 100644
--- a/modules/orchestrator/pom.xml
+++ b/modules/orchestrator/pom.xml
@@ -40,7 +40,6 @@ under the License.
<modules>
<module>orchestrator-core</module>
<module>orchestrator-service</module>
- <module>orchestrator-client</module>
</modules>
</profile>
</profiles>
diff --git a/modules/registry/registry-server/registry-api-service/pom.xml b/modules/registry/registry-server/registry-api-service/pom.xml
index 20307883d1..c3ec6477c5 100644
--- a/modules/registry/registry-server/registry-api-service/pom.xml
+++ b/modules/registry/registry-server/registry-api-service/pom.xml
@@ -39,11 +39,6 @@ under the License.
<artifactId>airavata-registry-cpi</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index 70c610cae4..b3fd2e8e5c 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -16,51 +16,48 @@ 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>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
+<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>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata</artifactId>
+ <version>0.21-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>airavata-standalone-server</artifactId>
- <name>Airavata Standalone Server</name>
- <description>Module Containing Classes which start the Airavata Standalone Server</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
- <configuration>
- <release>17</release>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>airavata-standalone-server</artifactId>
+ <name>Airavata Standalone Server</name>
+ <description>Module Containing Classes which start the Airavata Standalone Server</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.plugin.version}</version>
+ <configuration>
+ <release>17</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 87ac4d5dc8..159909bdab 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -77,11 +77,6 @@ under the License.
<artifactId>contiperf</artifactId>
<version>2.3.4</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messaging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
diff --git a/pom.xml b/pom.xml
index 026403514a..e1a8883bd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,6 @@ under the License.
<module>airavata-api</module>
<module>airavata-services</module>
<module>modules/configuration</module>
- <module>modules/messaging</module>
<module>modules/registry</module>
<module>modules/security</module>
<module>modules/orchestrator</module>