PT-3381: REST API for family permissions.

- Created the entity-access-rules-rest module, and moved the relevant code.
phenotips · Oct 16, 2017 · 400438b · 400438b
1 parent 2cc6749
commit 400438b
Show file tree

Hide file tree

Showing 27 changed files with 6 additions and 6 deletions.
diff --git a/components/entity-access-rules/pom.xml b/components/entity-access-rules/pom.xml
@@ -31,5 +31,6 @@
 
   <modules>
     <module>api</module>
+    <module>rest</module>
   </modules>
 </project>
diff --git a/components/patient-access-rules/rest/pom.xml → components/entity-access-rules/rest/pom.xml b/components/patient-access-rules/rest/pom.xml → components/entity-access-rules/rest/pom.xml
@@ -22,11 +22,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.phenotips</groupId>
-    <artifactId>patient-access-rules</artifactId>
+    <artifactId>entity-access-rules</artifactId>
     <version>1.4-SNAPSHOT</version>
   </parent>
-  <artifactId>patient-access-rules-rest</artifactId>
-  <name>PhenoTips - Patient access rules - REST services</name>
+  <artifactId>entity-access-rules-rest</artifactId>
+  <name>PhenoTips - Entity access rules - REST services</name>
 
   <properties>
     <!-- Fixme. Coverage. -->

diff --git a/...ermissions/rest/CollaboratorResource.java → ...ermissions/rest/CollaboratorResource.java b/...ermissions/rest/CollaboratorResource.java → ...ermissions/rest/CollaboratorResource.java
diff --git a/...rmissions/rest/CollaboratorsResource.java → ...rmissions/rest/CollaboratorsResource.java b/...rmissions/rest/CollaboratorsResource.java → ...rmissions/rest/CollaboratorsResource.java
diff --git a/...permissions/rest/DomainObjectFactory.java → ...permissions/rest/DomainObjectFactory.java b/...permissions/rest/DomainObjectFactory.java → ...permissions/rest/DomainObjectFactory.java
diff --git a/.../data/permissions/rest/OwnerResource.java → .../data/permissions/rest/OwnerResource.java b/.../data/permissions/rest/OwnerResource.java → .../data/permissions/rest/OwnerResource.java
diff --git a/...permissions/rest/PermissionsResource.java → ...permissions/rest/PermissionsResource.java b/...permissions/rest/PermissionsResource.java → ...permissions/rest/PermissionsResource.java
diff --git a/...sions/rest/VisibilityOptionsResource.java → ...sions/rest/VisibilityOptionsResource.java b/...sions/rest/VisibilityOptionsResource.java → ...sions/rest/VisibilityOptionsResource.java
diff --git a/.../permissions/rest/VisibilityResource.java → .../permissions/rest/VisibilityResource.java b/.../permissions/rest/VisibilityResource.java → .../permissions/rest/VisibilityResource.java
diff --git a/...rnal/DefaultCollaboratorResourceImpl.java → ...rnal/DefaultCollaboratorResourceImpl.java b/...rnal/DefaultCollaboratorResourceImpl.java → ...rnal/DefaultCollaboratorResourceImpl.java
diff --git a/...nal/DefaultCollaboratorsResourceImpl.java → ...nal/DefaultCollaboratorsResourceImpl.java b/...nal/DefaultCollaboratorsResourceImpl.java → ...nal/DefaultCollaboratorsResourceImpl.java
diff --git a/.../internal/DefaultDomainObjectFactory.java → .../internal/DefaultDomainObjectFactory.java b/.../internal/DefaultDomainObjectFactory.java → .../internal/DefaultDomainObjectFactory.java
diff --git a/...st/internal/DefaultOwnerResourceImpl.java → ...st/internal/DefaultOwnerResourceImpl.java b/...st/internal/DefaultOwnerResourceImpl.java → ...st/internal/DefaultOwnerResourceImpl.java
diff --git a/...ernal/DefaultPermissionsResourceImpl.java → ...ernal/DefaultPermissionsResourceImpl.java b/...ernal/DefaultPermissionsResourceImpl.java → ...ernal/DefaultPermissionsResourceImpl.java
diff --git a/...DefaultVisibilityOptionsResourceImpl.java → ...DefaultVisibilityOptionsResourceImpl.java b/...DefaultVisibilityOptionsResourceImpl.java → ...DefaultVisibilityOptionsResourceImpl.java
diff --git a/...ternal/DefaultVisibilityResourceImpl.java → ...ternal/DefaultVisibilityResourceImpl.java b/...ternal/DefaultVisibilityResourceImpl.java → ...ternal/DefaultVisibilityResourceImpl.java
diff --git a/.../rest/internal/NameAndEmailExtractor.java → .../rest/internal/NameAndEmailExtractor.java b/.../rest/internal/NameAndEmailExtractor.java → .../rest/internal/NameAndEmailExtractor.java
diff --git a/...al/utils/DefaultSecureContextFactory.java → ...al/utils/DefaultSecureContextFactory.java b/...al/utils/DefaultSecureContextFactory.java → ...al/utils/DefaultSecureContextFactory.java
diff --git a/.../internal/utils/PatientAccessContext.java → .../internal/utils/PatientAccessContext.java b/.../internal/utils/PatientAccessContext.java → .../internal/utils/PatientAccessContext.java
diff --git a/.../internal/utils/SecureContextFactory.java → .../internal/utils/SecureContextFactory.java b/.../internal/utils/SecureContextFactory.java → .../internal/utils/SecureContextFactory.java
diff --git a/...rc/main/resources/META-INF/components.txt → ...rc/main/resources/META-INF/components.txt b/...rc/main/resources/META-INF/components.txt → ...rc/main/resources/META-INF/components.txt
diff --git a/...main/resources/permissions.rest.model.xsd → ...main/resources/permissions.rest.model.xsd b/...main/resources/permissions.rest.model.xsd → ...main/resources/permissions.rest.model.xsd
diff --git a/components/entity-access-rules/rest/src/main/resources/rest-permissions.cat b/components/entity-access-rules/rest/src/main/resources/rest-permissions.cat
@@ -0,0 +1 @@
+REWRITE_SYSTEM "https://phenotips.org/permissions.rest.model.xsd" "maven:org.phenotips:entity-access-rules-rest:jar::!/permissions.rest.model.xsd"
diff --git a/...-rules/rest/src/main/resources/simple.xjb → ...-rules/rest/src/main/resources/simple.xjb b/...-rules/rest/src/main/resources/simple.xjb → ...-rules/rest/src/main/resources/simple.xjb
diff --git a/components/patient-access-rules/pom.xml b/components/patient-access-rules/pom.xml
@@ -33,6 +33,5 @@
     <module>api</module>
     <module>migrations</module>
     <module>ui</module>
-    <module>rest</module>
   </modules>
 </project>
diff --git a/components/patient-access-rules/rest/src/main/resources/rest-permissions.cat b/components/patient-access-rules/rest/src/main/resources/rest-permissions.cat
diff --git a/distribution/war/pom.xml b/distribution/war/pom.xml
@@ -697,7 +697,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>patient-access-rules-rest</artifactId>
+      <artifactId>entity-access-rules-rest</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>