Merge pull request #36 from plapadoo/t/MH-12538-remove-acl-distributi…

…on-service-and-woh MH-12538 Remove obsolete ACL distribution service and WOH distribute-acl
opencast · Jan 31, 2018 · c410f6b · c410f6b
2 parents 7e20259 + fa41829
commit c410f6b
Show file tree

Hide file tree

Showing 21 changed files with 1 addition and 1,610 deletions.
diff --git a/assemblies/karaf-features/src/main/feature/feature.xml b/assemblies/karaf-features/src/main/feature/feature.xml
@@ -173,7 +173,6 @@
     <bundle start-level="82">mvn:org.opencastproject/opencast-dataloader/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-dictionary-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-dictionary-regexp/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-acl/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3-api/${project.version}</bundle>
@@ -293,7 +292,6 @@
     <bundle start-level="82">mvn:org.opencastproject/opencast-cover-image-remote/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-cover-image-workflowoperation/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-dataloader/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-acl/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3-remote/${project.version}</bundle>
@@ -396,7 +394,6 @@
     <bundle start-level="82">mvn:org.opencastproject/opencast-cover-image-remote/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-cover-image-workflowoperation/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-dataloader/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-acl/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3/${project.version}</bundle>
@@ -575,7 +572,6 @@
     <bundle start-level="82">mvn:org.opencastproject/opencast-dataloader/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-dictionary-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-dictionary-regexp/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-acl/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3-remote/${project.version}</bundle>
@@ -660,7 +656,6 @@
 
     <bundle start-level="82">mvn:org.opencastproject/opencast-annotation-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-annotation-impl/${project.version}</bundle>
-    <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-acl/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3-api/${project.version}</bundle>
     <bundle start-level="82">mvn:org.opencastproject/opencast-distribution-service-aws-s3/${project.version}</bundle>

diff --git a/docs/guides/admin/docs/configuration/load.md b/docs/guides/admin/docs/configuration/load.md
@@ -59,7 +59,6 @@ is running.  The current files with relevant configuration keys are:
 |------------------------------------------------------------------------------------------|------------------------------------|
 | org.opencastproject.caption.impl.CaptionServiceImpl.cfg                                  | Caption convertion services        |
 | org.opencastproject.composer.impl.ComposerServiceImpl.cfg                                | Caption embedding services         |
-| org.opencastproject.distribution.acl.AclDistributionService.cfg                          | ACL file distribution              |
 | org.opencastproject.distribution.distribution.streaming.StreamingDistributionService.cfg | Streaming distribution             |
 | org.opencastproject.distribution.download.DownloadDistributionServiceImpl.cfg            | Download distribution              |
 | org.opencastproject.execute.impl.ExecuteServiceImpl.cfg                                  | Execute service                    |

diff --git a/etc/org.opencastproject.distribution.acl.AclDistributionService.cfg b/etc/org.opencastproject.distribution.acl.AclDistributionService.cfg
diff --git a/modules/distribution-service-acl-remote/pom.xml b/modules/distribution-service-acl-remote/pom.xml
diff --git a/...in/java/org/opencastproject/distribution/acl/remote/ACLDistributionServiceRemoteImpl.java b/...in/java/org/opencastproject/distribution/acl/remote/ACLDistributionServiceRemoteImpl.java
diff --git a/...s/distribution-service-acl-remote/src/main/resources/OSGI-INF/distribution-remote-acl.xml b/...s/distribution-service-acl-remote/src/main/resources/OSGI-INF/distribution-remote-acl.xml
diff --git a/modules/distribution-service-acl/pom.xml b/modules/distribution-service-acl/pom.xml