You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/05/04 20:47:51 UTC
[1/2] airavata git commit: Add generation of PHP Profile Service
stubs to script
Repository: airavata
Updated Branches:
refs/heads/develop 0710b1c25 -> d0f3f5c91
Add generation of PHP Profile Service stubs to script
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3f404315
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3f404315
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3f404315
Branch: refs/heads/develop
Commit: 3f404315179fb61591123d6f133f4db5d157a876
Parents: 0710b1c
Author: Marcus Christie <ma...@apache.org>
Authored: Thu May 4 14:43:26 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu May 4 14:43:26 2017 -0400
----------------------------------------------------------------------
thrift-interface-descriptions/generate-thrift-stubs.sh | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3f404315/thrift-interface-descriptions/generate-thrift-stubs.sh
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/generate-thrift-stubs.sh b/thrift-interface-descriptions/generate-thrift-stubs.sh
index fe968f0..d78d9d5 100755
--- a/thrift-interface-descriptions/generate-thrift-stubs.sh
+++ b/thrift-interface-descriptions/generate-thrift-stubs.sh
@@ -73,6 +73,7 @@ DATAMODEL_THRIFT_FILE='data-models/airavata_data_models.thrift'
APP_CATALOG_THRIFT_FILE='data-models/app-catalog-models/app_catalog_models.thrift'
RESOURCE_CATALOG_THRIFT_FILE='data-models/resource-catalog-models/resource_catalog_models.thrift'
WORKFLOW_THRIFT_FILE='data-models/workflow-models/workflow_data_model.thrift'
+PROFILE_SERVICE_THRIFT_FILE='service-cpis/profile-service/profile-service-cpi.thrift'
DATAMODEL_SRC_DIR='../airavata-api/airavata-data-models/src/main/java'
JAVA_API_SDK_DIR='../airavata-api/airavata-api-stubs/src/main/java'
@@ -220,6 +221,7 @@ generate_php_stubs() {
$THRIFT_EXEC ${THRIFT_ARGS} --gen php:autoload ${APP_CATALOG_THRIFT_FILE} || fail unable to generate PHP thrift classes
$THRIFT_EXEC ${THRIFT_ARGS} --gen php:autoload ${RESOURCE_CATALOG_THRIFT_FILE} || fail unable to generate PHP thrift classes
$THRIFT_EXEC ${THRIFT_ARGS} --gen php:autoload ${AIRAVATA_API_THRIFT_FILE} || fail unable to generate PHP thrift classes
+ $THRIFT_EXEC ${THRIFT_ARGS} --gen php:autoload ${PROFILE_SERVICE_THRIFT_FILE} || fail unable to generate PHP thrift classes
# For the generated java classes add the ASF V2 License header
## TODO Write PHP license parser
[2/2] airavata git commit: Dependency tweaks for the IamAdminServices
Keycloak client
Posted by ma...@apache.org.
Dependency tweaks for the IamAdminServices Keycloak client
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d0f3f5c9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d0f3f5c9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d0f3f5c9
Branch: refs/heads/develop
Commit: d0f3f5c912e4ae78cf342f07d27401e9a060ee69
Parents: 3f40431
Author: Marcus Christie <ma...@apache.org>
Authored: Thu May 4 16:46:10 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu May 4 16:46:10 2017 -0400
----------------------------------------------------------------------
modules/distribution/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d0f3f5c9/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 16e4cfb..7eb50d0 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -243,6 +243,13 @@
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-api-server</artifactId>
<version>${project.version}</version>
+ <!-- This httpcore version prevents IamAdminServices Keycloak REST client from working -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents.wso2</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -509,6 +516,12 @@
<artifactId>profile-service-server</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- Needed for IamAdminServices Keycloak client -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.2</version>
+ </dependency>
<!-- ======================== Sample =================== -->
<dependency>
<groupId>org.apache.airavata</groupId>