Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8AB6D200B9D for ; Thu, 13 Oct 2016 22:58:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8951B160AD2; Thu, 13 Oct 2016 20:58:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ACEDF160AF8 for ; Thu, 13 Oct 2016 22:58:11 +0200 (CEST) Received: (qmail 93686 invoked by uid 500); 13 Oct 2016 20:58:10 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 93589 invoked by uid 99); 13 Oct 2016 20:58:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2016 20:58:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 51CBCE0D5C; Thu, 13 Oct 2016 20:58:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Thu, 13 Oct 2016 20:58:13 -0000 Message-Id: <0ff3f4d3368c4d6f8e12227baedfdbfb@git.apache.org> In-Reply-To: <87097370831a496095f9f24802741517@git.apache.org> References: <87097370831a496095f9f24802741517@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] airavata git commit: implementing sharing server archived-at: Thu, 13 Oct 2016 20:58:13 -0000 implementing sharing server Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9101a519 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9101a519 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9101a519 Branch: refs/heads/develop Commit: 9101a5192a2199314b219dd67e34769902dfce44 Parents: e36c145 Author: scnakandala Authored: Thu Oct 13 16:58:03 2016 -0400 Committer: scnakandala Committed: Thu Oct 13 16:58:03 2016 -0400 ---------------------------------------------------------------------- .../main/resources/airavata-server.properties | 6 + .../sharing/registry/AiravataDataMigrator.java | 166 - .../sharing/registry/ConnectionFactory.java | 59 - .../migrator/airavata/AiravataDataMigrator.java | 166 + .../migrator/airavata/ConnectionFactory.java | 59 + .../src/main/resources/bin/sharing-registry.sh | 4 +- .../sharing-registry-server/pom.xml | 13 + .../registry/server/SharingRegistryServer.java | 129 +- .../server/SharingRegistryServerHandler.java | 4 +- .../sharing-registry-stubs/pom.xml | 22 +- .../sharing/registry/models/Domain.java | 27 +- .../sharing/registry/models/Entity.java | 2 +- .../sharing/registry/models/EntityType.java | 2 +- .../registry/models/GroupMembership.java | 2 +- .../sharing/registry/models/PermissionType.java | 2 +- .../sharing/registry/models/SearchCriteria.java | 2 +- .../sharing/registry/models/Sharing.java | 2 +- .../models/SharingRegistryException.java | 2 +- .../airavata/sharing/registry/models/User.java | 2 +- .../sharing/registry/models/UserGroup.java | 2 +- .../service/cpi/GovRegistryService.java | 45160 ----------------- .../service/cpi/SharingRegistryService.java | 45160 +++++++++++++++++ .../thrift_models/sharing_cpi.thrift | 2 +- 23 files changed, 45571 insertions(+), 45424 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/configuration/server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties index 9dace79..c823d89 100644 --- a/modules/configuration/server/src/main/resources/airavata-server.properties +++ b/modules/configuration/server/src/main/resources/airavata-server.properties @@ -104,6 +104,12 @@ sharingcatalog.jdbc.password=airavata sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION ########################################################################### +# Sharing Registry Server Configuration +########################################################################### +sharing.registry.server.host=localhost +sharing.registry.server.port=7878 + +########################################################################### # User Profile MongoDB Configuration ########################################################################### userprofile.mongodb.host=localhost http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/AiravataDataMigrator.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/AiravataDataMigrator.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/AiravataDataMigrator.java deleted file mode 100644 index 1a80683..0000000 --- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/AiravataDataMigrator.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * -*/ -package org.apache.airavata.sharing.registry; - -import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.sharing.registry.models.*; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; -import org.apache.thrift.TException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.HashMap; -import java.util.Map; - -public class AiravataDataMigrator { - private final static Logger logger = LoggerFactory.getLogger(AiravataDataMigrator.class); - - public static void main(String[] args) throws SQLException, ClassNotFoundException, TException, ApplicationSettingsException { - Connection expCatConnection = ConnectionFactory.getInstance().getExpCatConnection(); - - SharingRegistryServerHandler govRegistryServerHandler = new SharingRegistryServerHandler(); - - String query = "SELECT * FROM GATEWAY"; - Statement statement = expCatConnection.createStatement(); - ResultSet rs = statement.executeQuery(query); - - while (rs.next()) { - //Creating domain entries - Domain domain = new Domain(); - domain.setDomainId(rs.getString("GATEWAY_ID")); - if(rs.getString("GATEWAY_NAME") != null) - domain.setName(rs.getString("GATEWAY_NAME")); - else - domain.setName(rs.getString("GATEWAY_ID")); - domain.setDescription("Domain entry for " + domain.name); - - govRegistryServerHandler.createDomain(domain); - - //Creating Entity Types for each domain - EntityType entityType = new EntityType(); - entityType.setEntityTypeId(domain.domainId+":PROJECT"); - entityType.setDomainId(domain.domainId); - entityType.setName("PROJECT"); - entityType.setDescription("Project entity type"); - govRegistryServerHandler.createEntityType(entityType); - - entityType = new EntityType(); - entityType.setEntityTypeId(domain.domainId+":EXPERIMENT"); - entityType.setDomainId(domain.domainId); - entityType.setName("EXPERIMENT"); - entityType.setDescription("Experiment entity type"); - govRegistryServerHandler.createEntityType(entityType); - - entityType = new EntityType(); - entityType.setEntityTypeId(domain.domainId+":FILE"); - entityType.setDomainId(domain.domainId); - entityType.setName("FILE"); - entityType.setDescription("File entity type"); - govRegistryServerHandler.createEntityType(entityType); - - //Creating Permission Types for each domain - PermissionType permissionType = new PermissionType(); - permissionType.setPermissionTypeId(domain.domainId+":READ"); - permissionType.setDomainId(domain.domainId); - permissionType.setName("READ"); - permissionType.setDescription("Read permission type"); - govRegistryServerHandler.createPermissionType(permissionType); - - permissionType = new PermissionType(); - permissionType.setPermissionTypeId(domain.domainId+":WRITE"); - permissionType.setDomainId(domain.domainId); - permissionType.setName("WRITE"); - permissionType.setDescription("Write permission type"); - govRegistryServerHandler.createPermissionType(permissionType); - } - - //Creating user entries - query = "SELECT * FROM USERS"; - statement = expCatConnection.createStatement(); - rs = statement.executeQuery(query); - while(rs.next()){ - User user = new User(); - user.setUserId(rs.getString("AIRAVATA_INTERNAL_USER_ID")); - user.setDomainId(rs.getString("GATEWAY_ID")); - user.setUserName(rs.getString("USER_NAME")); - - govRegistryServerHandler.createUser(user); - } - - //Creating project entries - query = "SELECT * FROM PROJECT"; - statement = expCatConnection.createStatement(); - rs = statement.executeQuery(query); - while(rs.next()){ - Entity entity = new Entity(); - entity.setEntityId(rs.getString("PROJECT_ID")); - entity.setDomainId(rs.getString("GATEWAY_ID")); - entity.setEntityTypeId(rs.getString("GATEWAY_ID") + ":PROJECT"); - entity.setOwnerId(rs.getString("USER_NAME") + "@" + rs.getString("GATEWAY_ID")); - entity.setName(rs.getString("PROJECT_NAME")); - entity.setDescription(rs.getString("DESCRIPTION")); - if(entity.getDescription() == null) - entity.setFullText(entity.getName()); - else - entity.setFullText(entity.getName() + " " + entity.getDescription()); - Map metadata = new HashMap<>(); - metadata.put("CREATION_TIME", rs.getDate("CREATION_TIME").toString()); - - govRegistryServerHandler.createEntity(entity); - } - - //Creating experiment entries - query = "SELECT * FROM EXPERIMENT"; - statement = expCatConnection.createStatement(); - rs = statement.executeQuery(query); - while(rs.next()){ - Entity entity = new Entity(); - entity.setEntityId(rs.getString("EXPERIMENT_ID")); - entity.setDomainId(rs.getString("GATEWAY_ID")); - entity.setEntityTypeId(rs.getString("GATEWAY_ID") + ":EXPERIMENT"); - entity.setOwnerId(rs.getString("USER_NAME") + "@" + rs.getString("GATEWAY_ID")); - entity.setParentEntityId(rs.getString("PROJECT_ID")); - entity.setName(rs.getString("EXPERIMENT_NAME")); - entity.setDescription(rs.getString("DESCRIPTION")); - if(entity.getDescription() == null) - entity.setFullText(entity.getName()); - else - entity.setFullText(entity.getName() + " " + entity.getDescription()); - Map metadata = new HashMap<>(); - metadata.put("CREATION_TIME", rs.getDate("CREATION_TIME").toString()); - metadata.put("EXPERIMENT_TYPE", rs.getString("EXPERIMENT_TYPE")); - metadata.put("EXECUTION_ID", rs.getString("EXECUTION_ID")); - metadata.put("GATEWAY_EXECUTION_ID", rs.getString("GATEWAY_EXECUTION_ID")); - metadata.put("ENABLE_EMAIL_NOTIFICATION", rs.getString("ENABLE_EMAIL_NOTIFICATION")); - metadata.put("EMAIL_ADDRESSES", rs.getString("EMAIL_ADDRESSES")); - metadata.put("GATEWAY_INSTANCE_ID", rs.getString("GATEWAY_INSTANCE_ID")); - metadata.put("ARCHIVE", rs.getString("ARCHIVE")); - - govRegistryServerHandler.createEntity(entity); - } - - expCatConnection.close(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java deleted file mode 100644 index 40c0e18..0000000 --- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/ConnectionFactory.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * -*/ -package org.apache.airavata.sharing.registry; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; - -public class ConnectionFactory { - private final static Logger logger = LoggerFactory.getLogger(ConnectionFactory.class); - - //static reference to itself - private static ConnectionFactory instance; - - public static final String EXPCAT_URL = "jdbc:mysql://localhost/airavata_exp_catalog"; - public static final String EXPCAT_USER = "root"; - public static final String EXPCAT_PASSWORD = ""; - public static final String DRIVER_CLASS = "com.mysql.jdbc.Driver"; - - private static Connection expCatConnection; - - //private constructor - private ConnectionFactory() throws ClassNotFoundException, SQLException { - Class.forName(DRIVER_CLASS); - expCatConnection = DriverManager.getConnection(EXPCAT_URL, EXPCAT_USER, EXPCAT_PASSWORD); - } - - public static ConnectionFactory getInstance() throws SQLException, ClassNotFoundException { - if(instance == null) - instance = new ConnectionFactory(); - return instance; - } - - public Connection getExpCatConnection() throws SQLException { - return expCatConnection; - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java new file mode 100644 index 0000000..a8ec19f --- /dev/null +++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java @@ -0,0 +1,166 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ +package org.apache.airavata.sharing.registry.migrator.airavata; + +import org.apache.airavata.common.exception.ApplicationSettingsException; +import org.apache.airavata.sharing.registry.models.*; +import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.HashMap; +import java.util.Map; + +public class AiravataDataMigrator { + private final static Logger logger = LoggerFactory.getLogger(AiravataDataMigrator.class); + + public static void main(String[] args) throws SQLException, ClassNotFoundException, TException, ApplicationSettingsException { + Connection expCatConnection = ConnectionFactory.getInstance().getExpCatConnection(); + + SharingRegistryServerHandler govRegistryServerHandler = new SharingRegistryServerHandler(); + + String query = "SELECT * FROM GATEWAY"; + Statement statement = expCatConnection.createStatement(); + ResultSet rs = statement.executeQuery(query); + + while (rs.next()) { + //Creating domain entries + Domain domain = new Domain(); + domain.setDomainId(rs.getString("GATEWAY_ID")); + if(rs.getString("GATEWAY_NAME") != null) + domain.setName(rs.getString("GATEWAY_NAME")); + else + domain.setName(rs.getString("GATEWAY_ID")); + domain.setDescription("Domain entry for " + domain.name); + + govRegistryServerHandler.createDomain(domain); + + //Creating Entity Types for each domain + EntityType entityType = new EntityType(); + entityType.setEntityTypeId(domain.domainId+":PROJECT"); + entityType.setDomainId(domain.domainId); + entityType.setName("PROJECT"); + entityType.setDescription("Project entity type"); + govRegistryServerHandler.createEntityType(entityType); + + entityType = new EntityType(); + entityType.setEntityTypeId(domain.domainId+":EXPERIMENT"); + entityType.setDomainId(domain.domainId); + entityType.setName("EXPERIMENT"); + entityType.setDescription("Experiment entity type"); + govRegistryServerHandler.createEntityType(entityType); + + entityType = new EntityType(); + entityType.setEntityTypeId(domain.domainId+":FILE"); + entityType.setDomainId(domain.domainId); + entityType.setName("FILE"); + entityType.setDescription("File entity type"); + govRegistryServerHandler.createEntityType(entityType); + + //Creating Permission Types for each domain + PermissionType permissionType = new PermissionType(); + permissionType.setPermissionTypeId(domain.domainId+":READ"); + permissionType.setDomainId(domain.domainId); + permissionType.setName("READ"); + permissionType.setDescription("Read permission type"); + govRegistryServerHandler.createPermissionType(permissionType); + + permissionType = new PermissionType(); + permissionType.setPermissionTypeId(domain.domainId+":WRITE"); + permissionType.setDomainId(domain.domainId); + permissionType.setName("WRITE"); + permissionType.setDescription("Write permission type"); + govRegistryServerHandler.createPermissionType(permissionType); + } + + //Creating user entries + query = "SELECT * FROM USERS"; + statement = expCatConnection.createStatement(); + rs = statement.executeQuery(query); + while(rs.next()){ + User user = new User(); + user.setUserId(rs.getString("AIRAVATA_INTERNAL_USER_ID")); + user.setDomainId(rs.getString("GATEWAY_ID")); + user.setUserName(rs.getString("USER_NAME")); + + govRegistryServerHandler.createUser(user); + } + + //Creating project entries + query = "SELECT * FROM PROJECT"; + statement = expCatConnection.createStatement(); + rs = statement.executeQuery(query); + while(rs.next()){ + Entity entity = new Entity(); + entity.setEntityId(rs.getString("PROJECT_ID")); + entity.setDomainId(rs.getString("GATEWAY_ID")); + entity.setEntityTypeId(rs.getString("GATEWAY_ID") + ":PROJECT"); + entity.setOwnerId(rs.getString("USER_NAME") + "@" + rs.getString("GATEWAY_ID")); + entity.setName(rs.getString("PROJECT_NAME")); + entity.setDescription(rs.getString("DESCRIPTION")); + if(entity.getDescription() == null) + entity.setFullText(entity.getName()); + else + entity.setFullText(entity.getName() + " " + entity.getDescription()); + Map metadata = new HashMap<>(); + metadata.put("CREATION_TIME", rs.getDate("CREATION_TIME").toString()); + + govRegistryServerHandler.createEntity(entity); + } + + //Creating experiment entries + query = "SELECT * FROM EXPERIMENT"; + statement = expCatConnection.createStatement(); + rs = statement.executeQuery(query); + while(rs.next()){ + Entity entity = new Entity(); + entity.setEntityId(rs.getString("EXPERIMENT_ID")); + entity.setDomainId(rs.getString("GATEWAY_ID")); + entity.setEntityTypeId(rs.getString("GATEWAY_ID") + ":EXPERIMENT"); + entity.setOwnerId(rs.getString("USER_NAME") + "@" + rs.getString("GATEWAY_ID")); + entity.setParentEntityId(rs.getString("PROJECT_ID")); + entity.setName(rs.getString("EXPERIMENT_NAME")); + entity.setDescription(rs.getString("DESCRIPTION")); + if(entity.getDescription() == null) + entity.setFullText(entity.getName()); + else + entity.setFullText(entity.getName() + " " + entity.getDescription()); + Map metadata = new HashMap<>(); + metadata.put("CREATION_TIME", rs.getDate("CREATION_TIME").toString()); + metadata.put("EXPERIMENT_TYPE", rs.getString("EXPERIMENT_TYPE")); + metadata.put("EXECUTION_ID", rs.getString("EXECUTION_ID")); + metadata.put("GATEWAY_EXECUTION_ID", rs.getString("GATEWAY_EXECUTION_ID")); + metadata.put("ENABLE_EMAIL_NOTIFICATION", rs.getString("ENABLE_EMAIL_NOTIFICATION")); + metadata.put("EMAIL_ADDRESSES", rs.getString("EMAIL_ADDRESSES")); + metadata.put("GATEWAY_INSTANCE_ID", rs.getString("GATEWAY_INSTANCE_ID")); + metadata.put("ARCHIVE", rs.getString("ARCHIVE")); + + govRegistryServerHandler.createEntity(entity); + } + + expCatConnection.close(); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/ConnectionFactory.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/ConnectionFactory.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/ConnectionFactory.java new file mode 100644 index 0000000..7212d84 --- /dev/null +++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/ConnectionFactory.java @@ -0,0 +1,59 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ +package org.apache.airavata.sharing.registry.migrator.airavata; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class ConnectionFactory { + private final static Logger logger = LoggerFactory.getLogger(ConnectionFactory.class); + + //static reference to itself + private static ConnectionFactory instance; + + public static final String EXPCAT_URL = "jdbc:mysql://localhost/airavata_exp_catalog"; + public static final String EXPCAT_USER = "root"; + public static final String EXPCAT_PASSWORD = ""; + public static final String DRIVER_CLASS = "com.mysql.jdbc.Driver"; + + private static Connection expCatConnection; + + //private constructor + private ConnectionFactory() throws ClassNotFoundException, SQLException { + Class.forName(DRIVER_CLASS); + expCatConnection = DriverManager.getConnection(EXPCAT_URL, EXPCAT_USER, EXPCAT_PASSWORD); + } + + public static ConnectionFactory getInstance() throws SQLException, ClassNotFoundException { + if(instance == null) + instance = new ConnectionFactory(); + return instance; + } + + public Connection getExpCatConnection() throws SQLException { + return expCatConnection; + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh index 10e0619..35bf0ef 100644 --- a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh +++ b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh @@ -75,9 +75,9 @@ then done else if $IS_DAEMON_MODE ; then - echo "Starting Sharing Catalog in daemon mode..." + echo "Starting Sharing Registry Server in daemon mode..." cd "$SHARING_REGISTRY_HOME"/lib - nohup $JAVA_HOME/bin/java -jar "$SHARING_REGISTRY_HOME"/lib/airavata-sharing-registry-server-0.7-SNAPSHOT.jar > ../sharing-registry.out & echo $! > "../sharing-registry-start_$!" + nohup $JAVA_HOME/bin/java -jar "$SHARING_REGISTRY_HOME"/lib/airavata-sharing-registry-server-0.17-SNAPSHOT.jar > ../sharing-registry.out & echo $! > "../sharing-registry-start_$!" cd .. else cd "$SHARING_REGISTRY_HOME"/lib http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml index 730469b..1498575 100644 --- a/modules/sharing-registry/sharing-registry-server/pom.xml +++ b/modules/sharing-registry/sharing-registry-server/pom.xml @@ -67,6 +67,19 @@ + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + + org.apache.airavata.sharing.registry.server.SharingRegistryServer + true + + + + + org.apache.openjpa openjpa-maven-plugin 2.2.0 http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java index 96fdb90..23b215a 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java @@ -20,9 +20,136 @@ */ package org.apache.airavata.sharing.registry.server; +import org.apache.airavata.common.utils.IServer; +import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; +import org.apache.thrift.server.TServer; +import org.apache.thrift.server.TThreadPoolServer; +import org.apache.thrift.transport.TServerSocket; +import org.apache.thrift.transport.TServerTransport; +import org.apache.thrift.transport.TTransportException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SharingRegistryServer { +import java.net.InetSocketAddress; + +public class SharingRegistryServer implements IServer { private final static Logger logger = LoggerFactory.getLogger(SharingRegistryServer.class); + + public static final String SHARING_REG_SERVER_HOST = "sharing.registry.server.host"; + public static final String SHARING_REG_SERVER_PORT = "sharing.registry.server.port"; + + private static final String SERVER_NAME = "Sharing Registry Server"; + private static final String SERVER_VERSION = "1.0"; + + private IServer.ServerStatus status; + private TServer server; + + public SharingRegistryServer() { + setStatus(IServer.ServerStatus.STOPPED); + } + + @Override + public String getName() { + return SERVER_NAME; + } + + @Override + public String getVersion() { + return SERVER_VERSION; + } + + @Override + public void start() throws Exception { + try { + setStatus(IServer.ServerStatus.STARTING); + final int serverPort = Integer.parseInt(ServerSettings.getSetting(SHARING_REG_SERVER_PORT)); + final String serverHost = ServerSettings.getSetting(SHARING_REG_SERVER_HOST); + SharingRegistryService.Processor processor = new SharingRegistryService.Processor(new SharingRegistryServerHandler()); + + TServerTransport serverTransport; + + if (serverHost == null) { + serverTransport = new TServerSocket(serverPort); + } else { + InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort); + serverTransport = new TServerSocket(inetSocketAddress); + } + TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport); + options.minWorkerThreads = 30; + server = new TThreadPoolServer(options.processor(processor)); + + new Thread() { + public void run() { + server.serve(); + setStatus(IServer.ServerStatus.STOPPED); + logger.info("Sharing Registry Server Stopped."); + } + }.start(); + new Thread() { + public void run() { + while (!server.isServing()) { + try { + Thread.sleep(500); + } catch (InterruptedException e) { + break; + } + } + if (server.isServing()) { + setStatus(IServer.ServerStatus.STARTED); + logger.info("Starting Sharing Registry Server on Port " + serverPort); + logger.info("Listening to Sharing Registry server clients ...."); + } + } + }.start(); + } catch (TTransportException e) { + setStatus(IServer.ServerStatus.FAILED); + throw new Exception("Error while starting the Sharing Registry service", e); + } + } + + public static void main(String[] args) { + try { + new SharingRegistryServer().start(); + } catch (Exception e) { + logger.error(e.getMessage(), e); + } + } + + @Override + public void stop() throws Exception { + if (server!=null && server.isServing()){ + setStatus(IServer.ServerStatus.STOPING); + server.stop(); + } + } + + @Override + public void restart() throws Exception { + stop(); + start(); + } + + @Override + public void configure() throws Exception { + + } + + @Override + public IServer.ServerStatus getStatus() throws Exception { + return status; + } + + private void setStatus(IServer.ServerStatus stat){ + status=stat; + status.updateTime(); + } + + public TServer getServer() { + return server; + } + + public void setServer(TServer server) { + this.server = server; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java index 7f2eb32..aa41a56 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java @@ -27,7 +27,7 @@ import org.apache.airavata.sharing.registry.db.repositories.*; import org.apache.airavata.sharing.registry.db.utils.DBConstants; import org.apache.airavata.sharing.registry.db.utils.JPAUtils; import org.apache.airavata.sharing.registry.models.*; -import org.apache.airavata.sharing.registry.service.cpi.GovRegistryService; +import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; import java.lang.reflect.Field; import java.util.*; -public class SharingRegistryServerHandler implements GovRegistryService.Iface{ +public class SharingRegistryServerHandler implements SharingRegistryService.Iface{ private final static Logger logger = LoggerFactory.getLogger(SharingRegistryServerHandler.class); public static String GLOBAL_PERMISSION_NAME = "OWNER"; http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml b/modules/sharing-registry/sharing-registry-stubs/pom.xml index 56e8eb4..ce39e03 100644 --- a/modules/sharing-registry/sharing-registry-stubs/pom.xml +++ b/modules/sharing-registry/sharing-registry-stubs/pom.xml @@ -31,8 +31,26 @@ 1.8 + + com.google.code.maven-replacer-plugin + replacer + ${maven.replacer.plugin.version} + + + generate-sources + + replace + + + + + + ${basedir}/src/main/java/org/apache/airavata/**/*.java + + , date = ".*" + + + - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java index 238ee80..4604f02 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java @@ -6,35 +6,18 @@ */ package org.apache.airavata.sharing.registry.models; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; - import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; + import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.*; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class Domain implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Domain"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java index 35748f7..215960f 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class Entity implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Entity"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java index 535260c..ca34bd1 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/EntityType.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class EntityType implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EntityType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java index 032cfe7..9386b5e 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class GroupMembership implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GroupMembership"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java index ddb006c..21097c2 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/PermissionType.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class PermissionType implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PermissionType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java index 4e2e6e3..94b952d 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SearchCriteria.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class SearchCriteria implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SearchCriteria"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java index b525a99..b871d3c 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Sharing.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class Sharing implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Sharing"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java index 9784111..546f5ee 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/SharingRegistryException.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class SharingRegistryException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SharingRegistryException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java index f076336..5ae3e73 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/User.java @@ -18,7 +18,7 @@ import java.nio.ByteBuffer; import java.util.*; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class User implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User"); http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java index fc77feb..b004939 100644 --- a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java +++ b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/UserGroup.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-13") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") public class UserGroup implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserGroup");