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 ce3cd78c8c2699e456f9e09042e52c2eb998a7fe Author: yasithdev <[email protected]> AuthorDate: Wed Jun 25 00:12:56 2025 -0500 move profile-service-stubs and platform-monitoring into airavata-api --- airavata-api/pom.xml | 43 ++++++++--- .../airavata/patform/monitoring/CountMonitor.java | 0 .../airavata/patform/monitoring/GaugeMonitor.java | 0 .../patform/monitoring/MonitoringServer.java | 0 .../client/ProfileServiceClientFactory.java | 0 modules/airavata-helix/helix-spectator/pom.xml | 10 --- modules/airavata-helix/task-core/pom.xml | 68 ++++++++--------- .../src/main/assembly/controller-bin-assembly.xml | 1 - .../main/assembly/email-monitor-bin-assembly.xml | 1 - .../src/main/assembly/parser-wm-bin-assembly.xml | 1 - .../src/main/assembly/participant-bin-assembly.xml | 2 - .../src/main/assembly/post-wm-bin-assembly.xml | 3 - .../src/main/assembly/pre-wm-bin-assembly.xml | 3 - .../assembly/realtime-monitor-bin-assembly.xml | 1 - modules/platform-monitoring/pom.xml | 59 --------------- .../iam-admin-services-core/pom.xml | 2 +- modules/profile-service/pom.xml | 1 - .../java-client-samples/pom.xml | 2 +- .../profile-service/profile-service-server/pom.xml | 5 -- .../profile-service/profile-service-stubs/pom.xml | 85 ---------------------- pom.xml | 1 - .../generate-thrift-stubs.sh | 6 +- 22 files changed, 73 insertions(+), 221 deletions(-) diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml index bf386f9da0..ff23e07f8e 100644 --- a/airavata-api/pom.xml +++ b/airavata-api/pom.xml @@ -27,16 +27,6 @@ <artifactId>compute-account-provisioning</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>profile-service-stubs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>platform-monitoring</artifactId> - <version>${project.version}</version> - </dependency> <!-- Core libraries --> <dependency> @@ -282,6 +272,30 @@ <artifactId>shiro-core</artifactId> <version>1.13.0</version> </dependency> + + <dependency> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient</artifactId> + <version>0.9.0</version> + </dependency> + <!-- Hotspot JVM metrics--> + <dependency> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_hotspot</artifactId> + <version>0.9.0</version> + </dependency> + <!-- Exposition HTTPServer--> + <dependency> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_httpserver</artifactId> + <version>0.9.0</version> + </dependency> + <!-- Pushgateway exposition--> + <dependency> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_pushgateway</artifactId> + <version>0.9.0</version> + </dependency> </dependencies> <build> @@ -345,6 +359,15 @@ <arg value="${project.basedir}/../thrift-interface-descriptions/service-cpis/sharing_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/profile-service-cpi.thrift" /> + </exec> </tasks> </configuration> </execution> diff --git a/modules/platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/CountMonitor.java b/airavata-api/src/main/java/org/apache/airavata/patform/monitoring/CountMonitor.java similarity index 100% rename from modules/platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/CountMonitor.java rename to airavata-api/src/main/java/org/apache/airavata/patform/monitoring/CountMonitor.java diff --git a/modules/platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/GaugeMonitor.java b/airavata-api/src/main/java/org/apache/airavata/patform/monitoring/GaugeMonitor.java similarity index 100% rename from modules/platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/GaugeMonitor.java rename to airavata-api/src/main/java/org/apache/airavata/patform/monitoring/GaugeMonitor.java diff --git a/modules/platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/MonitoringServer.java b/airavata-api/src/main/java/org/apache/airavata/patform/monitoring/MonitoringServer.java similarity index 100% rename from modules/platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/MonitoringServer.java rename to airavata-api/src/main/java/org/apache/airavata/patform/monitoring/MonitoringServer.java diff --git a/modules/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java similarity index 100% rename from modules/profile-service/profile-service-stubs/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java rename to airavata-api/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java diff --git a/modules/airavata-helix/helix-spectator/pom.xml b/modules/airavata-helix/helix-spectator/pom.xml index eab63b10c0..bbca01f5fe 100644 --- a/modules/airavata-helix/helix-spectator/pom.xml +++ b/modules/airavata-helix/helix-spectator/pom.xml @@ -50,16 +50,6 @@ under the License. <artifactId>airavata-registry-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>profile-service-stubs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>services-security</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-api</artifactId> diff --git a/modules/airavata-helix/task-core/pom.xml b/modules/airavata-helix/task-core/pom.xml index d770aa5a57..8a8320cce7 100644 --- a/modules/airavata-helix/task-core/pom.xml +++ b/modules/airavata-helix/task-core/pom.xml @@ -16,38 +16,40 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>airavata-helix</artifactId> - <groupId>org.apache.airavata</groupId> - <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <name>Helix Task Core</name> - <artifactId>task-core</artifactId> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>airavata-helix</artifactId> + <groupId>org.apache.airavata</groupId> + <version>0.21-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <name>Helix Task Core</name> + <artifactId>task-core</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>task-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>agent-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>sshj-agent</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>platform-monitoring</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>task-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>agent-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>sshj-agent</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> -</project> +</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 daec034c81..ade1be1ff9 100644 --- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml @@ -161,7 +161,6 @@ <include>org.apache.commons:commons-pool2:jar</include> <include>org.json:json:jar</include> - <include>org.apache.airavata:platform-monitoring:jar</include> <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</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 739ebb899f..51e42679ee 100644 --- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml @@ -122,7 +122,6 @@ <include>org.apache.commons:commons-pool2:jar</include> <include>org.json:json:jar</include> - <include>org.apache.airavata:platform-monitoring:jar</include> <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common: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 6573f08c2a..c24537d83d 100644 --- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml @@ -159,7 +159,6 @@ <include>org.apache.commons:commons-pool2:jar</include> <include>org.json:json:jar</include> - <include>org.apache.airavata:platform-monitoring:jar</include> <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common: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 7d38cfff2b..752c524d33 100644 --- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml @@ -81,7 +81,6 @@ <include>org.apache.airavata:airavata-registry-core:jar</include> <include>org.apache.airavata:airavata-registry-cpi:jar</include> <include>org.apache.airavata:airavata-server-configuration:jar</include> - <include>org.apache.airavata:profile-service-stubs:jar</include> <include>com.rabbitmq:amqp-client:jar</include> <include>asm:asm:jar</include> <include>org.bouncycastle:bcpkix-jdk15on:jar</include> @@ -205,7 +204,6 @@ <include>org.apache.commons:commons-pool2:jar</include> <include>org.json:json:jar</include> - <include>org.apache.airavata:platform-monitoring:jar</include> <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common: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 62fecfc8d1..cbef2eeba4 100644 --- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml @@ -144,12 +144,10 @@ <include>org.yaml:snakeyaml:jar</include> <include>org.xerial.snappy:snappy-java:jar</include> <include>org.apache.airavata:ssh-agent:jar</include> - <include>org.apache.airavata:profile-service-stubs:jar</include> <include>com.hierynomus:sshj:jar</include> <include>org.apache.airavata:sshj-agent:jar</include> <include>org.apache.airavata:task-api:jar</include> <include>org.apache.airavata:task-core:jar</include> - <include>org.apache.airavata:profile-service-stubs:jar</include> <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include> <include>org.apache.airavata:workflow-impl:jar</include> <include>org.ogce:xpp3:jar</include> @@ -162,7 +160,6 @@ <include>org.apache.commons:commons-pool2:jar</include> <include>org.json:json:jar</include> - <include>org.apache.airavata:platform-monitoring:jar</include> <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common: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 fe2a970313..7e4f4fb213 100644 --- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml @@ -148,7 +148,6 @@ <include>org.apache.airavata:sshj-agent:jar</include> <include>org.apache.airavata:task-api:jar</include> <include>org.apache.airavata:task-core:jar</include> - <include>org.apache.airavata:profile-service-stubs:jar</include> <include>org.apache.tomcat.embed:tomcat-embed-core:jar</include> <include>org.apache.airavata:workflow-impl:jar</include> <include>org.ogce:xpp3:jar</include> @@ -158,10 +157,8 @@ <include>org.apache.zookeeper:zookeeper-jute:jar</include> <include>io.netty:netty-handler:jar</include> <include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include> - <include>org.apache.airavata:profile-service-stubs:jar</include> <include>org.apache.commons:commons-pool2:jar</include> <include>org.json:json:jar</include> - <include>org.apache.airavata:platform-monitoring:jar</include> <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common: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 5a14a330eb..373ec701be 100644 --- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml @@ -115,7 +115,6 @@ <include>org.apache.commons:commons-pool2:jar</include> <include>org.json:json:jar</include> - <include>org.apache.airavata:platform-monitoring:jar</include> <include>io.prometheus:simpleclient:jar</include> <include>io.prometheus:simpleclient_httpserver:jar</include> <include>io.prometheus:simpleclient_common:jar</include> diff --git a/modules/platform-monitoring/pom.xml b/modules/platform-monitoring/pom.xml deleted file mode 100644 index 58e5899650..0000000000 --- a/modules/platform-monitoring/pom.xml +++ /dev/null @@ -1,59 +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>airavata</artifactId> - <groupId>org.apache.airavata</groupId> - <version>0.21-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>platform-monitoring</artifactId> - - - <dependencies> - <!-- The client --> - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient</artifactId> - <version>0.9.0</version> - </dependency> - <!-- Hotspot JVM metrics--> - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_hotspot</artifactId> - <version>0.9.0</version> - </dependency> - <!-- Exposition HTTPServer--> - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_httpserver</artifactId> - <version>0.9.0</version> - </dependency> - <!-- Pushgateway exposition--> - <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_pushgateway</artifactId> - <version>0.9.0</version> - </dependency> - </dependencies> -</project> \ No newline at end of file diff --git a/modules/profile-service/iam-admin-services-core/pom.xml b/modules/profile-service/iam-admin-services-core/pom.xml index 6852df4f6c..132b1355be 100644 --- a/modules/profile-service/iam-admin-services-core/pom.xml +++ b/modules/profile-service/iam-admin-services-core/pom.xml @@ -63,7 +63,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>profile-service-stubs</artifactId> + <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/modules/profile-service/pom.xml b/modules/profile-service/pom.xml index d9b12d95dd..b1a7bf2ab2 100644 --- a/modules/profile-service/pom.xml +++ b/modules/profile-service/pom.xml @@ -54,7 +54,6 @@ under the License. </dependencies> <modules> - <module>profile-service-stubs</module> <module>profile-service-commons</module> <module>profile-user-core</module> <module>profile-tenant-core</module> diff --git a/modules/profile-service/profile-service-client-sdks/java-client-samples/pom.xml b/modules/profile-service/profile-service-client-sdks/java-client-samples/pom.xml index 48cb051cb0..a313ff7e4f 100644 --- a/modules/profile-service/profile-service-client-sdks/java-client-samples/pom.xml +++ b/modules/profile-service/profile-service-client-sdks/java-client-samples/pom.xml @@ -35,7 +35,7 @@ under the License. <dependencies> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>profile-service-stubs</artifactId> + <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/modules/profile-service/profile-service-server/pom.xml b/modules/profile-service/profile-service-server/pom.xml index 282ebc6d94..26e6421fac 100644 --- a/modules/profile-service/profile-service-server/pom.xml +++ b/modules/profile-service/profile-service-server/pom.xml @@ -35,11 +35,6 @@ under the License. <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>profile-service-stubs</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>profile-user-core</artifactId> diff --git a/modules/profile-service/profile-service-stubs/pom.xml b/modules/profile-service/profile-service-stubs/pom.xml deleted file mode 100644 index d4e1f4be42..0000000000 --- a/modules/profile-service/profile-service-stubs/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<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>profile-service</artifactId> - <groupId>org.apache.airavata</groupId> - <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <name>Profile Service Stubs</name> - <artifactId>profile-service-stubs</artifactId> - <packaging>jar</packaging> - <url>http://airavata.apache.org/</url> - - <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/profile-service-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/pom.xml b/pom.xml index d44b586309..55a52136c9 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,6 @@ under the License. <module>modules/airavata-helix</module> <module>modules/compute-account-provisioning</module> <module>modules/job-monitor</module> - <module>modules/platform-monitoring</module> <module>modules/distribution</module> <module>modules/airavata-metascheduler</module> <module>modules/airavata-metascheduler/metascheduler-core</module> diff --git a/thrift-interface-descriptions/generate-thrift-stubs.sh b/thrift-interface-descriptions/generate-thrift-stubs.sh index bc75b1b3bb..b28e9d281d 100755 --- a/thrift-interface-descriptions/generate-thrift-stubs.sh +++ b/thrift-interface-descriptions/generate-thrift-stubs.sh @@ -95,10 +95,10 @@ 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' + ORCHESTRATOR_SRC_DIR='../airavata-api/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' + SHARING_REGISTRY_SRC_DIR='../airavata-api/src/main/java/' + PROFILE_SERVICE_SRC_DIR='../airavata-api/src/main/java' }
