diff options
author | donald.g.dunne | 2016-02-02 19:36:25 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2016-02-02 19:36:25 +0000 |
commit | 5b6c03dbcca90cc78accc97a4f0b6bd73696e0b6 (patch) | |
tree | b26b9b2af999bfcf02bab582fc6421435d91e92d /plugins/org.eclipse.osee.framework.access | |
parent | 2844b0f3e488ec05e6e8eaaa92dee1ddae3c8896 (diff) | |
download | org.eclipse.osee-5b6c03dbcca90cc78accc97a4f0b6bd73696e0b6.tar.gz org.eclipse.osee-5b6c03dbcca90cc78accc97a4f0b6bd73696e0b6.tar.xz org.eclipse.osee-5b6c03dbcca90cc78accc97a4f0b6bd73696e0b6.zip |
feature[ats_ATS194178]: Replace Access type BranchAccessControlModified
Change-Id: I5f84e118cbb1a38d96d83a3b77d9909456781715
Diffstat (limited to 'plugins/org.eclipse.osee.framework.access')
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.artifact.topic.handler.xml b/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.artifact.topic.handler.xml index 0ebc0475822..17351d7417a 100644 --- a/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.artifact.topic.handler.xml +++ b/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.artifact.topic.handler.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true"> <implementation class="org.eclipse.osee.framework.access.internal.AccessArtifactTopicEventHandler"/> <service> <provide interface="org.osgi.service.event.EventHandler"/> diff --git a/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.branch.topic.handler.xml b/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.branch.topic.handler.xml index f1cef7381b5..04bb640f595 100644 --- a/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.branch.topic.handler.xml +++ b/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.branch.topic.handler.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true"> <implementation class="org.eclipse.osee.framework.access.internal.AccessBranchTopicEventHandler"/> <service> <provide interface="org.osgi.service.event.EventHandler"/> diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java index 7dd4b303315..5ab517e4051 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java @@ -74,8 +74,8 @@ import org.eclipse.osee.framework.skynet.core.event.listener.EventQosType; import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListener; import org.eclipse.osee.framework.skynet.core.event.model.AccessControlEvent; import org.eclipse.osee.framework.skynet.core.event.model.AccessControlEventType; -import org.eclipse.osee.framework.skynet.core.event.model.AccessTopicEventType; import org.eclipse.osee.framework.skynet.core.event.model.AccessTopicEventPayload; +import org.eclipse.osee.framework.skynet.core.event.model.AccessTopicEventType; import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent; import org.eclipse.osee.framework.skynet.core.event.model.Sender; import org.eclipse.osee.framework.skynet.core.utility.DbUtil; @@ -661,6 +661,7 @@ public class AccessControlService implements IAccessControlService { int subjectId = data.getSubject().getArtId(); AccessObject accessControlledObject = data.getObject(); + boolean isArtifact = accessControlledObject instanceof ArtifactAccessObject; if (removeFromDb) { accessControlledObject.removeFromDatabase(subjectId); } @@ -672,9 +673,10 @@ public class AccessControlService implements IAccessControlService { AccessTopicEventPayload event = new AccessTopicEventPayload(); event.setBranchUuid(accessControlledObject.getBranchId()); - if (accessControlledObject instanceof ArtifactAccessObject) { + if (isArtifact) { event.addArtifact(((ArtifactAccessObject) accessControlledObject).getArtId()); } + OseeEventManager.kickAccessTopicEvent(this, event, AccessTopicEventType.ACCESS_ARTIFACT_MODIFIED); } @@ -772,11 +774,9 @@ public class AccessControlService implements IAccessControlService { getJdbcClient().runPreparedUpdate(DELETE_BRANCH_ACL_FROM_BRANCH, theBranch.getUuid()); try { - if (eventService != null) { - AccessControlEvent event = new AccessControlEvent(); - event.setEventType(AccessControlEventType.BranchAccessControlModified); - eventService.send(this, event); - } + AccessTopicEventPayload event = new AccessTopicEventPayload(); + event.setBranchUuid(branch.getUuid()); + OseeEventManager.kickAccessTopicEvent(this, event, AccessTopicEventType.ACCESS_BRANCH_MODIFIED); } catch (Exception ex) { OseeLog.log(AccessControlHelper.class, Level.SEVERE, ex); } |