You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/04/05 19:11:10 UTC
[46/50] [abbrv] airavata git commit: Commit to user-profile after
resolving merge conflicts with develop
Commit to user-profile after resolving merge conflicts with develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5946869f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5946869f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5946869f
Branch: refs/heads/develop
Commit: 5946869fde286fd5444ed289cf1f01e1b418eedc
Parents: b156320 db00041
Author: Gourav Shenoy <sh...@gmail.com>
Authored: Wed Apr 5 12:56:43 2017 -0400
Committer: Gourav Shenoy <sh...@gmail.com>
Committed: Wed Apr 5 12:56:43 2017 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 25 +-
.../security/KeyCloakSecurityManager.java | 281 +
.../airavata/compute_resource_model_types.cpp | 8 +-
.../lib/airavata/compute_resource_model_types.h | 3 +-
.../Model/AppCatalog/ComputeResource/Types.php | 2 +
.../model/appcatalog/computeresource/ttypes.py | 3 +
.../computeresource/ResourceJobManagerType.java | 9 +-
.../application/io/InputDataObjectType.java | 2 +-
dev-tools/ansible/.gitignore | 2 +
dev-tools/ansible/README.md | 9 +-
dev-tools/ansible/airavata.yml | 39 +
dev-tools/ansible/ansible.cfg | 2 +
dev-tools/ansible/group_vars/.gitignore | 1 -
dev-tools/ansible/group_vars/all.yml | 91 -
dev-tools/ansible/group_vars/dev-airavata.yml | 2 -
dev-tools/ansible/group_vars/dev-pga.yml | 3 -
dev-tools/ansible/group_vars/local.yml.template | 4 -
dev-tools/ansible/hosts | 35 -
.../inventories/develop/group_vars/.gitignore | 1 +
.../inventories/develop/group_vars/all.yml | 94 +
.../develop/group_vars/dev-airavata.yml | 2 +
.../inventories/develop/group_vars/dev-pga.yml | 3 +
.../develop/group_vars/local.yml.template | 4 +
dev-tools/ansible/inventories/develop/hosts | 35 +
.../geogateway-dev/group_vars/pga/vars.yml | 33 +
.../geogateway-dev/group_vars/pga/vault.yml | 18 +
.../ansible/inventories/geogateway-dev/hosts | 2 +
.../testing-0.17-scigap/group_vars/all/vars.yml | 91 +
.../group_vars/all/vault.yml | 7 +
.../testing-0.17-scigap/group_vars/pga/vars.yml | 32 +
.../group_vars/pga/vault.yml | 18 +
.../inventories/testing-0.17-scigap/hosts | 23 +
.../group_vars/all/vars.yml | 91 +
.../group_vars/all/vault.yml | 7 +
.../group_vars/pga/vars.yml | 32 +
.../group_vars/pga/vault.yml | 18 +
.../inventories/testing-0.17-testdrive/hosts | 23 +
.../inventories/testing-0.17/files/airavata.jks | 76 +
.../testing-0.17/files/airavata_sym.jks | 30 +
.../testing-0.17/group_vars/all/vars.yml | 90 +
.../testing-0.17/group_vars/all/vault.yml | 7 +
.../testing-0.17/group_vars/pga/vars.yml | 31 +
.../testing-0.17/group_vars/pga/vault.yml | 18 +
.../ansible/inventories/testing-0.17/hosts | 23 +
dev-tools/ansible/pga.yml | 8 +
.../ansible/roles/api-orch/defaults/main.yml | 1 +
.../templates/airavata-server.properties.j2 | 18 +-
.../ansible/roles/common/defaults/main.yml | 3 +
dev-tools/ansible/roles/common/tasks/main.yml | 12 +-
.../database/files/MariaDB_yum_CentOS_7.repo | 7 +
dev-tools/ansible/roles/database/tasks/main.yml | 13 +-
dev-tools/ansible/roles/database/vars/main.yml | 6 +-
.../ansible/roles/env_setup/tasks/main.yml | 10 +-
.../templates/airavata-server.properties.j2 | 6 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 38 +
dev-tools/ansible/roles/pga/handlers/main.yml | 4 +-
.../roles/pga/tasks/install_deps_CentOS_7.yml | 33 +
.../roles/pga/tasks/install_deps_Ubuntu_14.yml | 48 +
.../roles/pga/tasks/install_deps_Ubuntu_16.yml | 61 +
dev-tools/ansible/roles/pga/tasks/main.yml | 87 +-
.../ansible/roles/pga/templates/httpd.conf.j2 | 353 -
.../roles/pga/templates/pga-vhost.conf.j2 | 11 +
.../roles/pga/templates/pga_config.php.j2 | 8 +
dev-tools/ansible/roles/pga/vars/main.yml | 30 -
.../apache/airavata/common/utils/Constants.java | 2 +
.../airavata/common/utils/ServerSettings.java | 9 +
.../main/resources/airavata-server.properties | 5 +
.../src/main/resources/client_truststore.jks | Bin 2423 -> 3740 bytes
.../server/src/main/resources/gfac-config.yaml | 6 +
.../store/store/impl/db/CredentialsDAO.java | 2 +-
.../gfac/core/context/ProcessContext.java | 49 +-
.../gfac/core/monitor/JobStatusResult.java | 9 +
.../org/apache/airavata/gfac/impl/SSHUtils.java | 13 +-
.../job/AiravataCustomCommandOutputParser.java | 59 +
.../gfac/impl/task/SCPDataStageTask.java | 2 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 110 +-
.../email/parser/AiravataCustomMailParser.java | 80 +
.../monitor/email/parser/LSFEmailParser.java | 1 -
.../catalog/impl/UsrResourceProfileImpl.java | 4 +-
.../model/UserComputeResourcePreference.java | 6 +-
.../model/UserComputeResourcePreferencePK.java | 24 +-
.../catalog/model/UserStoragePreference.java | 6 +-
.../catalog/model/UserStoragePreferencePK.java | 22 +-
.../UserComputeHostPreferenceResource.java | 10 +-
.../UserStoragePreferenceResource.java | 14 +-
.../catalog/impl/ExperimentRegistry.java | 10 +-
.../catalog/impl/ProjectRegistry.java | 44 +-
.../main/resources/workflowcatalog-mysql.sql | 3 +-
.../registry/cpi/CompositeIdentifier.java | 12 +-
.../service/handler/RegistryServerHandler.java | 2 +-
.../DeltaScripts/appCatalog_schema_delta.sql | 64 +
.../credentialStore_schema_delta.sql | 17 +
.../DeltaScripts/expCatalog_schema_delta.sql | 34 +
.../replicaCatalog_schema_delta.sql | 12 +
.../DeltaScripts/workFlow_schema_delta.sql | 11 +
.../0.16-0.17/migration-notes.md | 10 +
.../migrator/airavata/AiravataDataMigrator.java | 30 +-
.../registry/db/entities/EntityEntity.java | 12 +-
.../db/repositories/EntityRepository.java | 10 +-
.../db/repositories/SharingRepository.java | 11 +
.../sharing/registry/db/utils/DBConstants.java | 1 +
.../server/SharingRegistryServerHandler.java | 145 +-
.../main/resources/sharing-registry-derby.sql | 1 +
.../main/resources/sharing-registry-mysql.sql | 1 +
.../registry/SharingRegistryServiceTest.java | 30 +-
.../sharing/registry/models/Entity.java | 242 +-
.../registry/models/EntitySearchField.java | 6 +-
.../registry/models/SearchCondition.java | 4 +-
.../service/cpi/SharingRegistryService.java | 19546 +++++++++++------
.../sharing-service-docs/api-docs/index.html | 6 +
.../api-docs/sharing_cpi.html | 35 +
.../api-docs/sharing_models.html | 40 +-
.../thrift_models/sharing_cpi.thrift | 24 +
.../thrift_models/sharing_models.thrift | 16 +-
sandbox/job-status-rest-server/README.MD | 9 +
sandbox/job-status-rest-server/api_test.py | 6 +
sandbox/job-status-rest-server/app.py | 50 +
.../compute_resource_model.thrift | 3 +-
118 files changed, 15427 insertions(+), 7540 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5946869f/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5946869f/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5946869f/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5946869f/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
diff --cc modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index 2fc4acf,6bf6108..c3c7c18
--- 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
@@@ -914,9 -995,16 +1028,16 @@@ public class SharingRegistryServerHandl
sharingPK.setInheritedParentId(entityId);
sharingPK.setDomainId(domainId);
- (new SharingRepository()).delete(sharingPK);
+ sharingRepository.delete(sharingPK);
}
}
+
+ EntityPK entityPK = new EntityPK();
+ entityPK.setDomainId(domainId);
+ entityPK.setEntityId(entityId);
+ Entity entity = (new EntityRepository()).get(entityPK);
+ entity.setSharedCount((new SharingRepository()).getSharedCount(domainId, entityId));
+ (new EntityRepository()).update(entity);
return true;
}catch (SharingRegistryException ex) {
logger.error(ex.getMessage(), ex);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5946869f/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
----------------------------------------------------------------------
diff --cc modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
index 4e6af79,6233896..d933ec1
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
@@@ -101,8 -101,8 +101,9 @@@ CREATE TABLE ENTITY
DESCRIPTION VARCHAR(255),
BINARY_DATA BLOB,
FULL_TEXT VARCHAR(255),
+ SHARED_COUNT BIGINT DEFAULT 0,
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
+ SHARED BOOLEAN,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
http://git-wip-us.apache.org/repos/asf/airavata/blob/5946869f/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
----------------------------------------------------------------------
diff --cc modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
index 3fe9763,ed4112c..039b1ce
--- a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
+++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-mysql.sql
@@@ -101,8 -101,8 +101,9 @@@ CREATE TABLE ENTITY
DESCRIPTION VARCHAR(255),
BINARY_DATA BLOB,
FULL_TEXT TEXT,
+ SHARED_COUNT BIGINT DEFAULT 0,
ORIGINAL_ENTITY_CREATION_TIME BIGINT NOT NULL,
+ SHARED BOOL,
CREATED_TIME BIGINT NOT NULL,
UPDATED_TIME BIGINT NOT NULL,
PRIMARY KEY (ENTITY_ID, DOMAIN_ID),
http://git-wip-us.apache.org/repos/asf/airavata/blob/5946869f/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
----------------------------------------------------------------------
diff --cc modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
index dc485fb,d04a89e..54064ab
--- 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
@@@ -64,10 -64,10 +64,10 @@@ public class Entity implements org.apac
private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField BINARY_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("binaryData", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField FULL_TEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("fullText", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField ORIGINAL_ENTITY_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("originalEntityCreationTime", org.apache.thrift.protocol.TType.I64, (short)10);
- private static final org.apache.thrift.protocol.TField CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", org.apache.thrift.protocol.TType.I64, (short)11);
- private static final org.apache.thrift.protocol.TField UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", org.apache.thrift.protocol.TType.I64, (short)12);
- private static final org.apache.thrift.protocol.TField SHARED_FIELD_DESC = new org.apache.thrift.protocol.TField("shared", org.apache.thrift.protocol.TType.BOOL, (short) 13);
- private static final org.apache.thrift.protocol.TField SHARED_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedCount", org.apache.thrift.protocol.TType.I64, (short) 10);
- private static final org.apache.thrift.protocol.TField ORIGINAL_ENTITY_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("originalEntityCreationTime", org.apache.thrift.protocol.TType.I64, (short) 11);
++ private static final org.apache.thrift.protocol.TField SHARED_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedCount", org.apache.thrift.protocol.TType.I64, (short)10);
++ private static final org.apache.thrift.protocol.TField ORIGINAL_ENTITY_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("originalEntityCreationTime", org.apache.thrift.protocol.TType.I64, (short)11);
+ private static final org.apache.thrift.protocol.TField CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", org.apache.thrift.protocol.TType.I64, (short)12);
+ private static final org.apache.thrift.protocol.TField UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", org.apache.thrift.protocol.TType.I64, (short)13);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@@ -100,10 -100,10 +100,10 @@@
DESCRIPTION((short)7, "description"),
BINARY_DATA((short)8, "binaryData"),
FULL_TEXT((short)9, "fullText"),
- ORIGINAL_ENTITY_CREATION_TIME((short)10, "originalEntityCreationTime"),
- CREATED_TIME((short)11, "createdTime"),
- UPDATED_TIME((short) 12, "updatedTime"),
- SHARED((short) 13, "shared");
- SHARED_COUNT((short) 10, "sharedCount"),
- ORIGINAL_ENTITY_CREATION_TIME((short) 11, "originalEntityCreationTime"),
++ SHARED_COUNT((short)10, "sharedCount"),
++ ORIGINAL_ENTITY_CREATION_TIME((short)11, "originalEntityCreationTime"),
+ CREATED_TIME((short)12, "createdTime"),
+ UPDATED_TIME((short)13, "updatedTime");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@@ -184,12 -184,12 +184,12 @@@
}
// isset id assignments
- private static final int __ORIGINALENTITYCREATIONTIME_ISSET_ID = 0;
- private static final int __CREATEDTIME_ISSET_ID = 1;
- private static final int __UPDATEDTIME_ISSET_ID = 2;
- private static final int __SHARED_ISSET_ID = 3;
+ private static final int __SHAREDCOUNT_ISSET_ID = 0;
+ private static final int __ORIGINALENTITYCREATIONTIME_ISSET_ID = 1;
+ private static final int __CREATEDTIME_ISSET_ID = 2;
+ private static final int __UPDATEDTIME_ISSET_ID = 3;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.ENTITY_ID, _Fields.DOMAIN_ID, _Fields.ENTITY_TYPE_ID, _Fields.OWNER_ID, _Fields.PARENT_ENTITY_ID, _Fields.NAME, _Fields.DESCRIPTION, _Fields.BINARY_DATA, _Fields.FULL_TEXT, _Fields.ORIGINAL_ENTITY_CREATION_TIME, _Fields.CREATED_TIME, _Fields.UPDATED_TIME, _Fields.SHARED};
- private static final _Fields optionals[] = {_Fields.ENTITY_ID, _Fields.DOMAIN_ID, _Fields.ENTITY_TYPE_ID, _Fields.OWNER_ID, _Fields.PARENT_ENTITY_ID, _Fields.NAME, _Fields.DESCRIPTION, _Fields.BINARY_DATA, _Fields.FULL_TEXT, _Fields.SHARED_COUNT, _Fields.ORIGINAL_ENTITY_CREATION_TIME, _Fields.CREATED_TIME, _Fields.UPDATED_TIME};
++ private static final _Fields optionals[] = {_Fields.ENTITY_ID,_Fields.DOMAIN_ID,_Fields.ENTITY_TYPE_ID,_Fields.OWNER_ID,_Fields.PARENT_ENTITY_ID,_Fields.NAME,_Fields.DESCRIPTION,_Fields.BINARY_DATA,_Fields.FULL_TEXT,_Fields.SHARED_COUNT,_Fields.ORIGINAL_ENTITY_CREATION_TIME,_Fields.CREATED_TIME,_Fields.UPDATED_TIME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@@ -211,6 -211,8 +211,8 @@@
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.FULL_TEXT, new org.apache.thrift.meta_data.FieldMetaData("fullText", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.SHARED_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sharedCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
++ tmpMap.put(_Fields.SHARED_COUNT, new org.apache.thrift.meta_data.FieldMetaData("sharedCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
++ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.ORIGINAL_ENTITY_CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("originalEntityCreationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.CREATED_TIME, new org.apache.thrift.meta_data.FieldMetaData("createdTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@@ -517,6 -517,31 +517,29 @@@
}
}
+ public long getSharedCount() {
+ return this.sharedCount;
+ }
+
+ public Entity setSharedCount(long sharedCount) {
+ this.sharedCount = sharedCount;
+ setSharedCountIsSet(true);
+ return this;
+ }
+
+ public void unsetSharedCount() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID);
+ }
+
- /**
- * Returns true if field sharedCount is set (has been assigned a value) and false otherwise
- */
++ /** Returns true if field sharedCount is set (has been assigned a value) and false otherwise */
+ public boolean isSetSharedCount() {
+ return EncodingUtils.testBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID);
+ }
+
+ public void setSharedCountIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SHAREDCOUNT_ISSET_ID, value);
+ }
+
public long getOriginalEntityCreationTime() {
return this.originalEntityCreationTime;
}
@@@ -685,7 -685,15 +683,15 @@@
}
break;
- case SHARED_COUNT:
++ case SHARED_COUNT:
+ if (value == null) {
+ unsetSharedCount();
+ } else {
+ setSharedCount((Long)value);
+ }
- break;
++ break;
+
- case ORIGINAL_ENTITY_CREATION_TIME:
+ case ORIGINAL_ENTITY_CREATION_TIME:
if (value == null) {
unsetOriginalEntityCreationTime();
} else {
@@@ -749,8 -749,11 +747,11 @@@
case FULL_TEXT:
return getFullText();
+ case SHARED_COUNT:
+ return getSharedCount();
+
- case ORIGINAL_ENTITY_CREATION_TIME:
- return getOriginalEntityCreationTime();
+ case ORIGINAL_ENTITY_CREATION_TIME:
+ return getOriginalEntityCreationTime();
case CREATED_TIME:
return getCreatedTime();
@@@ -790,8 -790,10 +788,10 @@@
return isSetBinaryData();
case FULL_TEXT:
return isSetFullText();
+ case SHARED_COUNT:
+ return isSetSharedCount();
- case ORIGINAL_ENTITY_CREATION_TIME:
- return isSetOriginalEntityCreationTime();
+ case ORIGINAL_ENTITY_CREATION_TIME:
+ return isSetOriginalEntityCreationTime();
case CREATED_TIME:
return isSetCreatedTime();
case UPDATED_TIME:
http://git-wip-us.apache.org/repos/asf/airavata/blob/5946869f/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
----------------------------------------------------------------------
diff --cc modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
index 8ce70b8,b7e0c46..7a8af00
--- a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
+++ b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
@@@ -70,6 -70,7 +70,7 @@@ considered as a group in it's own righ
<li>OWNER_ID : Owner of the entity</li>
<li>CREATED_TIME : Created time of the entity</li>
<li>UPDATED_TIME : Updated time of the entity</li>
- <li>SHARED_COUNT : Number of directly shared users and groups</li>
++<li>SHARED_COUNT : Number of directly shared users and groups</li>
<br/><br/><table class="table-bordered table-striped table-condensed">
<tr><td><code>NAME</code></td><td><code>0</code></td><td>
@@@ -88,20 -89,26 +89,18 @@@
</td></tr>
<tr><td><code>UPDATED_TIME</code></td><td><code>7</code></td><td>
</td></tr>
-- <tr>
-- <td><code>ENTITY_TYPE_ID</code></td>
-- <td><code>8</code></td>
- <td>
- </td>
- </tr>
- <tr>
- <td><code>SHARED_COUNT</code></td>
- <td><code>9</code></td>
-- <td>
-- </td>
-- </tr>
++<tr><td><code>ENTITY_TYPE_ID</code></td><td><code>8</code></td><td>
++</td></tr>
++<tr><td><code>SHARED_COUNT</code></td><td><code>9</code></td><td>
++</td></tr>
</table></div>
<div class="definition"><h3 id="Enum_SearchCondition">Enumeration: SearchCondition</h3>
<p>Different search operators that can be used with the entity search fields</p>
-- <li>EQUAL : Simply matches for equality. Applicable for name, and parent entity id</li>
++<li>EQUAL : Simply matches for equality. Applicable for name, and parent entity id</li>
<li>LIKE : Check for the condition %$FIELD% condition. Applicable for name, and description</li>
<li>FULL_TEXT : Does a full text search. Only applicable for the FULL_TEXT field.</li>
- <li>GTE : Greater than or equal. Only applicable for created time and updated time.</li>
- <li>LTE : Less than or equal. Only applicable for created time and updated time.</li>
- <li>GTE : Greater than or equal. Only applicable for created time, updated time and shared count.</li>
- <li>LTE : Less than or equal. Only applicable for created time, updated time and shared count.</li>
++<li>GTE : Greater than or equal. Only applicable for created time, updated time and shared count.</li>
++<li>LTE : Less than or equal. Only applicable for created time, updated time and shared count.</li>
<br/><br/><table class="table-bordered table-striped table-condensed">
<tr><td><code>EQUAL</code></td><td><code>0</code></td><td>
@@@ -114,12 -121,12 +113,8 @@@
</td></tr>
<tr><td><code>LTE</code></td><td><code>4</code></td><td>
</td></tr>
-- <tr>
-- <td><code>NOT</code></td>
-- <td><code>5</code></td>
-- <td>
-- </td>
-- </tr>
++<tr><td><code>NOT</code></td><td><code>5</code></td><td>
++</td></tr>
</table></div>
<div class="definition"><h3 id="Enum_SharingType">Enumeration: SharingType</h3>
<p>This is an internal enum type for managing sharings</p>
@@@ -241,17 -248,38 +236,10 @@@ regarding the user.</p
<tr><td>7</td><td>description</td><td><code>string</code></td><td></td><td>optional</td><td></td></tr>
<tr><td>8</td><td>binaryData</td><td><code>binary</code></td><td></td><td>optional</td><td></td></tr>
<tr><td>9</td><td>fullText</td><td><code>string</code></td><td></td><td>optional</td><td></td></tr>
- <tr><td>10</td><td>originalEntityCreationTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
- <tr><td>11</td><td>createdTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
- <tr><td>12</td><td>updatedTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
- <tr>
- <td>10</td>
- <td>sharedCount</td>
- <td><code>i64</code></td>
- <td></td>
- <td>optional</td>
- <td><code>0</code></td>
- </tr>
- <tr>
- <td>11</td>
- <td>originalEntityCreationTime</td>
- <td><code>i64</code></td>
- <td></td>
- <td>optional</td>
- <td></td>
- </tr>
- <tr>
- <td>12</td>
- <td>createdTime</td>
- <td><code>i64</code></td>
- <td></td>
- <td>optional</td>
- <td></td>
- </tr>
-- <tr>
-- <td>13</td>
- <td>shared</td>
- <td><code>bool</code></td>
- <td>updatedTime</td>
- <td><code>i64</code></td>
-- <td></td>
-- <td>optional</td>
- <td><code>false</code></td>
- <td></td>
-- </tr>
++<tr><td>10</td><td>sharedCount</td><td><code>i64</code></td><td></td><td>optional</td><td><code>0</code></td></tr>
++<tr><td>11</td><td>originalEntityCreationTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
++<tr><td>12</td><td>createdTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
++<tr><td>13</td><td>updatedTime</td><td><code>i64</code></td><td></td><td>optional</td><td></td></tr>
</table><br/><p>Entity object which is used to register an entity in the system.</p>
<li><b>entityId</b> : Entity id provided by the client</li>
<li><b>domainId</b> : Domain id</li>