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 2b5ee20fec858017d36aefe0e48b24417681280c Author: yasithdev <[email protected]> AuthorDate: Tue Jun 24 23:33:01 2025 -0500 merge registry-api-stubs to airavata-api --- airavata-api/pom.xml | 244 ++++++--------------- .../api/client/RegistryServiceClientFactory.java | 0 modules/airavata-helix/agent-api/pom.xml | 5 - .../metadata-analyzer/pom.xml | 5 - .../metascheduler-core/pom.xml | 5 - modules/cluster-monitoring/pom.xml | 5 - modules/compute-account-provisioning/pom.xml | 5 - modules/distribution/pom.xml | 5 - .../src/main/assembly/controller-bin-assembly.xml | 2 - .../main/assembly/email-monitor-bin-assembly.xml | 3 - .../src/main/assembly/parser-wm-bin-assembly.xml | 2 - .../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 - .../assembly/realtime-monitor-bin-assembly.xml | 3 - modules/job-monitor/pom.xml | 2 +- modules/orchestrator/orchestrator-core/pom.xml | 5 - modules/registry/registry-server/pom.xml | 1 - .../registry-server/registry-api-service/pom.xml | 5 - .../registry-server/registry-api-stubs/pom.xml | 88 -------- .../sharing-registry/sharing-data-migrator/pom.xml | 5 - .../generate-thrift-stubs.sh | 8 +- 22 files changed, 75 insertions(+), 326 deletions(-) diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml index 5f05c01b56..6fdc83e067 100644 --- a/airavata-api/pom.xml +++ b/airavata-api/pom.xml @@ -1,27 +1,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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.airavata</groupId> <artifactId>airavata</artifactId> @@ -29,9 +10,9 @@ under the License. <relativePath>../pom.xml</relativePath> </parent> - <name>Airavata API</name> <artifactId>airavata-api</artifactId> <packaging>jar</packaging> + <name>Airavata API</name> <url>http://airavata.apache.org/</url> <properties> @@ -40,12 +21,7 @@ under the License. </properties> <dependencies> - <!-- Airavata stubs & clients --> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> + <!-- Airavata clients & stubs --> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-orchestrator-client</artifactId> @@ -76,6 +52,16 @@ under the License. <artifactId>profile-service-stubs</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-server-configuration</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>platform-monitoring</artifactId> + <version>${project.version}</version> + </dependency> <!-- Core libraries --> <dependency> @@ -197,11 +183,7 @@ under the License. <version>${jaxb.version}</version> </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <version>${javax.annotation.version}</version> - </dependency> + <!-- Other utilities --> <dependency> <groupId>edu.uiuc.ncsa.myproxy</groupId> <artifactId>oa4mp-client-api</artifactId> @@ -236,46 +218,6 @@ under the License. </exclusion> </exclusions> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-configuration</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </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> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.4</version> - </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> @@ -297,27 +239,22 @@ under the License. <artifactId>commons-io</artifactId> <version>1.3.2</version> </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>${thrift.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-configuration</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.9</version> </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20230227</version> + </dependency> - <!-- Testing --> + <!-- Test dependencies --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> + <version>4.7</version> <scope>test</scope> </dependency> <dependency> @@ -327,88 +264,35 @@ under the License. <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-server-configuration</artifactId> - <version>${project.version}</version> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.apache.derby</groupId> + <artifactId>derbyclient</artifactId> + <version>${derby.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.ogce</groupId> - <artifactId>xpp3</artifactId> - <version>${xpp3.version}</version> - </dependency> - <dependency> - <groupId>org.ogce</groupId> - <artifactId>xpp5</artifactId> - <version>${xpp5.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-security</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-sharing-registry-stubs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.oltu.oauth2</groupId> - <artifactId>org.apache.oltu.oauth2.client</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${fasterxml.jackson.version}</version> - </dependency> - <dependency> - <groupId>org.jmockit</groupId> - <artifactId>jmockit</artifactId> - <version>${jmockit.version}</version> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> + <version>${derby.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20230227</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>platform-monitoring</artifactId> - <version>${project.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> </dependency> </dependencies> <build> <plugins> - <!-- Thrift code generation --> + <!-- Consolidated Thrift code generation --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.8</version> <executions> @@ -429,13 +313,22 @@ under the License. <arg value="${project.build.directory}/generated-sources/thrift" /> <arg value="${project.basedir}/../thrift-interface-descriptions/stubs_java.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/credential-store-cpi.thrift" /> + </exec> </tasks> </configuration> </execution> </executions> </plugin> - <!-- Add generated sources to compile path --> + <!-- Add generated sources --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -455,6 +348,8 @@ under the License. </execution> </executions> </plugin> + + <!-- Strip generated date annotations --> <plugin> <groupId>com.google.code.maven-replacer-plugin</groupId> <artifactId>replacer</artifactId> @@ -475,6 +370,27 @@ under the License. <value> </value> </configuration> </plugin> + + <!-- Test runner --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.version}</version> + <configuration> + <systemPropertyVariables> + <credential.module.directory>${basedir}</credential.module.directory> + </systemPropertyVariables> + <useSystemClassLoader>false</useSystemClassLoader> + <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine> + <reuseForks>false</reuseForks> + <excludes> + <exclude>**/DAOBaseTestCase.java</exclude> + <exclude>**/MappingDAOTest.java</exclude> + </excludes> + <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> + </configuration> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <version>1.8</version> @@ -495,7 +411,7 @@ under the License. <arg value="-out" /> <arg value="${project.build.directory}/generated-sources/thrift" /> <arg - value="${project.basedir}/../thrift-interface-descriptions/service-cpis/credential-store-cpi.thrift" /> + value="${project.basedir}/../thrift-interface-descriptions/service-cpis/registry-api.thrift" /> </exec> </tasks> </configuration> @@ -521,28 +437,8 @@ under the License. </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.version}</version> - <inherited>true</inherited> - <configuration> - <systemPropertyVariables> - <credential.module.directory>${basedir}</credential.module.directory> - </systemPropertyVariables> - <useSystemClassLoader>false</useSystemClassLoader> - <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine> - - <reuseForks>false</reuseForks> - - <excludes> - <exclude>**/DAOBaseTestCase.java</exclude> - <exclude>**/MappingDAOTest.java</exclude> - </excludes> - <testSourceDirectory>${basedir}\src\test\java\</testSourceDirectory> - </configuration> - </plugin> </plugins> + <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory> <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory> <testResources> @@ -550,7 +446,7 @@ under the License. <directory>${project.basedir}/src/test/resources</directory> </testResource> <testResource> - <directory>${project.basedir}/../../../keystores</directory> + <directory>${project.basedir}/../keystores</directory> <targetPath>keystores</targetPath> <includes> <include>*.jks</include> diff --git a/modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java b/airavata-api/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java similarity index 100% rename from modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java rename to airavata-api/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java diff --git a/modules/airavata-helix/agent-api/pom.xml b/modules/airavata-helix/agent-api/pom.xml index 992bfe9371..2ef4c52482 100644 --- a/modules/airavata-helix/agent-api/pom.xml +++ b/modules/airavata-helix/agent-api/pom.xml @@ -33,11 +33,6 @@ under the License. <artifactId>jackson-databind</artifactId> <version>${fasterxml.jackson.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-api</artifactId> diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml index 7f70ece684..2aa63f225f 100644 --- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml +++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml @@ -40,11 +40,6 @@ under the License. <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>agent-api</artifactId> diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml index b5b266bb91..78f4b39722 100644 --- a/modules/airavata-metascheduler/metascheduler-core/pom.xml +++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml @@ -41,11 +41,6 @@ under the License. <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>agent-api</artifactId> diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml index a591e324d0..0389d3058d 100644 --- a/modules/cluster-monitoring/pom.xml +++ b/modules/cluster-monitoring/pom.xml @@ -38,11 +38,6 @@ under the License. <groupId>org.apache.airavata</groupId> <version>${project.version}</version> </dependency> - <dependency> - <artifactId>registry-api-stubs</artifactId> - <groupId>org.apache.airavata</groupId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> diff --git a/modules/compute-account-provisioning/pom.xml b/modules/compute-account-provisioning/pom.xml index 312d770dff..bd14de8888 100644 --- a/modules/compute-account-provisioning/pom.xml +++ b/modules/compute-account-provisioning/pom.xml @@ -33,11 +33,6 @@ under the License. <groupId>org.apache.airavata</groupId> <version>${project.version}</version> </dependency> - <dependency> - <artifactId>registry-api-stubs</artifactId> - <groupId>org.apache.airavata</groupId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index afc569cb5e..15db069d82 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -118,11 +118,6 @@ under the License. <artifactId>airavata-orchestrator-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>registry-api-service</artifactId> diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml index 63e9bc9c80..c4286623fc 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-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> @@ -137,7 +136,6 @@ <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.apache.logging.log4j:log4j-api</include> diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml index 93b7e08e7a..739ebb899f 100644 --- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml @@ -83,9 +83,6 @@ <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:airavata-api:jar</include> - <include>org.apache.airavata:registry-api-stubs:jar</include> - <include>org.apache.airavata:airavata-api:jar</include> <include>commons-cli:commons-cli</include> <include>commons-pool:commons-pool</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 ba54945c96..e61ff6d292 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-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> @@ -142,7 +141,6 @@ <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> diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml index e164d325e0..af59887fb2 100644 --- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml @@ -142,7 +142,6 @@ <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> 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 6066681fb2..11c8e35a6c 100644 --- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml @@ -141,7 +141,6 @@ <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.yaml:snakeyaml:jar</include> <include>org.xerial.snappy:snappy-java: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 bfc6c7515a..65acb2a6a3 100644 --- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml @@ -141,7 +141,6 @@ <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.yaml:snakeyaml:jar</include> <include>org.xerial.snappy:snappy-java:jar</include> diff --git a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml index 94fca1bef0..5a14a330eb 100644 --- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml @@ -82,9 +82,6 @@ <include>org.apache.airavata:realtime-monitor:jar</include> <include>org.apache.airavata:job-monitor-api:jar</include> <include>org.apache.airavata:task-core:jar</include> - <include>org.apache.airavata:airavata-api:jar</include> - <include>org.apache.airavata:registry-api-stubs:jar</include> - <include>org.apache.airavata:airavata-api:jar</include> <include>commons-cli:commons-cli</include> <include>commons-pool:commons-pool</include> diff --git a/modules/job-monitor/pom.xml b/modules/job-monitor/pom.xml index fc36991ca5..d754f77c6a 100644 --- a/modules/job-monitor/pom.xml +++ b/modules/job-monitor/pom.xml @@ -57,7 +57,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> + <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml index 7d8aa3b9da..41e3d4d5e9 100644 --- a/modules/orchestrator/orchestrator-core/pom.xml +++ b/modules/orchestrator/orchestrator-core/pom.xml @@ -76,11 +76,6 @@ under the License. <artifactId>airavata-server-configuration</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </project> diff --git a/modules/registry/registry-server/pom.xml b/modules/registry/registry-server/pom.xml index 3a1b44b62f..278d74249c 100644 --- a/modules/registry/registry-server/pom.xml +++ b/modules/registry/registry-server/pom.xml @@ -29,7 +29,6 @@ under the License. <packaging>pom</packaging> <modules> <module>registry-api-service</module> - <module>registry-api-stubs</module> </modules> diff --git a/modules/registry/registry-server/registry-api-service/pom.xml b/modules/registry/registry-server/registry-api-service/pom.xml index 5229827a1e..20307883d1 100644 --- a/modules/registry/registry-server/registry-api-service/pom.xml +++ b/modules/registry/registry-server/registry-api-service/pom.xml @@ -34,11 +34,6 @@ under the License. <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-registry-cpi</artifactId> diff --git a/modules/registry/registry-server/registry-api-stubs/pom.xml b/modules/registry/registry-server/registry-api-stubs/pom.xml deleted file mode 100644 index 13b8b4829e..0000000000 --- a/modules/registry/registry-server/registry-api-stubs/pom.xml +++ /dev/null @@ -1,88 +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";> - <parent> - <artifactId>registry-server</artifactId> - <groupId>org.apache.airavata</groupId> - <version>0.21-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>registry-api-stubs</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> - </dependencies> - - <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/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> - </build> -</project> diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml index b4b7e8f499..372a70d909 100644 --- a/modules/sharing-registry/sharing-data-migrator/pom.xml +++ b/modules/sharing-registry/sharing-data-migrator/pom.xml @@ -67,11 +67,6 @@ under the License. <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>registry-api-stubs</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> diff --git a/thrift-interface-descriptions/generate-thrift-stubs.sh b/thrift-interface-descriptions/generate-thrift-stubs.sh index 880744a896..bc75b1b3bb 100755 --- a/thrift-interface-descriptions/generate-thrift-stubs.sh +++ b/thrift-interface-descriptions/generate-thrift-stubs.sh @@ -81,9 +81,9 @@ setup() { JAVA_THRIFT_FILE="${THRIFTDIR}/stubs_java.thrift" JAVA_SRC_DIR='../airavata-api/src/main/java' - PHP_SDK_DIR='../airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib' - CPP_SDK_DIR='../airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/' - PYTHON_SDK_DIR='../airavata-api/airavata-client-sdks/airavata-python-sdk/airavata/' + PHP_SDK_DIR='../dev-tools/airavata-php-sdk/lib' + CPP_SDK_DIR='../dev-tools/airavata-cpp-sdk/lib/airavata/' + PYTHON_SDK_DIR='../dev-tools/airavata-python-sdk/airavata/' # Initialize the thrift arguments. @@ -96,7 +96,7 @@ setup() { # Java stub target directories for components/services CS_SRC_DIR='../airavata-api/src/main/java' ORCHESTRATOR_SRC_DIR='../modules/orchestrator/orchestrator-client/src/main/java' - REGISTRY_SRC_DIR='../modules/registry/registry-server/registry-api-stubs/src/main/java/' + REGISTRY_SRC_DIR='../airavata-api/src/main/java/' SHARING_REGISTRY_SRC_DIR='../modules/sharing-registry/sharing-registry-stubs/src/main/java/' PROFILE_SERVICE_SRC_DIR='../airavata-services/profile-service/profile-service-stubs/src/main/java' }
