You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2021/02/25 16:04:24 UTC
[airavata-mft] branch develop updated: Moving Auth token to a
common package
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
The following commit(s) were added to refs/heads/develop by this push:
new 3bf0325 Moving Auth token to a common package
3bf0325 is described below
commit 3bf0325de24f9acf36b3e7b57901597ddbfc2afb
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Thu Feb 25 11:04:07 2021 -0500
Moving Auth token to a common package
---
common/mft-common-proto/pom.xml | 44 ++++++++++++++++++++++
.../src/main/proto}/CredCommon.proto | 2 +-
common/pom.xml | 18 +++++++++
pom.xml | 1 +
4 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/common/mft-common-proto/pom.xml b/common/mft-common-proto/pom.xml
new file mode 100644
index 0000000..edec11b
--- /dev/null
+++ b/common/mft-common-proto/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>mft-common</artifactId>
+ <groupId>org.apache.airavata</groupId>
+ <version>0.01-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>mft-common-proto</artifactId>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>kr.motd.maven</groupId>
+ <artifactId>os-maven-plugin</artifactId>
+ <version>${os.maven.plugin}</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>${protobuf.maven.plugin}</version>
+ <configuration>
+ <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+ <pluginId>grpc-java</pluginId>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>compile-custom</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/services/secret-service/stub/src/main/proto/common/CredCommon.proto b/common/mft-common-proto/src/main/proto/CredCommon.proto
similarity index 94%
rename from services/secret-service/stub/src/main/proto/common/CredCommon.proto
rename to common/mft-common-proto/src/main/proto/CredCommon.proto
index e87977e..626ec18 100644
--- a/services/secret-service/stub/src/main/proto/common/CredCommon.proto
+++ b/common/mft-common-proto/src/main/proto/CredCommon.proto
@@ -18,7 +18,7 @@
syntax = "proto3";
option java_multiple_files = true;
-package org.apache.airavata.mft.credential.stubs.common;
+package org.apache.airavata.mft.stubs.common;
message AuthToken {
string token = 1;
diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 0000000..cee2822
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-mft</artifactId>
+ <groupId>org.apache.airavata</groupId>
+ <version>0.01-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>mft-common</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>mft-common-proto</module>
+ </modules>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f729ead..7c3921c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
</prerequisites>
<modules>
+ <module>common</module>
<module>core</module>
<module>transport</module>
<module>agent</module>