Merge branch 'userProfileService' of https://github.com/anujbhan/airavata into 
develop

This closes #94

NOTE: I commented out the USER_PROFILE service in ServerMain.java


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

Branch: refs/heads/develop
Commit: 80dbaba6f152a6527928ec038e6f8523db04a14a
Parents: 7a66275 b642ce9
Author: Marcus Christie <machris...@apache.org>
Authored: Thu Feb 2 16:13:39 2017 -0500
Committer: Marcus Christie <machris...@apache.org>
Committed: Thu Feb 2 16:22:42 2017 -0500

----------------------------------------------------------------------
 .../main/resources/airavata-server.properties   |    2 +-
 modules/distribution/pom.xml                    |   11 +
 .../org/apache/airavata/MigrationManager.java   |    4 +-
 .../UserProfileAiravataThriftClient.java        |   11 +-
 .../user-profile-service/.classpath             |   26 -
 .../user-profile/user-profile-service/pom.xml   |   14 +-
 .../server/UserProfileHandler.java              |   85 -
 .../server/UserProfileServer.java               |  141 -
 .../user/profile/server/UserProfileServer.java  |  159 +
 .../server/UserProfileServiceHandler.java       |  139 +
 modules/user-profile/user-profile-stubs/pom.xml |   34 +-
 .../api/exception/RegistryServiceException.java |  407 -
 .../userprofile/cpi/UserProfileService.java     | 7504 ++++++++++++++++++
 .../client/UserProfileServiceClientFactory.java |   43 +
 .../exception/UserProfileServiceException.java  |  407 +
 .../cpi/user_profile_cpiConstants.java          |   57 +
 .../airavata/userprofile/crude/cpi/Test.java    |   14 -
 .../crude/cpi/UserProfileCrudeService.java      | 7488 -----------------
 .../client/UserProfileServiceClientFactory.java |   43 -
 .../cpi/user_profile_crud_cpiConstants.java     |   41 -
 .../component-cpis/generate-cpi-stubs.sh        |    9 +-
 .../component-cpis/user-profile-cpi.thrift      |   57 +
 .../user_profile_cpi_errors.thrift              |   32 +
 23 files changed, 8465 insertions(+), 8263 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/80dbaba6/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/80dbaba6/modules/distribution/pom.xml
----------------------------------------------------------------------

Reply via email to