airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject airavata-sandbox git commit: modifting multiplexing changes
Date Fri, 28 Oct 2016 14:50:17 GMT
Repository: airavata-sandbox
Updated Branches:
  refs/heads/master be595299e -> 39613cd5a


modifting multiplexing changes


Project: http://git-wip-us.apache.org/repos/asf/airavata-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-sandbox/commit/39613cd5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-sandbox/tree/39613cd5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-sandbox/diff/39613cd5

Branch: refs/heads/master
Commit: 39613cd5ae75c489b092a0f1a655de50936f5c20
Parents: be59529
Author: Suresh Marru <smarru@apache.org>
Authored: Fri Oct 28 10:50:12 2016 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Fri Oct 28 10:50:12 2016 -0400

----------------------------------------------------------------------
 .../credentials/CredentialManagementService.java | 19 ++++++++++---------
 .../management/GatewayManagementService.java     | 14 +++++++-------
 .../Credentials/CredentialManagementService.php  |  2 +-
 .../lib/Airavata/API/Credentials/Types.php       |  2 +-
 .../GatewayManagementService.php                 |  2 +-
 .../lib/Airavata/API/GatewayManagement/Types.php |  2 +-
 .../generate-thrift-stubs.sh                     |  6 +++---
 7 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-sandbox/blob/39613cd5/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/credentials/CredentialManagementService.java
----------------------------------------------------------------------
diff --git a/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/credentials/CredentialManagementService.java
b/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/credentials/CredentialManagementService.java
index b7a4001..3c592fb 100644
--- a/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/credentials/CredentialManagementService.java
+++ b/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/credentials/CredentialManagementService.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -50,8 +50,9 @@ import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-18")
-@SuppressWarnings("all") public class CredentialManagementService {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-09-08")
+public class CredentialManagementService {
 
   public interface Iface {
 
@@ -568,7 +569,7 @@ import org.slf4j.LoggerFactory;
     public String userName; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       GATEWAY_ID((short)1, "gatewayId"),
       USER_NAME((short)2, "userName");
 
@@ -1021,7 +1022,7 @@ import org.slf4j.LoggerFactory;
     public String success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -1382,7 +1383,7 @@ import org.slf4j.LoggerFactory;
     public String airavataCredStoreToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AIRAVATA_CRED_STORE_TOKEN((short)1, "airavataCredStoreToken");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -1736,7 +1737,7 @@ import org.slf4j.LoggerFactory;
     public String success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -2097,7 +2098,7 @@ import org.slf4j.LoggerFactory;
     public String userName; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_NAME((short)1, "userName");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -2451,7 +2452,7 @@ import org.slf4j.LoggerFactory;
     public Map<String,String> success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();

http://git-wip-us.apache.org/repos/asf/airavata-sandbox/blob/39613cd5/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/gateway/management/GatewayManagementService.java
----------------------------------------------------------------------
diff --git a/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/gateway/management/GatewayManagementService.java
b/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/gateway/management/GatewayManagementService.java
index 4b8e2e4..f9608c4 100644
--- a/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/gateway/management/GatewayManagementService.java
+++ b/airavata-mock-multiplexed-api/mock-airavata-api-java-stubs/src/main/java/org/apache/airavata/api/gateway/management/GatewayManagementService.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -51,8 +51,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-20")
-@SuppressWarnings("all") public class GatewayManagementService {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-09-08")
+public class GatewayManagementService {
 
   public interface Iface {
 
@@ -412,7 +412,7 @@ import org.slf4j.LoggerFactory;
     public String gatewayName; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       GATEWAY_NAME((short)1, "gatewayName");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -766,7 +766,7 @@ import org.slf4j.LoggerFactory;
     public String success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -1127,7 +1127,7 @@ import org.slf4j.LoggerFactory;
     public String gatewayId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       GATEWAY_ID((short)1, "gatewayId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -1481,7 +1481,7 @@ import org.slf4j.LoggerFactory;
     public String success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
-    @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();

http://git-wip-us.apache.org/repos/asf/airavata-sandbox/blob/39613cd5/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/CredentialManagementService.php
----------------------------------------------------------------------
diff --git a/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/CredentialManagementService.php
b/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/CredentialManagementService.php
index 96b29ad..85b1cda 100644
--- a/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/CredentialManagementService.php
+++ b/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/CredentialManagementService.php
@@ -1,7 +1,7 @@
 <?php
 namespace Airavata\API\Credentials;
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata-sandbox/blob/39613cd5/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/Types.php
----------------------------------------------------------------------
diff --git a/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/Types.php
b/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/Types.php
index f7fae77..884d05a 100644
--- a/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/Types.php
+++ b/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/Credentials/Types.php
@@ -2,7 +2,7 @@
 namespace Airavata\API\Credentials;
 
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata-sandbox/blob/39613cd5/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/GatewayManagementService.php
----------------------------------------------------------------------
diff --git a/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/GatewayManagementService.php
b/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/GatewayManagementService.php
index 03ebfad..b2c645b 100644
--- a/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/GatewayManagementService.php
+++ b/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/GatewayManagementService.php
@@ -1,7 +1,7 @@
 <?php
 namespace Airavata\API\GatewayManagement;
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata-sandbox/blob/39613cd5/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/Types.php
----------------------------------------------------------------------
diff --git a/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/Types.php
b/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/Types.php
index bf1404e..46e87a4 100644
--- a/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/Types.php
+++ b/airavata-mock-multiplexed-api/mock-airavata-api-php-stubs/src/main/resources/lib/Airavata/API/GatewayManagement/Types.php
@@ -2,7 +2,7 @@
 namespace Airavata\API\GatewayManagement;
 
 /**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata-sandbox/blob/39613cd5/airavata-mock-multiplexed-api/mock-api-interface-descriptions/generate-thrift-stubs.sh
----------------------------------------------------------------------
diff --git a/airavata-mock-multiplexed-api/mock-api-interface-descriptions/generate-thrift-stubs.sh
b/airavata-mock-multiplexed-api/mock-api-interface-descriptions/generate-thrift-stubs.sh
index c4323e2..1931220 100755
--- a/airavata-mock-multiplexed-api/mock-api-interface-descriptions/generate-thrift-stubs.sh
+++ b/airavata-mock-multiplexed-api/mock-api-interface-descriptions/generate-thrift-stubs.sh
@@ -44,7 +44,7 @@ fi
 # Generation of thrift files will require installing Apache Thrift. Please add thrift to
your path.
 #  Verify is thrift is installed, is in the path is at a specified version.
 
-REQUIRED_THRIFT_VERSION='0.9.2'
+REQUIRED_THRIFT_VERSION='0.9.3'
 
 VERSION=$(thrift -version 2>/dev/null | grep -F "${REQUIRED_THRIFT_VERSION}" |  wc -l)
 if [ "$VERSION" -ne 1 ] ; then
@@ -84,8 +84,8 @@ add_license_header() {
 
     # For all generated thrift code, add the suppress all warnings annotation
     #  NOTE: In order to save the original file as a backup, use sed -i.orig in place of
sed -i ''
-    find ${GENERATED_CODE_DIR} -name '*.java' -print0 | xargs -0 sed -i '' -e 's/public class
/@SuppressWarnings("all") public class /'
-    find ${GENERATED_CODE_DIR} -name '*.java' -print0 | xargs -0 sed -i '' -e 's/public enum
/@SuppressWarnings("all") public enum /'
+#    find ${GENERATED_CODE_DIR} -name '*.java' -print0 | xargs -0 sed -i '' -e 's/public
class /@SuppressWarnings("all") public class /'
+#    find ${GENERATED_CODE_DIR} -name '*.java' -print0 | xargs -0 sed -i '' -e 's/public
enum /@SuppressWarnings("all") public enum /'
 
     # For each source file within the generated directory, add the ASF V2 LICENSE header
     FILE_SUFFIXES=(.php .java .h .cpp)


Mime
View raw message