You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/02/27 22:30:01 UTC
[1/2] git commit: Only selectively syncing the API classes -
AIRAVATA-991
Repository: airavata
Updated Branches:
refs/heads/master 312a8efdd -> 505971a42
Only selectively syncing the API classes - AIRAVATA-991
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0d5baf11
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0d5baf11
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0d5baf11
Branch: refs/heads/master
Commit: 0d5baf11e73d59e88d55cb26bc55da9614463618
Parents: 650b457
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Feb 27 16:29:45 2014 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Feb 27 16:29:45 2014 -0500
----------------------------------------------------------------------
airavata-api/generate-thrift-files.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0d5baf11/airavata-api/generate-thrift-files.sh
----------------------------------------------------------------------
diff --git a/airavata-api/generate-thrift-files.sh b/airavata-api/generate-thrift-files.sh
index c3726b4..236780e 100755
--- a/airavata-api/generate-thrift-files.sh
+++ b/airavata-api/generate-thrift-files.sh
@@ -145,9 +145,9 @@ thrift ${THRIFT_ARGS} --gen java ${THRIFT_IDL_DIR}/airavataAPI.thrift || fail un
# For the generated java classes add the ASF V2 License header
add_license_header $JAVA_GEN_DIR
-#FIXME: Change this to only copy the API classes and not the data model classes
# Compare the newly generated classes with existing java generated skelton/stub sources and replace the changed ones.
-copy_changed_files ${JAVA_GEN_DIR} ${JAVA_API_SDK_DIR}
+# Only copying the API related classes and avoiding copy of any data models which already exist in the data-models.
+copy_changed_files ${JAVA_GEN_DIR}/org/apache/airavata/api ${JAVA_API_SDK_DIR}/org/apache/airavata/api
# CleanUp: Delete the base target build directory
rm -rf ${BASE_TARGET_DIR}
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/505971a4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/505971a4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/505971a4
Branch: refs/heads/master
Commit: 505971a429198f3fa0dbcc77d0460c97572406b6
Parents: 0d5baf1 312a8ef
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Feb 27 16:29:57 2014 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Feb 27 16:29:57 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/airavata/api/client/AiravataClientFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------