This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/thrift-server-extraction in repository https://gitbox.apache.org/repos/asf/airavata.git
commit a4500a7cae233745a879a0bf0d0ad5f7af5b6713 Author: yasithdev <[email protected]> AuthorDate: Thu Mar 26 14:23:44 2026 -0500 build: add protobuf-java dependency and protoc compilation to airavata-api - Add protobuf-java dependency (version managed in root POM at 4.30.1) - Add protobuf-maven-plugin with protocVersion 4.30.1 and explicit source dir - Fix enum value conflict in compute_resource.proto: rename CLOUD in JobSubmissionProtocol to JSP_CLOUD to avoid C++ scoping collision with CLOUD in ResourceJobManagerType (same package scope) - Add .proto suffix to java_package in all 33 proto files to prevent duplicate class errors from identically-named thrift and proto generated classes (e.g. org.apache.airavata.model.workspace.Project) --- airavata-api/pom.xml | 24 ++++++++++++++++++++++ .../accountprovisioning/account_provisioning.proto | 2 +- .../appcatalog/appdeployment/app_deployment.proto | 2 +- .../appcatalog/appinterface/app_interface.proto | 2 +- .../computeresource/compute_resource.proto | 4 ++-- .../appcatalog/gatewaygroups/gateway_groups.proto | 2 +- .../gatewayprofile/gateway_profile.proto | 2 +- .../group_resource_profile.proto | 2 +- .../airavata/model/appcatalog/parser/parser.proto | 2 +- .../storageresource/storage_resource.proto | 2 +- .../user_resource_profile.proto | 2 +- .../model/application/io/application_io.proto | 2 +- .../apache/airavata/model/commons/commons.proto | 2 +- .../model/credential/store/credential_store.proto | 2 +- .../model/data/movement/data_movement.proto | 2 +- .../model/data/replica/replica_catalog.proto | 2 +- .../apache/airavata/model/dbevent/db_event.proto | 2 +- .../org/apache/airavata/model/error/errors.proto | 2 +- .../airavata/model/experiment/experiment.proto | 2 +- .../airavata/model/group/group_manager.proto | 2 +- .../proto/org/apache/airavata/model/job/job.proto | 2 +- .../model/messaging/messaging_events.proto | 2 +- .../airavata/model/parallelism/parallelism.proto | 2 +- .../apache/airavata/model/process/process.proto | 2 +- .../airavata/model/scheduling/scheduling.proto | 2 +- .../apache/airavata/model/security/security.proto | 2 +- .../apache/airavata/model/sharing/sharing.proto | 2 +- .../org/apache/airavata/model/status/status.proto | 2 +- .../org/apache/airavata/model/task/task.proto | 2 +- .../airavata/model/tenant/tenant_profile.proto | 2 +- .../apache/airavata/model/user/user_profile.proto | 2 +- .../model/workflow/data/workflow_data.proto | 2 +- .../apache/airavata/model/workflow/workflow.proto | 2 +- .../airavata/model/workspace/workspace.proto | 2 +- 34 files changed, 58 insertions(+), 34 deletions(-) diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml index 0302ce6bc5..d9a8a88957 100644 --- a/airavata-api/pom.xml +++ b/airavata-api/pom.xml @@ -36,6 +36,10 @@ under the License. <dependencies> <!-- Core libraries --> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> @@ -382,6 +386,26 @@ under the License. <build> <plugins> + <!-- Protobuf code generation --> + <plugin> + <groupId>io.github.ascopes</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-proto-sources</id> + <goals> + <goal>generate</goal> + </goals> + <configuration> + <protocVersion>4.30.1</protocVersion> + <sourceDirectories> + <sourceDirectory>${project.basedir}/src/main/proto</sourceDirectory> + </sourceDirectories> + </configuration> + </execution> + </executions> + </plugin> + <!-- Enforce version convergence --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/accountprovisioning/account_provisioning.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/accountprovisioning/account_provisioning.proto index 6c5e3e8b17..282ddedf10 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/accountprovisioning/account_provisioning.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/accountprovisioning/account_provisioning.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.accountprovisioning; -option java_package = "org.apache.airavata.model.appcatalog.accountprovisioning"; +option java_package = "org.apache.airavata.model.appcatalog.accountprovisioning.proto"; option java_multiple_files = true; enum SSHAccountProvisionerConfigParamType { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/appdeployment/app_deployment.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/appdeployment/app_deployment.proto index 9a3038f410..b499188548 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/appdeployment/app_deployment.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/appdeployment/app_deployment.proto @@ -22,7 +22,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.appdeployment; -option java_package = "org.apache.airavata.model.appcatalog.appdeployment"; +option java_package = "org.apache.airavata.model.appcatalog.appdeployment.proto"; option java_multiple_files = true; import "org/apache/airavata/model/parallelism/parallelism.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/appinterface/app_interface.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/appinterface/app_interface.proto index 2e5c665e8e..e55e3181bf 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/appinterface/app_interface.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/appinterface/app_interface.proto @@ -22,7 +22,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.appinterface; -option java_package = "org.apache.airavata.model.appcatalog.appinterface"; +option java_package = "org.apache.airavata.model.appcatalog.appinterface.proto"; option java_multiple_files = true; import "org/apache/airavata/model/application/io/application_io.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/computeresource/compute_resource.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/computeresource/compute_resource.proto index 5f4e8390ed..4457aff299 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/computeresource/compute_resource.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/computeresource/compute_resource.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.computeresource; -option java_package = "org.apache.airavata.model.appcatalog.computeresource"; +option java_package = "org.apache.airavata.model.appcatalog.computeresource.proto"; option java_multiple_files = true; import "org/apache/airavata/model/parallelism/parallelism.proto"; @@ -125,7 +125,7 @@ enum JobSubmissionProtocol { SSH = 2; GLOBUS = 3; UNICORE = 4; - CLOUD = 5; + JSP_CLOUD = 5; SSH_FORK = 6; LOCAL_FORK = 7; } diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/gatewaygroups/gateway_groups.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/gatewaygroups/gateway_groups.proto index dd6c7a0363..c3d2f3dabf 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/gatewaygroups/gateway_groups.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/gatewaygroups/gateway_groups.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.gatewaygroups; -option java_package = "org.apache.airavata.model.appcatalog.gatewaygroups"; +option java_package = "org.apache.airavata.model.appcatalog.gatewaygroups.proto"; option java_multiple_files = true; message GatewayGroups { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/gatewayprofile/gateway_profile.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/gatewayprofile/gateway_profile.proto index 31634076ea..bc06da8c9c 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/gatewayprofile/gateway_profile.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/gatewayprofile/gateway_profile.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.gatewayprofile; -option java_package = "org.apache.airavata.model.appcatalog.gatewayprofile"; +option java_package = "org.apache.airavata.model.appcatalog.gatewayprofile.proto"; option java_multiple_files = true; import "org/apache/airavata/model/appcatalog/computeresource/compute_resource.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/groupresourceprofile/group_resource_profile.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/groupresourceprofile/group_resource_profile.proto index 7320b42d48..e2eaeb132a 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/groupresourceprofile/group_resource_profile.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/groupresourceprofile/group_resource_profile.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.groupresourceprofile; -option java_package = "org.apache.airavata.model.appcatalog.groupresourceprofile"; +option java_package = "org.apache.airavata.model.appcatalog.groupresourceprofile.proto"; option java_multiple_files = true; import "org/apache/airavata/model/appcatalog/computeresource/compute_resource.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/parser/parser.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/parser/parser.proto index 9221be7826..03f1f8e323 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/parser/parser.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/parser/parser.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.parser; -option java_package = "org.apache.airavata.model.appcatalog.parser"; +option java_package = "org.apache.airavata.model.appcatalog.parser.proto"; option java_multiple_files = true; enum IOType { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/storageresource/storage_resource.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/storageresource/storage_resource.proto index 59d0998e2e..10f47e580e 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/storageresource/storage_resource.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/storageresource/storage_resource.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.storageresource; -option java_package = "org.apache.airavata.model.appcatalog.storageresource"; +option java_package = "org.apache.airavata.model.appcatalog.storageresource.proto"; option java_multiple_files = true; import "org/apache/airavata/model/data/movement/data_movement.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/userresourceprofile/user_resource_profile.proto b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/userresourceprofile/user_resource_profile.proto index 5821966b35..4532a8c7f4 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/userresourceprofile/user_resource_profile.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/appcatalog/userresourceprofile/user_resource_profile.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.appcatalog.userresourceprofile; -option java_package = "org.apache.airavata.model.appcatalog.userresourceprofile"; +option java_package = "org.apache.airavata.model.appcatalog.userresourceprofile.proto"; option java_multiple_files = true; message UserComputeResourcePreference { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/application/io/application_io.proto b/airavata-api/src/main/proto/org/apache/airavata/model/application/io/application_io.proto index 3c8eaf960c..c0f36b17d2 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/application/io/application_io.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/application/io/application_io.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.application.io; -option java_package = "org.apache.airavata.model.application.io"; +option java_package = "org.apache.airavata.model.application.io.proto"; option java_multiple_files = true; // Data Types supported in Airavata. The primitive data types. diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/commons/commons.proto b/airavata-api/src/main/proto/org/apache/airavata/model/commons/commons.proto index 36e1afd7be..44d5c31de9 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/commons/commons.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/commons/commons.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.commons; -option java_package = "org.apache.airavata.model.commons"; +option java_package = "org.apache.airavata.model.commons.proto"; option java_multiple_files = true; message ErrorModel { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/credential/store/credential_store.proto b/airavata-api/src/main/proto/org/apache/airavata/model/credential/store/credential_store.proto index 6fd50a3663..4327f01633 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/credential/store/credential_store.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/credential/store/credential_store.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.credential.store; -option java_package = "org.apache.airavata.model.credential.store"; +option java_package = "org.apache.airavata.model.credential.store.proto"; option java_multiple_files = true; message SSHCredential { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/data/movement/data_movement.proto b/airavata-api/src/main/proto/org/apache/airavata/model/data/movement/data_movement.proto index fd9b32f2c2..e0de8bf530 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/data/movement/data_movement.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/data/movement/data_movement.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.data.movement; -option java_package = "org.apache.airavata.model.data.movement"; +option java_package = "org.apache.airavata.model.data.movement.proto"; option java_multiple_files = true; enum DMType { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/data/replica/replica_catalog.proto b/airavata-api/src/main/proto/org/apache/airavata/model/data/replica/replica_catalog.proto index 80ac5146ec..b2ed5bb389 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/data/replica/replica_catalog.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/data/replica/replica_catalog.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.data.replica; -option java_package = "org.apache.airavata.model.data.replica"; +option java_package = "org.apache.airavata.model.data.replica.proto"; option java_multiple_files = true; enum ReplicaLocationCategory { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/dbevent/db_event.proto b/airavata-api/src/main/proto/org/apache/airavata/model/dbevent/db_event.proto index 9944aaf8b6..d7fc12180e 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/dbevent/db_event.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/dbevent/db_event.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.dbevent; -option java_package = "org.apache.airavata.model.dbevent"; +option java_package = "org.apache.airavata.model.dbevent.proto"; option java_multiple_files = true; // Type of db-crud operation needed for replication diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/error/errors.proto b/airavata-api/src/main/proto/org/apache/airavata/model/error/errors.proto index 9a1981b4cb..a9ea03e01c 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/error/errors.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/error/errors.proto @@ -22,7 +22,7 @@ syntax = "proto3"; package org.apache.airavata.model.error; -option java_package = "org.apache.airavata.model.error"; +option java_package = "org.apache.airavata.model.error.proto"; option java_multiple_files = true; // A list of Airavata API Error Message Types diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/experiment/experiment.proto b/airavata-api/src/main/proto/org/apache/airavata/model/experiment/experiment.proto index b04625b597..1cd94a4080 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/experiment/experiment.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/experiment/experiment.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.experiment; -option java_package = "org.apache.airavata.model.experiment"; +option java_package = "org.apache.airavata.model.experiment.proto"; option java_multiple_files = true; import "org/apache/airavata/model/commons/commons.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/group/group_manager.proto b/airavata-api/src/main/proto/org/apache/airavata/model/group/group_manager.proto index 408fc273cc..d3e1f7f72a 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/group/group_manager.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/group/group_manager.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.group; -option java_package = "org.apache.airavata.model.group"; +option java_package = "org.apache.airavata.model.group.proto"; option java_multiple_files = true; enum ResourceType { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/job/job.proto b/airavata-api/src/main/proto/org/apache/airavata/model/job/job.proto index 7d21579a5f..f7420e9858 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/job/job.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/job/job.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.job; -option java_package = "org.apache.airavata.model.job"; +option java_package = "org.apache.airavata.model.job.proto"; option java_multiple_files = true; import "org/apache/airavata/model/status/status.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/messaging/messaging_events.proto b/airavata-api/src/main/proto/org/apache/airavata/model/messaging/messaging_events.proto index 441d78acec..4de9b247c6 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/messaging/messaging_events.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/messaging/messaging_events.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.messaging.event; -option java_package = "org.apache.airavata.model.messaging.event"; +option java_package = "org.apache.airavata.model.messaging.event.proto"; option java_multiple_files = true; import "org/apache/airavata/model/status/status.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/parallelism/parallelism.proto b/airavata-api/src/main/proto/org/apache/airavata/model/parallelism/parallelism.proto index 26b4403d1b..6f46b8f454 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/parallelism/parallelism.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/parallelism/parallelism.proto @@ -21,7 +21,7 @@ syntax = "proto3"; package org.apache.airavata.model.parallelism; -option java_package = "org.apache.airavata.model.parallelism"; +option java_package = "org.apache.airavata.model.parallelism.proto"; option java_multiple_files = true; // Enumeration of application parallelism supported by Airavata. diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/process/process.proto b/airavata-api/src/main/proto/org/apache/airavata/model/process/process.proto index e8938ccfa8..35d0760b38 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/process/process.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/process/process.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.process; -option java_package = "org.apache.airavata.model.process"; +option java_package = "org.apache.airavata.model.process.proto"; option java_multiple_files = true; import "org/apache/airavata/model/commons/commons.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/scheduling/scheduling.proto b/airavata-api/src/main/proto/org/apache/airavata/model/scheduling/scheduling.proto index 1298d2821f..3bff495293 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/scheduling/scheduling.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/scheduling/scheduling.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.scheduling; -option java_package = "org.apache.airavata.model.scheduling"; +option java_package = "org.apache.airavata.model.scheduling.proto"; option java_multiple_files = true; message ComputationalResourceSchedulingModel { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/security/security.proto b/airavata-api/src/main/proto/org/apache/airavata/model/security/security.proto index 5638e6d98a..2ccfd710d1 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/security/security.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/security/security.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.security; -option java_package = "org.apache.airavata.model.security"; +option java_package = "org.apache.airavata.model.security.proto"; option java_multiple_files = true; // This file describes the definitions of the security model which encapsulates diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/sharing/sharing.proto b/airavata-api/src/main/proto/org/apache/airavata/model/sharing/sharing.proto index babd045e46..51b9c711a6 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/sharing/sharing.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/sharing/sharing.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.sharing.registry.models; -option java_package = "org.apache.airavata.sharing.registry.models"; +option java_package = "org.apache.airavata.sharing.registry.models.proto"; option java_multiple_files = true; // Domain is the entity that enables multi-tenancy in this component. Every diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/status/status.proto b/airavata-api/src/main/proto/org/apache/airavata/model/status/status.proto index 6bf3abee17..99eb2d4584 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/status/status.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/status/status.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.status; -option java_package = "org.apache.airavata.model.status"; +option java_package = "org.apache.airavata.model.status.proto"; option java_multiple_files = true; enum ExperimentState { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/task/task.proto b/airavata-api/src/main/proto/org/apache/airavata/model/task/task.proto index 19eed52b1c..ee7e2bae7a 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/task/task.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/task/task.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.task; -option java_package = "org.apache.airavata.model.task"; +option java_package = "org.apache.airavata.model.task.proto"; option java_multiple_files = true; import "org/apache/airavata/model/commons/commons.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/tenant/tenant_profile.proto b/airavata-api/src/main/proto/org/apache/airavata/model/tenant/tenant_profile.proto index 47e597ab8e..6481d23d82 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/tenant/tenant_profile.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/tenant/tenant_profile.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.tenant; -option java_package = "org.apache.airavata.model.tenant"; +option java_package = "org.apache.airavata.model.tenant.proto"; option java_multiple_files = true; enum TenantApprovalStatus { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/user/user_profile.proto b/airavata-api/src/main/proto/org/apache/airavata/model/user/user_profile.proto index ead71d5e37..9d007bb310 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/user/user_profile.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/user/user_profile.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.user; -option java_package = "org.apache.airavata.model.user"; +option java_package = "org.apache.airavata.model.user.proto"; option java_multiple_files = true; enum Status { diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/workflow/data/workflow_data.proto b/airavata-api/src/main/proto/org/apache/airavata/model/workflow/data/workflow_data.proto index 20901babf7..a870080b65 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/workflow/data/workflow_data.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/workflow/data/workflow_data.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model; -option java_package = "org.apache.airavata.model"; +option java_package = "org.apache.airavata.model.proto"; option java_multiple_files = true; import "org/apache/airavata/model/application/io/application_io.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/workflow/workflow.proto b/airavata-api/src/main/proto/org/apache/airavata/model/workflow/workflow.proto index 5dd3113d11..b1c65ab25e 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/workflow/workflow.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/workflow/workflow.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package org.apache.airavata.model.workflow; -option java_package = "org.apache.airavata.model.workflow"; +option java_package = "org.apache.airavata.model.workflow.proto"; option java_multiple_files = true; import "org/apache/airavata/model/commons/commons.proto"; diff --git a/airavata-api/src/main/proto/org/apache/airavata/model/workspace/workspace.proto b/airavata-api/src/main/proto/org/apache/airavata/model/workspace/workspace.proto index bdb5cff764..f75dd66c71 100644 --- a/airavata-api/src/main/proto/org/apache/airavata/model/workspace/workspace.proto +++ b/airavata-api/src/main/proto/org/apache/airavata/model/workspace/workspace.proto @@ -23,7 +23,7 @@ syntax = "proto3"; package org.apache.airavata.model.workspace; -option java_package = "org.apache.airavata.model.workspace"; +option java_package = "org.apache.airavata.model.workspace.proto"; option java_multiple_files = true; message Group {
