This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch airavata-v2-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/airavata-v2-refactoring by
this push:
new 5fe4af33d2 Bundling MFT with main service
5fe4af33d2 is described below
commit 5fe4af33d2619aa5f9ff8dad714db2eea4165905
Author: DImuthuUpe <[email protected]>
AuthorDate: Wed Jun 28 00:55:55 2023 -0400
Bundling MFT with main service
---
modules/airavata-apis/airavata-apis-server/pom.xml | 50 ++++++++++++++++++++++
.../java/org/apache/airavata/apis/APIRunner.java | 9 ++--
.../{api.properties => application.properties} | 6 ++-
3 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/modules/airavata-apis/airavata-apis-server/pom.xml
b/modules/airavata-apis/airavata-apis-server/pom.xml
index 5014124e93..78e7f3bdb4 100644
--- a/modules/airavata-apis/airavata-apis-server/pom.xml
+++ b/modules/airavata-apis/airavata-apis-server/pom.xml
@@ -22,6 +22,39 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>mft-controller</artifactId>
+ <version>0.01-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>mft-agent-service</artifactId>
+ <version>0.01-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>mft-api-service</artifactId>
+ <version>0.01-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>mft-secret-service-client</artifactId>
@@ -55,6 +88,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>mft-api-client</artifactId>
+ <version>0.01-SNAPSHOT</version>
+
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-apis-stub</artifactId>
@@ -156,6 +201,11 @@
<artifactId>aws-java-sdk</artifactId>
<version>${aws.sdk.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>4.2.0</version>
+ </dependency>
</dependencies>
<properties>
<aws.sdk.version>1.12.372</aws.sdk.version>
diff --git
a/modules/airavata-apis/airavata-apis-server/src/main/java/org/apache/airavata/apis/APIRunner.java
b/modules/airavata-apis/airavata-apis-server/src/main/java/org/apache/airavata/apis/APIRunner.java
index c3f9d5a9cb..5018571b9a 100644
---
a/modules/airavata-apis/airavata-apis-server/src/main/java/org/apache/airavata/apis/APIRunner.java
+++
b/modules/airavata-apis/airavata-apis-server/src/main/java/org/apache/airavata/apis/APIRunner.java
@@ -4,17 +4,18 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.PropertySource;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@SpringBootApplication
-@ComponentScan(basePackages = {"org.apache.airavata",
+@ComponentScan(basePackages = {"org.apache.airavata.apis",
"org.apache.airavata.mft.secret.server.handler",
- "org.apache.airavata.mft.resource.server.handler"
+ "org.apache.airavata.mft.resource.server.handler",
+ "org.apache.airavata.mft.api.handler",
+ "org.apache.airavata.mft.controller",
+ "org.apache.airavata.mft.agent"
})
@EntityScan(basePackages = {"org.apache.airavata"})
@EnableJpaAuditing
-@PropertySource(value = "classpath:api.properties")
public class APIRunner {
public static void main(String[] args) {
diff --git
a/modules/airavata-apis/airavata-apis-server/src/main/resources/api.properties
b/modules/airavata-apis/airavata-apis-server/src/main/resources/application.properties
similarity index 87%
rename from
modules/airavata-apis/airavata-apis-server/src/main/resources/api.properties
rename to
modules/airavata-apis/airavata-apis-server/src/main/resources/application.properties
index a9fd83fea0..e186b72272 100644
---
a/modules/airavata-apis/airavata-apis-server/src/main/resources/api.properties
+++
b/modules/airavata-apis/airavata-apis-server/src/main/resources/application.properties
@@ -13,4 +13,8 @@
# 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.
-#
\ No newline at end of file
+#
+
+spring.main.allow-bean-definition-overriding=true
+agent.id=local-agent
+agent.transport.directory=plugins
\ No newline at end of file
