Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java40
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/OpenInAtsLoopbackCmd.java2
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch5
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbPopulate.launch4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java4
-rw-r--r--plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java6
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java31
-rw-r--r--plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.define/plugin.xml7
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/AddEveryoneGroupToBranches.java53
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java2
-rw-r--r--plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/PermissionTest.java28
-rw-r--r--plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.framework.access/build.properties3
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlData.java10
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java98
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/IAccessProvider.java1
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java (renamed from plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlService.java)152
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessProviderVisitor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/Activator.java70
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java48
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java12
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/PermissionList.java44
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/AccessData.java (renamed from plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessData.java)3
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IAccessControlService.java22
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/OseeServiceTrackerId.java1
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/PermissionEnum.java21
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/InternalLifecycleTestSuite.java3
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/OnEditOperationTest.java59
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/AnotherMockLifecycePoint.java9
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/MockAccessCheckPorovider.java18
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/OnEditOperation.java26
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/IAccessCheckProvider.java (renamed from plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/IAccessCheckProvider.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/AccessManagerChkPoint.java42
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/AccessManagerHandler.java62
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/internal/Activator.java (renamed from plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/Activator.java)4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlData.java152
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java753
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessObject.java44
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/ArtifactAccessObject.java95
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/BranchAccessObject.java80
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/NoPoliciesException.java24
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/PermissionList.java44
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java96
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java66
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionAccessHandler.java (renamed from plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/SkynetTransactionAccessHandler.java)22
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionCheckPoint.java (renamed from plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtChkPoint.java)14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionHandler.java (renamed from plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtHandler.java)43
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java13
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/AbstractEditorHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/EditDispositionAction.java2
-rw-r--r--plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenInArtifactEditor.java2
122 files changed, 673 insertions, 1857 deletions
diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
index 6892e5ca9c..f40f9f8f1f 100644
--- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF
@@ -68,6 +68,7 @@ Export-Package: org.eclipse.osee.ats,
org.eclipse.osee.ats.world.search
Import-Package: javax.mail,
javax.mail.internet,
+ org.eclipse.osee.framework.access,
org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.client.server,
org.eclipse.osee.framework.core.data,
@@ -82,4 +83,4 @@ Import-Package: javax.mail,
org.eclipse.osee.framework.logging,
org.eclipse.osee.framework.ui.swt,
org.eclipse.osee.framework.ui.ws
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ndle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
index 3ee46b3c2a..a12c7d875b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
@@ -42,6 +42,7 @@ import org.eclipse.osee.ats.workflow.AtsWorkPage;
import org.eclipse.osee.ats.workflow.item.AtsStatePercentCompleteWeightRule;
import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
import org.eclipse.osee.ats.world.IWorldViewArtifact;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -58,7 +59,6 @@ import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -241,7 +241,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
/**
* Override to apply different algorithm to current section expansion.
- *
+ *
* @param page
* @return true if section should be expanded
* @throws OseeCoreException
@@ -572,12 +572,16 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
}
public double getEstimatedHoursFromTasks(String relatedToState) throws OseeCoreException {
- if (!(this instanceof TaskableStateMachineArtifact)) return 0;
+ if (!(this instanceof TaskableStateMachineArtifact)) {
+ return 0;
+ }
return ((TaskableStateMachineArtifact) this).getEstimatedHoursFromTasks(relatedToState);
}
public double getEstimatedHoursFromTasks() throws OseeCoreException {
- if (!(this instanceof TaskableStateMachineArtifact)) return 0;
+ if (!(this instanceof TaskableStateMachineArtifact)) {
+ return 0;
+ }
return ((TaskableStateMachineArtifact) this).getEstimatedHoursFromTasks();
}
@@ -636,7 +640,9 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
}
public double getRemainFromTasks() throws OseeCoreException {
- if (!(this instanceof TaskableStateMachineArtifact)) return 0;
+ if (!(this instanceof TaskableStateMachineArtifact)) {
+ return 0;
+ }
return ((TaskableStateMachineArtifact) this).getRemainHoursFromTasks();
}
@@ -772,7 +778,9 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
}
public String getWorldViewNumberOfTasks() throws OseeCoreException {
- if (!(this instanceof TaskableStateMachineArtifact)) return "";
+ if (!(this instanceof TaskableStateMachineArtifact)) {
+ return "";
+ }
int num = ((TaskableStateMachineArtifact) this).getTaskArtifacts().size();
if (num == 0) {
return "";
@@ -794,7 +802,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
/**
* Return true if this artifact, it's ATS relations and any of the other side artifacts are dirty
- *
+ *
* @return true if any object in SMA tree is dirty
*/
public Result isSMAEditorDirty() {
@@ -862,7 +870,9 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
}
if (getParentSMA() != null) {
Date parentDate = getParentSMA().getWorldViewEstimatedCompletionDate();
- if (parentDate != null) return parentDate;
+ if (parentDate != null) {
+ return parentDate;
+ }
}
date = getWorldViewEstimatedReleaseDate();
if (date != null) {
@@ -897,7 +907,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
/**
* Called at the end of a transition just before transaction manager persist. SMAs can override to perform tasks due
* to transition.
- *
+ *
* @throws Exception
*/
public void transitioned(WorkPageDefinition fromPage, WorkPageDefinition toPage, Collection<User> toAssignees, boolean persist, SkynetTransaction transaction) throws OseeCoreException {
@@ -1030,7 +1040,9 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
* Return hours spent working ONLY on tasks related to stateName
*/
public double getHoursSpentSMAStateTasks(String stateName) throws OseeCoreException {
- if (!(this instanceof TaskableStateMachineArtifact)) return 0;
+ if (!(this instanceof TaskableStateMachineArtifact)) {
+ return 0;
+ }
return ((TaskableStateMachineArtifact) this).getHoursSpentFromTasks(stateName);
}
@@ -1078,7 +1090,9 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
* Return Percent Complete ONLY on tasks related to stateName. Total Percent / # Tasks
*/
public int getPercentCompleteSMAStateTasks(String stateName) throws OseeCoreException {
- if (!(this instanceof TaskableStateMachineArtifact)) return 0;
+ if (!(this instanceof TaskableStateMachineArtifact)) {
+ return 0;
+ }
return ((TaskableStateMachineArtifact) this).getPercentCompleteFromTasks(stateName);
}
@@ -1389,7 +1403,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
/**
* Return true if sma is TeamWorkflowArtifact and it's TeamDefinitionArtifact has rule set
- *
+ *
* @param ruleId
* @return if has rule
* @throws OseeCoreException
@@ -1595,7 +1609,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
}
public boolean isTargetedVersionable() throws OseeCoreException {
- if (!(isTeamWorkflow())) {
+ if (!isTeamWorkflow()) {
return false;
}
return ((TeamWorkFlowArtifact) this).getTeamDefinition().getTeamDefinitionHoldingVersions() != null && ((TeamWorkFlowArtifact) this).getTeamDefinition().getTeamDefinitionHoldingVersions().isTeamUsesVersions();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java
index 79351a6cc3..d623e5c35b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsWorkflowRenderer.java
@@ -15,8 +15,8 @@ import java.util.List;
import org.eclipse.osee.ats.AtsImage;
import org.eclipse.osee.ats.AtsOpenOption;
import org.eclipse.osee.ats.util.AtsUtil;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
import org.eclipse.osee.framework.ui.skynet.render.DefaultArtifactRenderer;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
index 5fc92fd390..458789333a 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
@@ -39,6 +39,7 @@ import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.widgets.ReviewManager;
import org.eclipse.osee.ats.world.AtsMetricsComposite;
import org.eclipse.osee.ats.world.IAtsMetricsProvider;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -47,7 +48,6 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/OpenInAtsLoopbackCmd.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/OpenInAtsLoopbackCmd.java
index 0a78baea48..dcd2dcf1a1 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/OpenInAtsLoopbackCmd.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/OpenInAtsLoopbackCmd.java
@@ -14,12 +14,12 @@ import java.net.HttpURLConnection;
import java.util.Map;
import java.util.logging.Level;
import org.eclipse.osee.ats.AtsOpenOption;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.client.server.HttpResponse;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.jdk.core.type.MutableBoolean;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.httpRequests.BaseArtifactLoopbackCmd;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch
index 685aa0541d..30a6789666 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch
+++ b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch
@@ -35,10 +35,11 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.apache.commons.lang*2.4.0.v201005080502@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jdt.doc.isv@default:default,org.apache.batik.util.gui@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.pde.core@default:default,org.apache.xerces@default:default,org.eclipse.equinox.p2.core@default:default,javax.xml@default:default,org.eclipse.emf.ecore@default:default,org.apache.jasper@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jface@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt@default:default,org.aopalliance@default:default,org.w3c.css.sac@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.log4j@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.rcp@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.pde.build@default:default,org.eclipse.birt.chart.device.svg@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.equinox.ds@default:true,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.help.base@default:default,org.eclipse.core.runtime.compatibility@default:default,org.mortbay.jetty.server@default:default,org.apache.batik.dom.svg@default:default,org.eclipse.draw2d@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.apache.batik.parser@default:default,com.google.collect@default:default,org.w3c.dom.smil@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.emf.mwe2.language@default:default,org.eclipse.core.databinding@default:default,org.apache.batik.bridge@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.team.svn.core@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ant.optional.junit@default:false,org.eclipse.core.resources.compatibility@default:false,javax.wsdl@default:default,org.eclipse.birt.chart.engine@default:default,org.w3c.dom.svg@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.security@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.ui.win32@default:false,org.eclipse.team.ui@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.equinox.app@default:default,org.eclipse.xtext.common.types@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.antlr.gen@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.pde@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.team.cvs.ssh@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.debug.ui@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.osgi@-1:true,org.apache.batik.dom@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.publisher@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.help.appserver@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.birt.chart.device.swt@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.ui.intro@default:default,org.apache.batik.pdf@default:default,org.objectweb.asm@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.variables@default:default,org.apache.commons.el@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.apache.commons.lang*2.3.0.v200803061910@default:default,org.eclipse.ui.forms@default:default,org.eclipse.osgi.util@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.emf.mwe.core@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.net@default:default,org.eclipse.ant.core@default:default,com.jcraft.jsch@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.ide@default:default,org.eclipse.xtend@default:default,org.eclipse.core.expressions@default:default,org.eclipse.text@default:default,org.eclipse.equinox.common@2:true,org.eclipse.gef@default:default,org.eclipse.core.commands@default:default,org.eclipse.compare@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.emf.compare@default:default,org.eclipse.team.core@default:default,org.eclipse.help@default:default,org.sat4j.pb@default:default,org.eclipse.zest.core@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.jface.text@default:default,org.eclipse.emf.codegen@default:default,org.apache.xml.resolver@default:default,org.eclipse.pde.ui@default:default,org.apache.batik.transcoder@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.browser@default:default,org.eclipse.birt.chart.device.extension@default:default,org.eclipse.search@default:default,org.eclipse.cvs@default:default,org.apache.batik.css@default:default,javax.mail.glassfish@default:default,org.eclipse.xtext@default:default,org.eclipse.jdt.debug@default:default,org.junit4@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.lucene@default:default,org.eclipse.sdk@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.team.svn.ui@default:default,org.apache.commons.httpclient@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.swt@default:default,org.eclipse.zest.layouts@default:default,com.google.inject@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.boot@default:default,javax.servlet.jsp@default:default,javax.activation@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt.doc.user@default:default,org.eclipse.team.svn@default:default,org.hamcrest.core@default:default,org.eclipse.emf.codegen.ecore@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.xtext.logging@default:false,org.eclipse.equinox.p2.ui@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.apache.batik.svggen@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.console@default:default,org.apache.commons.cli@default:default,com.lowagie.text@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.xtext.util@default:default,org.apache.batik.util@default:default,org.junit@default:default,com.ibm.icu@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.platform@default:default,org.apache.ant@default:default,org.antlr.runtime@default:default,org.mozilla.rhino@default:default,org.eclipse.compare.win32@default:default,org.eclipse.ui.navigator@default:default,org.apache.commons.net@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.osgi.services@default:default,org.apache.oro@default:default,org.eclipse.ui.cheatsheets@default:default,org.apache.batik.ext.awt@default:default,org.eclipse.birt.core@default:default,org.apache.batik.xml@default:default,org.eclipse.help.ui@default:default,org.eclipse.xtext.generator@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.coverage@default:default,net.jini@default:default,org.eclipse.osee.support.test.util@default:default,jms.libraries@default:default,org.eclipse.osee.framework.types.tests@default:false,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.types.ui@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.types.edit@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.types@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.types.bridge@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.types.generator@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.skynet.core.test@default:false"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.codegen.ecore@default:default,com.google.collect@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.cvs@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.pde.api.tools@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,com.google.inject@default:default,org.eclipse.equinox.security@default:default,org.apache.batik.parser@default:default,org.eclipse.debug.core@default:default,javax.xml@default:default,org.eclipse.birt.chart.device.svg@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.resources.win32.x86@default:false,org.apache.xml.resolver@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.pde@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.sat4j.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.common@2:true,org.apache.batik.bridge@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.zest.core@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.compare@default:default,com.jcraft.jsch@default:default,org.eclipse.pde.core@default:default,org.eclipse.ant.core@default:default,org.apache.batik.util.gui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.generator@default:default,org.w3c.dom.smil@default:default,org.eclipse.swt@default:default,org.eclipse.draw2d@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.compare.ui@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.cli@default:default,org.apache.lucene@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.ui.console@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ant.launching@default:default,org.apache.xml.serializer@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.rcp@default:default,org.eclipse.ui.ide@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.hamcrest.core@default:default,org.apache.batik.css@default:default,org.eclipse.gef@default:default,org.junit4@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.osgi@-1:true,org.eclipse.update.core@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.search@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.team.ui@default:default,org.apache.batik.ext.awt@default:default,org.eclipse.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jdt.core@default:default,org.apache.oro@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.team.svn@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.doc.user@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.apache.commons.httpclient@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.xtext@default:default,org.eclipse.team.cvs.core@default:default,org.apache.ant@default:default,org.sat4j.pb@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.equinox.p2.ui@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.platform@default:default,org.eclipse.core.filesystem@default:default,org.apache.batik.transcoder@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.util@default:default,org.eclipse.xtext.util@default:default,org.eclipse.ecf@default:default,org.eclipse.pde.launching@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.jdt.junit.core@default:default,org.eclipse.pde.doc.user@default:default,javax.wsdl@default:default,org.apache.batik.dom.svg@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.help.webapp@default:default,org.apache.batik.util@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.appserver@default:default,org.apache.lucene.analysis@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.emf.edit@default:default,org.eclipse.birt.chart.device.extension@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui.views.log@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.compare.win32@default:default,org.eclipse.ui.externaltools@default:default,de.itemis.xtext.antlr@default:default,javax.servlet@default:default,org.apache.commons.codec@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.ecf.filetransfer@default:default,javax.mail.glassfish@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.emf.ecore@default:default,org.mozilla.rhino@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.editors@default:default,org.eclipse.birt.core@default:default,org.eclipse.text@default:default,org.eclipse.pde.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.win32@default:false,org.eclipse.emf.edit.ui@default:default,org.w3c.dom.svg@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.batik.dom@default:default,org.eclipse.update.ui@default:default,com.ibm.icu@default:default,org.eclipse.help.base@default:default,org.apache.batik.svggen@default:default,org.eclipse.core.boot@default:default,org.eclipse.xpand@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.compare.core@default:default,org.eclipse.birt.chart.device.swt@default:default,org.eclipse.xtext.builder@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.jasper@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.team.svn.core@default:default,org.apache.batik.xml@default:default,javax.activation@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.core.runtime@default:true,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.ant.ui@default:default,org.eclipse.core.resources@default:default,org.eclipse.team.core@default:default,org.w3c.css.sac@default:default,org.apache.batik.pdf@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.pde.build@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.team.cvs.ssh2@default:default,org.objectweb.asm@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.help.ui@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.team.svn.ui@default:default,org.apache.commons.lang@default:default,org.apache.xerces@default:default,org.apache.commons.net@default:default,org.eclipse.jdt@default:default,org.antlr.gen@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.help@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.browser@default:default,org.aopalliance@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.emf.mwe2.launch@default:default,com.lowagie.text@default:default,org.eclipse.core.externaltools@default:default,org.apache.log4j@default:default,org.eclipse.ui.workbench@default:default,org.antlr.runtime@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jdt.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.types.generator@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.types.edit@default:default,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.support.test.util@default:default,jms.libraries@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.types@default:default,org.eclipse.osee.framework.core@default:default,org.postgresql.driver@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.types.ui@default:default,org.eclipse.osee.framework.types.tests@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.messaging.event.skynet@default:default,net.jini@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.types.bridge@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.ui.swt@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="true"/>
diff --git a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbPopulate.launch b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbPopulate.launch
index 2a04647c65..61fa736c53 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbPopulate.launch
+++ b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbPopulate.launch
@@ -35,8 +35,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.nebula.widgets.calendarcombo@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.team.cvs.ui@default:default,org.apache.commons.lang*2.4.0.v201005080502@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ui.win32@default:false,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.editors@default:default,org.eclipse.emf.codegen@default:default,org.apache.lucene@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.ide@default:default,org.eclipse.birt.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.jsch.core@default:default,org.apache.batik.svggen@default:default,org.eclipse.emf.ecore.xmi@default:default,org.polarion.eclipse.team.svn.connector@default:default,javax.activation@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.rcp@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.common@2:true,org.eclipse.team.cvs.ssh@default:default,org.eclipse.update.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.xtext.common.types@default:default,org.apache.commons.lang*2.3.0.v200803061910@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.update.scheduler@default:default,org.apache.batik.dom.svg@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.batik.transcoder@default:default,org.apache.xerces@default:default,org.apache.log4j@default:default,org.eclipse.update.core@default:default,org.apache.batik.pdf@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.team.svn@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.ant.optional.junit@default:false,org.eclipse.pde.core@default:default,org.eclipse.help.appserver@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.compare@default:default,org.eclipse.debug.core@default:default,org.eclipse.emf.ecore.editor@default:default,org.aopalliance@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.birt.chart.device.swt@default:default,com.google.collect@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.browser@default:default,org.eclipse.emf.edit@default:default,org.apache.batik.ext.awt@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.gef@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.draw2d@default:default,org.eclipse.search@default:default,org.eclipse.update.core.win32@default:false,javax.mail.glassfish@default:default,org.eclipse.birt.chart.device.svg@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.security@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.osgi@-1:true,org.apache.commons.cli@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.pde.build@default:default,org.eclipse.sdk@default:default,org.eclipse.emf.mwe.utils@default:default,org.sat4j.core@default:default,javax.wsdl@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.xtext.builder@default:default,org.apache.batik.util.gui@default:default,org.eclipse.xtext.xtend@default:default,org.apache.batik.dom@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.forms@default:default,org.eclipse.jface.text@default:default,org.apache.batik.css@default:default,org.eclipse.text@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.cvs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,com.google.inject@default:default,org.eclipse.pde.ui@default:default,com.lowagie.text@default:default,org.eclipse.jdt@default:default,org.eclipse.core.expressions@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.platform@default:default,javax.servlet@default:default,org.junit4@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.osgi.util@default:default,org.eclipse.xtext@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.swt@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.ant.core@default:default,org.eclipse.xtend@default:default,javax.xml@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.platform.doc.user@default:default,org.apache.batik.parser@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jdt.junit.runtime@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.pde@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.help.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.birt.chart.device.extension@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.ui.console@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.databinding@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.common@default:default,org.eclipse.equinox.app@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.ds@1:true,org.apache.ant@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.intro.universal@default:default,org.objectweb.asm@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.emf.common.ui@default:default,org.antlr.runtime@default:default,org.eclipse.core.boot@default:default,org.eclipse.core.runtime@default:true,org.apache.batik.xml@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jsch.ui@default:default,org.apache.batik.bridge@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.ant.ui@default:default,org.w3c.dom.smil@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.antlr.gen@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.xtext.util@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.ui.net@default:default,org.eclipse.help@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.jdt.doc.user@default:default,org.w3c.dom.svg@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,javax.servlet.jsp@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ui.intro@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.help.webapp@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.core.variables@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.p2.touchpoint.natives@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.compare@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.mozilla.rhino@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.team.svn.ui@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.junit@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.xpand@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.xml.serializer@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.team.svn.core@default:default,org.w3c.css.sac@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.jobs@default:default,org.apache.jasper@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.zest.core@default:default,org.apache.xml.resolver@default:default,org.apache.batik.util@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.team.core@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jface@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.compare.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.help.base@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,jms.libraries@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.types.bridge@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.core.client@default:default,jms.activemq.launch@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.coverage.test@default:false,org.postgresql.driver@default:default,org.eclipse.osee.framework.types.tests@default:false,org.eclipse.osee.framework.types.ui@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.types@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,net.jini@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.core.message@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.codegen.ecore@default:default,com.google.collect@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.cvs@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.pde.api.tools@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,com.google.inject@default:default,org.eclipse.equinox.security@default:default,org.apache.batik.parser@default:default,org.eclipse.debug.core@default:default,javax.xml@default:default,org.eclipse.birt.chart.device.svg@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.resources.win32.x86@default:false,org.apache.xml.resolver@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.pde@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.sat4j.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.common@2:true,org.apache.batik.bridge@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.zest.core@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.compare@default:default,com.jcraft.jsch@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.pde.core@default:default,org.eclipse.ant.core@default:default,org.apache.batik.util.gui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.generator@default:default,org.w3c.dom.smil@default:default,org.eclipse.swt@default:default,org.eclipse.draw2d@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.compare.ui@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.cli@default:default,org.apache.lucene@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.ui.console@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ant.launching@default:default,org.apache.xml.serializer@default:default,org.eclipse.rcp@default:default,org.eclipse.ui.ide@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.hamcrest.core@default:default,org.apache.batik.css@default:default,org.eclipse.gef@default:default,org.junit4@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.osgi@-1:true,org.eclipse.update.core@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.search@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.team.ui@default:default,org.apache.batik.ext.awt@default:default,org.eclipse.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jdt.core@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.team.svn@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.forms@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.doc.user@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.apache.commons.httpclient@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.team.cvs.core@default:default,org.apache.ant@default:default,org.sat4j.pb@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.equinox.p2.ui@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.platform@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.launcher@default:default,org.apache.batik.transcoder@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.util@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.xtext.util@default:default,org.eclipse.ecf@default:default,org.eclipse.pde.launching@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.console@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.pde.doc.user@default:default,javax.wsdl@default:default,org.apache.batik.dom.svg@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.help.webapp@default:default,org.apache.batik.util@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.appserver@default:default,org.apache.lucene.analysis@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.emf.edit@default:default,org.eclipse.birt.chart.device.extension@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui.views.log@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.externaltools@default:default,de.itemis.xtext.antlr@default:default,javax.servlet@default:default,org.apache.commons.codec@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.ecf.filetransfer@default:default,javax.mail.glassfish@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.team.cvs.ui@default:default,org.mozilla.rhino@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.editors@default:default,org.eclipse.birt.core@default:default,org.eclipse.text@default:default,org.eclipse.pde.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.win32@default:false,org.eclipse.emf.edit.ui@default:default,org.w3c.dom.svg@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.batik.dom@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.update.ui@default:default,com.ibm.icu@default:default,org.eclipse.help.base@default:default,org.apache.batik.svggen@default:default,org.eclipse.core.boot@default:default,org.eclipse.xpand@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.compare.core@default:default,org.eclipse.birt.chart.device.swt@default:default,org.eclipse.xtext.builder@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.jasper@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.team.svn.core@default:default,org.apache.batik.xml@default:default,javax.activation@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.core.runtime@default:true,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.ant.ui@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.core.resources@default:default,org.eclipse.team.core@default:default,org.w3c.css.sac@default:default,org.apache.batik.pdf@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.pde.build@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.net@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.team.cvs.ssh2@default:default,org.objectweb.asm@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.help.ui@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.team.svn.ui@default:default,org.apache.commons.lang@default:default,org.apache.xerces@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.jdt@default:default,org.antlr.gen@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.help@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.browser@default:default,org.aopalliance@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.emf.mwe2.launch@default:default,com.lowagie.text@default:default,org.eclipse.core.externaltools@default:default,org.apache.log4j@default:default,org.eclipse.ui.workbench@default:default,org.antlr.runtime@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jdt.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.support.test.util@default:default,jms.libraries@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.types@default:default,org.eclipse.osee.framework.core@default:default,org.postgresql.driver@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.types.ui@default:default,org.eclipse.osee.framework.types.tests@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.messaging.event.skynet@default:default,net.jini@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.types.bridge@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.ui.service.control@default:default,jms.activemq.launch@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.ui.swt@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch
index b22f24aeba..2baed45e86 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch
+++ b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch
@@ -35,8 +35,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.apache.commons.lang*2.4.0.v201005080502@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jdt.doc.isv@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.pde.core@default:default,org.apache.xerces@default:default,org.eclipse.equinox.p2.core@default:default,javax.xml@default:default,org.eclipse.emf.ecore@default:default,org.apache.jasper@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jface@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt@default:default,org.aopalliance@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.log4j@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.rcp@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.pde.build@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.help.base@default:default,org.eclipse.core.runtime.compatibility@default:default,org.mortbay.jetty.server@default:default,org.eclipse.draw2d@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.mwe2.runtime@default:default,com.google.collect@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.emf.mwe2.language@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.team.svn.core@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ant.optional.junit@default:false,org.eclipse.core.resources.compatibility@default:false,org.eclipse.birt.chart.engine@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.security@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.ui.win32@default:false,org.eclipse.team.ui@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.equinox.app@default:default,org.eclipse.xtext.common.types@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.antlr.gen@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.pde@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.team.cvs.ssh@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.debug.ui@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.publisher@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.help.appserver@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.debug.core@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.variables@default:default,org.apache.commons.el@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.apache.commons.lang*2.3.0.v200803061910@default:default,org.eclipse.ui.forms@default:default,org.eclipse.osgi.util@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.emf.mwe.core@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.net@default:default,org.eclipse.ant.core@default:default,com.jcraft.jsch@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.ide@default:default,org.eclipse.xtend@default:default,org.eclipse.core.expressions@default:default,org.eclipse.text@default:default,org.eclipse.equinox.common@2:true,org.eclipse.gef@default:default,org.eclipse.core.commands@default:default,org.eclipse.compare@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.emf.compare@default:default,org.eclipse.team.core@default:default,org.eclipse.help@default:default,org.sat4j.pb@default:default,org.eclipse.zest.core@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.jface.text@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.apache.xml.resolver@default:default,org.eclipse.pde.ui@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.browser@default:default,org.eclipse.search@default:default,org.eclipse.cvs@default:default,javax.mail.glassfish@default:default,org.eclipse.xtext@default:default,org.eclipse.jdt.debug@default:default,org.junit4@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.lucene@default:default,org.eclipse.sdk@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.team.svn.ui@default:default,org.apache.commons.httpclient@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.swt@default:default,org.eclipse.zest.layouts@default:default,com.google.inject@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.boot@default:default,javax.servlet.jsp@default:default,javax.activation@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt.doc.user@default:default,org.eclipse.team.svn@default:default,org.hamcrest.core@default:default,org.eclipse.emf.codegen.ecore@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.equinox.p2.ui@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.http.registry@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.console@default:default,org.apache.commons.cli@default:default,com.lowagie.text@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.xtext.util@default:default,org.junit@default:default,com.ibm.icu@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.platform@default:default,org.apache.ant@default:default,org.antlr.runtime@default:default,org.mozilla.rhino@default:default,org.eclipse.ui.navigator@default:default,org.apache.commons.net@default:default,org.mortbay.jetty.util@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.ui@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.osgi.services@default:default,org.apache.oro@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.birt.core@default:default,org.eclipse.help.ui@default:default,org.eclipse.xtext.generator@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.support.test@default:default,net.jini@default:default,org.eclipse.osee.ote.message.test@default:false,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.demo.db.connection@default:default,jms.libraries@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.framework.types.tests@default:false,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.core.datastore.test@default:false,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.ote.client.msg@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.types@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.resource.management.servlet.test@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.resource.provider.attribute@default:default,jms.activemq.launch@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.skynet.core.test@default:false"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.codegen.ecore@default:default,com.google.collect@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.cvs@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,com.google.inject@default:default,org.eclipse.equinox.security@default:default,org.eclipse.debug.core@default:default,javax.xml@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.resources.win32.x86@default:false,org.apache.xml.resolver@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.pde@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.sat4j.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.zest.core@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.compare@default:default,com.jcraft.jsch@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.pde.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.swt@default:default,org.eclipse.draw2d@default:default,org.eclipse.emf.compare@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.cli@default:default,org.apache.lucene@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.ui.console@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ant.launching@default:default,org.apache.xml.serializer@default:default,org.eclipse.rcp@default:default,org.eclipse.ui.ide@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.hamcrest.core@default:default,org.eclipse.gef@default:default,org.junit4@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.osgi@-1:true,org.eclipse.update.core@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.search@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jdt.core@default:default,org.apache.oro@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.team.svn@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.doc.user@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.apache.commons.httpclient@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.team.cvs.core@default:default,org.apache.ant@default:default,org.sat4j.pb@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.equinox.p2.ui@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.platform@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.util@default:default,org.eclipse.xtext.util@default:default,org.eclipse.ecf@default:default,org.eclipse.pde.launching@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.console@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.help.webapp@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help.appserver@default:default,org.apache.lucene.analysis@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.emf.edit@default:default,org.eclipse.ui.views.log@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.externaltools@default:default,de.itemis.xtext.antlr@default:default,javax.servlet@default:default,org.apache.commons.codec@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.ecf.filetransfer@default:default,javax.mail.glassfish@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.team.cvs.ui@default:default,org.mozilla.rhino@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.editors@default:default,org.eclipse.birt.core@default:default,org.eclipse.text@default:default,org.eclipse.pde.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.win32@default:false,org.eclipse.emf.edit.ui@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.update.ui@default:default,com.ibm.icu@default:default,org.eclipse.help.base@default:default,org.eclipse.core.boot@default:default,org.eclipse.xpand@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.compare.core@default:default,org.eclipse.xtext.builder@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.jasper@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.team.svn.core@default:default,javax.activation@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.core.runtime@default:true,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.ant.ui@default:default,org.eclipse.core.resources@default:default,org.eclipse.team.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.pde.build@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.net@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.help.ui@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.team.svn.ui@default:default,org.apache.commons.lang@default:default,org.apache.xerces@default:default,org.apache.commons.net@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.jdt@default:default,org.antlr.gen@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.help@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.browser@default:default,org.aopalliance@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.emf.mwe2.launch@default:default,com.lowagie.text@default:default,org.eclipse.core.externaltools@default:default,org.apache.log4j@default:default,org.eclipse.ui.workbench@default:default,org.antlr.runtime@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jdt.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.ote.message.test@default:false,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,jms.libraries@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.types@default:default,org.eclipse.osee.framework.core@default:default,org.postgresql.driver@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.types.tests@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.messaging.event.skynet@default:default,net.jini@default:default,org.eclipse.osee.support.test@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.ui.service.control@default:default,jms.activemq.launch@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.ote.client.msg@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.ote.message@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java
index b7bd1786ad..38d9f8d4e5 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbTests.java
@@ -39,17 +39,17 @@ JdkCoreTestSuite.class, //
/**
* This suite should contain all cases and suites that can be run against a Demo Db Init and Demo Populated osee
* database.
- *
+ *
* @author Donald G. Dunne
*/
public class MasterTestSuite_DemoDbTests {
@BeforeClass
public static void setUp() throws Exception {
- assertTrue("Should be run on demo datbase.", TestUtil.isDemoDb());
assertTrue("Demo Application Server must be running.",
ClientSessionManager.getAuthenticationProtocols().contains("demo"));
assertTrue("Client must authenticate using demo protocol",
ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo"));
+ assertTrue("Should be run on demo database.", TestUtil.isDemoDb());
ArtifactSaveNotificationHandler.setNoPopUp(true);
TestUtil.setIsInTest(true);
}
diff --git a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
index b2a0f401cc..fc82b6e3bb 100644
--- a/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.coverage/META-INF/MANIFEST.MF
@@ -38,7 +38,7 @@ Import-Package: com.lowagie.text;version="2.1.7",
org.eclipse.osee.framework.core.operation,
org.eclipse.osee.framework.logging,
org.eclipse.osee.framework.skynet.core,
- org.eclipse.osee.framework.skynet.core.access,
+ org.eclipse.osee.framework.access,
org.eclipse.osee.framework.skynet.core.artifact,
org.eclipse.osee.framework.skynet.core.artifact.search,
org.eclipse.osee.framework.skynet.core.attribute,
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java
index 648e5b578f..ada7d0842d 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageRenderer.java
@@ -14,8 +14,8 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.osee.coverage.store.CoverageArtifactTypes;
import org.eclipse.osee.coverage.util.CoverageImage;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.render.DefaultArtifactRenderer;
import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java
index 8f57292676..1267f09d1e 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePreferences.java
@@ -5,13 +5,13 @@
*/
package org.eclipse.osee.coverage.model;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -60,7 +60,9 @@ public class CoveragePreferences {
* Return global CoverageOptions or null if none available
*/
public String getCoverageOptions() throws OseeCoreException {
- if (getArtifact() == null) return null;
+ if (getArtifact() == null) {
+ return null;
+ }
KeyValueArtifact keyValueArt =
new KeyValueArtifact(getArtifact(), CoreAttributeTypes.GENERAL_STRING_DATA.getName());
return keyValueArt.getValue("CoverageOptions");
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java
index 7ece2c49f5..c9bf618c84 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageOptionManagerStore.java
@@ -10,13 +10,13 @@ import org.eclipse.osee.coverage.internal.Activator;
import org.eclipse.osee.coverage.model.CoverageOptionManager;
import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
import org.eclipse.osee.coverage.model.CoveragePreferences;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.MultipleAttributesExist;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.ui.plugin.util.Result;
/**
@@ -39,7 +39,7 @@ public class CoverageOptionManagerStore {
CoverageAttributes.COVERAGE_OPTIONS.getStoreName(), null);
if (!Strings.isValid(coverageOptions)) {
coverageOptions =
- (new CoveragePreferences(oseeCoveragePackageStore.getArtifact(true).getBranch())).getCoverageOptions();
+ new CoveragePreferences(oseeCoveragePackageStore.getArtifact(true).getBranch()).getCoverageOptions();
}
return coverageOptions;
}
@@ -50,21 +50,21 @@ public class CoverageOptionManagerStore {
}
private String getGlobalCoverageOptions() throws OseeCoreException {
- return (new CoveragePreferences(oseeCoveragePackageStore.getArtifact(true).getBranch())).getCoverageOptions();
+ return new CoveragePreferences(oseeCoveragePackageStore.getArtifact(true).getBranch()).getCoverageOptions();
}
public Result isSaveable() throws OseeCoreException {
StoreLocation location = getStoreLocation();
- if (location == StoreLocation.None)
+ if (location == StoreLocation.None) {
return Result.TrueResult;
- else if (location == StoreLocation.Local) {
+ } else if (location == StoreLocation.Local) {
if (!AccessControlManager.hasPermission(oseeCoveragePackageStore.getArtifact(true), PermissionEnum.WRITE)) {
return new Result(String.format("You do not have permissions to change coverage options on [%s]",
oseeCoveragePackageStore.getArtifact(true)));
}
return Result.TrueResult;
} else if (location == StoreLocation.Global) {
- CoveragePreferences prefs = (new CoveragePreferences(oseeCoveragePackageStore.getArtifact(true).getBranch()));
+ CoveragePreferences prefs = new CoveragePreferences(oseeCoveragePackageStore.getArtifact(true).getBranch());
if (prefs.isSaveable().isFalse()) {
return new Result(String.format("You do not have permissions to change coverage options on [%s]",
oseeCoveragePackageStore.getArtifact(true)));
@@ -78,8 +78,12 @@ public class CoverageOptionManagerStore {
}
public StoreLocation getStoreLocation() throws OseeCoreException {
- if (Strings.isValid(getLocalCoverageOptions())) return StoreLocation.Local;
- if (Strings.isValid(getGlobalCoverageOptions())) return StoreLocation.Global;
+ if (Strings.isValid(getLocalCoverageOptions())) {
+ return StoreLocation.Local;
+ }
+ if (Strings.isValid(getGlobalCoverageOptions())) {
+ return StoreLocation.Global;
+ }
return StoreLocation.None;
}
@@ -92,8 +96,10 @@ public class CoverageOptionManagerStore {
}
public void store(CoverageOptionManager coverageOptionManager, StoreLocation storeLocation) throws OseeCoreException {
- if (storeLocation == StoreLocation.None) throw new OseeArgumentException(
- "No Valid Store Location selected for Coverage Options");
+ if (storeLocation == StoreLocation.None) {
+ throw new OseeArgumentException(
+ "No Valid Store Location selected for Coverage Options");
+ }
store(coverageOptionManager.toXml(), storeLocation);
}
@@ -103,9 +109,10 @@ public class CoverageOptionManagerStore {
CoverageAttributes.COVERAGE_OPTIONS.getStoreName(), coverageOptions);
oseeCoveragePackageStore.getArtifact(true).persist();
} else if (storeLocation == StoreLocation.Global) {
- (new CoveragePreferences(oseeCoveragePackageStore.getArtifact(true).getBranch())).setCoverageOptions(coverageOptions);
- } else
+ new CoveragePreferences(oseeCoveragePackageStore.getArtifact(true).getBranch()).setCoverageOptions(coverageOptions);
+ } else {
throw new OseeArgumentException("No Valid Store Location selected for Coverage Options");
+ }
}
}
diff --git a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
index c735dbfabf..af2c59e0f2 100644
--- a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
@@ -46,7 +46,7 @@ Import-Package: org.apache.commons.lang;version="2.4.0",
org.eclipse.osee.framework.core.model.type,
org.eclipse.osee.framework.logging,
org.eclipse.osee.framework.skynet.core,
- org.eclipse.osee.framework.skynet.core.access,
+ org.eclipse.osee.framework.access,
org.eclipse.osee.framework.skynet.core.artifact,
org.eclipse.osee.framework.skynet.core.artifact.search,
org.eclipse.osee.framework.skynet.core.attribute,
diff --git a/plugins/org.eclipse.osee.define/plugin.xml b/plugins/org.eclipse.osee.define/plugin.xml
index 4668bfd518..ec74352a1d 100644
--- a/plugins/org.eclipse.osee.define/plugin.xml
+++ b/plugins/org.eclipse.osee.define/plugin.xml
@@ -66,13 +66,6 @@
</perspectiveExtension>
</extension>
<extension
- id="AddEveryoneGroupToBranches"
- point="org.eclipse.osee.framework.ui.skynet.BlamOperation">
- <Operation
- className="org.eclipse.osee.define.blam.operation.AddEveryoneGroupToBranches">
- </Operation>
- </extension>
- <extension
id="org.eclipse.osee.ats"
name="OSEE"
point="org.eclipse.ui.views">
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/AddEveryoneGroupToBranches.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/AddEveryoneGroupToBranches.java
deleted file mode 100644
index c5dd5889c5..0000000000
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/AddEveryoneGroupToBranches.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.define.blam.operation;
-
-import java.util.Arrays;
-import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.enums.BranchArchivedState;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
-import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
-
-/**
- * @author Jeff C. Phillips
- */
-public class AddEveryoneGroupToBranches extends AbstractBlam {
-
- @Override
- public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {
- for (Branch brnch : BranchManager.getBranches(BranchArchivedState.UNARCHIVED, BranchType.WORKING,
- BranchType.BASELINE)) {
- if (!AccessControlManager.getAccessControlList(brnch).isEmpty()) {
- Artifact everyone =
- ArtifactQuery.getArtifactFromAttribute("Name", "Everyone", BranchManager.getCommonBranch());
- AccessControlManager.setPermission(everyone, brnch, PermissionEnum.READ);
- }
- }
- }
-
- @Override
- public String getName() {
- return "Add Everone Group to Branches";
- }
-
- @Override
- public Collection<String> getCategories() {
- return Arrays.asList("Define");
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
index 215c3010a2..7386cb8668 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
@@ -18,10 +18,10 @@ import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemFolder;
diff --git a/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/PermissionTest.java b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/PermissionTest.java
new file mode 100644
index 0000000000..1ceb17a6b2
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.access.test/src/org/eclipse/osee/framework/access/test/internal/PermissionTest.java
@@ -0,0 +1,28 @@
+/*
+ * Created on Jun 29, 2010
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.framework.access.test.internal;
+
+import org.eclipse.osee.framework.core.enums.PermissionEnum;
+
+public class PermissionTest {
+
+ public void main(String[] args) {
+ PermissionEnum[] a = {PermissionEnum.DENY, PermissionEnum.FULLACCESS, null};
+ PermissionEnum[] b = {PermissionEnum.LOCK, PermissionEnum.FULLACCESS, null};
+ for (int i = 0; i < 3; i++) {
+ for (int j = 0; j < 3; j++) {
+ PermissionEnum branchPermission = a[i];
+ PermissionEnum userPermission = b[j];
+ if (branchPermission == PermissionEnum.DENY || userPermission == null) {
+ System.out.print("T");
+ } else {
+ System.out.print("F");
+ }
+ }
+ System.out.println();
+ }
+ }
+}
diff --git a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF
index da269deb49..3b65c6d3c6 100644
--- a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF
@@ -11,9 +11,11 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.core.model,
+ org.eclipse.osee.framework.core.model.cache,
org.eclipse.osee.framework.core.model.event,
org.eclipse.osee.framework.core.model.type,
org.eclipse.osee.framework.core.operation,
+ org.eclipse.osee.framework.core.services,
org.eclipse.osee.framework.core.util,
org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.jdk.core.type,
@@ -24,3 +26,4 @@ Import-Package: org.eclipse.core.runtime,
Bundle-ActivationPolicy: lazy
Eclipse-ExtensibleAPI: true
Export-Package: org.eclipse.osee.framework.access
+Require-Bundle: org.eclipse.osee.framework.skynet.core;bundle-version="0.9.5"
diff --git a/plugins/org.eclipse.osee.framework.access/build.properties b/plugins/org.eclipse.osee.framework.access/build.properties
index 41eb6ade2b..a65755cb2a 100644
--- a/plugins/org.eclipse.osee.framework.access/build.properties
+++ b/plugins/org.eclipse.osee.framework.access/build.properties
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ OSGI-INF/
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlData.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlData.java
index 7f2886d7be..c0d22665f4 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlData.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlData.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
* A data object in an access control list. Contains a subject (user artifact) and object (what the subject is trying to
* access) and a permission level
- *
+ *
* @author Jeff C. Phillips
*/
public class AccessControlData implements Comparable<AccessControlData> {
@@ -104,14 +104,6 @@ public class AccessControlData implements Comparable<AccessControlData> {
return birth;
}
- public void persist() {
- AccessControlService.persistPermission(this, false);
- }
-
- public void persist(boolean recurse) {
- AccessControlService.persistPermission(this, recurse);
- }
-
public int compareTo(AccessControlData data) {
return subject.getName().compareTo(data.subject.getName());
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java
new file mode 100644
index 0000000000..82c6eba7f6
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.osee.framework.access;
+
+import java.util.Collection;
+import org.eclipse.osee.framework.access.internal.AccessControlService;
+import org.eclipse.osee.framework.access.internal.Activator;
+import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+
+/**
+ * Provides access control for OSEE. <REM2>
+ *
+ * @author Jeff C. Phillips
+ */
+
+public class AccessControlManager {
+
+ private AccessControlManager() {
+ }
+
+ private static AccessControlService getService() {
+ return Activator.getAccessControlService();
+ }
+
+ public static void removeAccessControlDataIf(boolean removeFromDb, AccessControlData data) throws OseeDataStoreException {
+ getService().removeAccessControlDataIf(removeFromDb, data);
+ }
+
+ public static boolean checkObjectListPermission(Collection<?> objectList, PermissionEnum permission) throws OseeCoreException {
+ return getService().checkObjectListPermission(objectList, permission);
+ }
+
+ public static boolean hasPermission(Object object, PermissionEnum permission) throws OseeCoreException {
+ return getService().hasPermission(object, permission);
+ }
+
+ public static void setPermission(Artifact subject, Object object, PermissionEnum permission) {
+ getService().setPermission(subject, object, permission);
+ }
+
+ public static void lockObjects(Collection<Artifact> objects, Artifact subject) {
+ getService().lockObjects(objects, subject);
+ }
+
+ public static void unLockObjects(Collection<Artifact> objects, Artifact subject) throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ getService().unLockObjects(objects, subject);
+ }
+
+ public static boolean hasLock(Artifact object) {
+ return getService().hasLock(object);
+ }
+
+ public static boolean canUnlockObject(Artifact object, Artifact subject) {
+ return getService().canUnlockObject(object, subject);
+ }
+
+ public static Artifact getSubjectFromLockedObject(Object object) throws OseeCoreException {
+ return getService().getSubjectFromLockedObject(object);
+ }
+
+ public static boolean hasLockAccess(Artifact object) {
+ return getService().hasLockAccess(object);
+ }
+
+ public static boolean isOseeAdmin() throws OseeCoreException {
+ return getService().isOseeAdmin();
+ }
+
+ public static Collection<AccessControlData> getAccessControlList(Object object) {
+ return getService().getAccessControlList(object);
+ }
+
+ public static AccessObject getAccessObject(Object object) {
+ return getService().getAccessObject(object);
+ }
+
+ public static void persistPermission(AccessControlData data) {
+ getService().persistPermission(data);
+ }
+
+ public static void persistPermission(AccessControlData data, boolean isRecursionAllowed) {
+ getService().persistPermission(data, isRecursionAllowed);
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/IAccessProvider.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/IAccessProvider.java
index 1d93bda9aa..7496ae0e63 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/IAccessProvider.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/IAccessProvider.java
@@ -7,6 +7,7 @@ package org.eclipse.osee.framework.access;
import java.util.Collection;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AccessData;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.lifecycle.LifecycleHandler;
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
index b429f374f7..2bd3c8849d 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlService.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
@@ -9,7 +9,7 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.access;
+package org.eclipse.osee.framework.access.internal;
import java.util.Collection;
import java.util.HashMap;
@@ -22,10 +22,11 @@ import java.util.logging.Level;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.framework.access.internal.AccessProviderVisitor;
-import org.eclipse.osee.framework.access.internal.Activator;
+import org.eclipse.osee.framework.access.AccessControlData;
+import org.eclipse.osee.framework.access.AccessObject;
import org.eclipse.osee.framework.access.internal.data.ArtifactAccessObject;
import org.eclipse.osee.framework.access.internal.data.BranchAccessObject;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
@@ -34,22 +35,28 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.model.AccessData;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
+import org.eclipse.osee.framework.core.model.cache.ArtifactTypeCache;
+import org.eclipse.osee.framework.core.model.cache.BranchCache;
+import org.eclipse.osee.framework.core.model.cache.RelationTypeCache;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
+import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.core.services.IAccessControlService;
+import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.lifecycle.AbstractLifecycleVisitor;
import org.eclipse.osee.framework.lifecycle.ILifecycleService;
import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.SystemGroup;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.event.AccessControlEventType;
@@ -63,7 +70,7 @@ import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
-import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
+import org.eclipse.osee.framework.skynet.core.event2.filter.IEventFilter;
import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;
import org.osgi.framework.Bundle;
import org.osgi.util.tracker.ServiceTracker;
@@ -74,7 +81,7 @@ import org.osgi.util.tracker.ServiceTracker;
* @author Jeff C. Phillips
*/
-public class AccessControlService {
+public class AccessControlService implements IAccessControlService {
private static final String ACCESS_POINT_ID = "osee.access.point";
private final String INSERT_INTO_ARTIFACT_ACL =
@@ -94,18 +101,10 @@ public class AccessControlService {
private final String DELETE_ARTIFACT_ACL_FROM_BRANCH = "DELETE FROM OSEE_ARTIFACT_ACL WHERE branch_id =?";
private final String DELETE_BRANCH_ACL_FROM_BRANCH = "DELETE FROM OSEE_BRANCH_ACL WHERE branch_id =?";
+
private final String USER_GROUP_MEMBERS =
"SELECT b_art_id FROM osee_relation_link WHERE a_art_id =? AND rel_link_type_id =? ORDER BY b_art_id";
- public enum ObjectTypeEnum {
- ALL,
- BRANCH,
- REL_TYPE,
- ART_TYPE,
- ATTR_TYPE,
- ART;
- }
-
private DoubleKeyHashMap<Integer, AccessObject, PermissionEnum> accessControlListCache;
private HashCollection<AccessObject, Integer> objectToSubjectCache; // <subjectId, groupId>
private HashCollection<Integer, Integer> subjectToGroupCache; // <groupId, subjectId>
@@ -114,15 +113,25 @@ public class AccessControlService {
private Map<Integer, Integer> lockedObjectToSubject; // subject, permission
private HashCollection<Integer, PermissionEnum> subjectToPermissionCache;
- private static final AccessControlService instance = new AccessControlService();
+ private final IOseeCachingService cachingService;
- private AccessControlService() {
+ public AccessControlService(IOseeCachingService cachingService) {
+ super();
+ this.cachingService = cachingService;
reload();
OseeEventManager.addListener(new EventRelay());
}
- public static AccessControlService getInstance() {
- return instance;
+ private ArtifactTypeCache getArtifactTypeCache() {
+ return cachingService.getArtifactTypeCache();
+ }
+
+ private RelationTypeCache getRelationTypeCache() {
+ return cachingService.getRelationTypeCache();
+ }
+
+ private BranchCache getBranchCache() {
+ return cachingService.getBranchCache();
}
private synchronized void reload() {
@@ -163,8 +172,9 @@ public class AccessControlService {
accessControlListCache.put(subjectId, branchAccessObject, permission);
objectToSubjectCache.put(branchAccessObject, subjectId);
- ArtifactType toCheck = ArtifactTypeManager.getType("User Group");
- if (ArtifactTypeManager.getType(subjectArtifactTypeId).inheritsFrom(toCheck)) {
+ ArtifactType subjectArtifactType = getArtifactTypeCache().getById(subjectArtifactTypeId);
+ ArtifactType toCheck = getArtifactTypeCache().get(CoreArtifactTypes.UserGroup);
+ if (subjectArtifactType.inheritsFrom(toCheck)) {
populateGroupMembers(subjectId);
}
}
@@ -192,8 +202,9 @@ public class AccessControlService {
AccessObject accessObject = ArtifactAccessObject.getArtifactAccessObject(objectId, branchId);
cacheAccessObject(objectId, subjectId, permission, accessObject);
- ArtifactType toCheck = ArtifactTypeManager.getType("User Group");
- if (ArtifactTypeManager.getType(subjectArtifactTypeId).inheritsFrom(toCheck)) {
+ ArtifactType subjectArtifactType = getArtifactTypeCache().getById(subjectArtifactTypeId);
+ ArtifactType toCheck = getArtifactTypeCache().get(CoreArtifactTypes.UserGroup);
+ if (subjectArtifactType.inheritsFrom(toCheck)) {
populateGroupMembers(subjectId);
}
}
@@ -209,8 +220,8 @@ public class AccessControlService {
IOseeStatement chStmt = ConnectionHandler.getStatement();
try {
- chStmt.runPreparedQuery(USER_GROUP_MEMBERS, groupId,
- RelationTypeManager.getType(CoreRelationTypes.Users_User).getId());
+ RelationType relationType = getRelationTypeCache().get(CoreRelationTypes.Users_User);
+ chStmt.runPreparedQuery(USER_GROUP_MEMBERS, groupId, relationType.getId());
// get group members and populate subjectToGroupCache
while (chStmt.next()) {
@@ -265,11 +276,7 @@ public class AccessControlService {
return PermissionEnum.FULLACCESS;
}
- private boolean hasPermission(Artifact subject, Object object, PermissionEnum permission) throws OseeCoreException {
- // AccessData accessData = getAccessData(Artifact userArtifact, Collection<IBasicArtifact<?>> objectsToCheck);
- return false;
- }
-
+ //TODO Integrate HERE
public AccessData getAccessData(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> objectsToCheck) throws OseeCoreException {
ILifecycleService service = getLifecycleService();
AccessData accessData = new AccessData();
@@ -283,6 +290,41 @@ public class AccessControlService {
return accessData;
}
+ private boolean hasPermission(IBasicArtifact<?> subject, Object object, PermissionEnum permission) throws OseeCoreException {
+ //TODO Integrate HERE AccessData accessData = getAccessData(Artifact userArtifact, Collection<IBasicArtifact<?>> objectsToCheck);
+
+ PermissionEnum userPermission = null;
+ PermissionEnum branchPermission = null;
+ Branch branch = null;
+
+ if (object instanceof Artifact) {
+ Artifact artifact = (Artifact) object;
+ branch = artifact.getBranch();
+ userPermission = getArtifactPermission(subject, (Artifact) object, permission);
+ } else if (object instanceof Branch) {
+ branch = (Branch) object;
+ } else {
+ throw new IllegalStateException("Unhandled object type for access control - " + object);
+ }
+
+ branchPermission = getBranchPermission(subject, branch, permission);
+
+ if (branchPermission == PermissionEnum.DENY || userPermission == null) {
+ userPermission = branchPermission;
+ }
+
+ boolean hasPermission = false;
+ if (permission == PermissionEnum.READ && userPermission == PermissionEnum.LOCK) {
+ hasPermission = true;
+ } else if (userPermission == null || userPermission == PermissionEnum.LOCK) {
+ hasPermission = false;
+ } else {
+ hasPermission =
+ userPermission.getRank() >= permission.getRank() && !userPermission.equals(PermissionEnum.DENY);
+ }
+ return hasPermission;
+ }
+
private ILifecycleService getLifecycleService() throws OseeCoreException {
Bundle bundle = Platform.getBundle(Activator.PLUGIN_ID);
ServiceTracker tracker = new ServiceTracker(bundle.getBundleContext(), ILifecycleService.class.getName(), null);
@@ -296,7 +338,7 @@ public class AccessControlService {
}
}
- public PermissionEnum getBranchPermission(Artifact subject, Branch branch, PermissionEnum permission) {
+ public PermissionEnum getBranchPermission(IBasicArtifact<?> subject, Branch branch, PermissionEnum permission) {
PermissionEnum userPermission = null;
AccessObject accessObject = BranchAccessObject.getBranchAccessObjectFromCache(branch);
@@ -308,7 +350,7 @@ public class AccessControlService {
return userPermission;
}
- public PermissionEnum getArtifactPermission(Artifact subject, Artifact artifact, PermissionEnum permission) {
+ public PermissionEnum getArtifactPermission(IBasicArtifact<?> subject, Artifact artifact, PermissionEnum permission) {
PermissionEnum userPermission = null;
AccessObject accessObject = null;
@@ -339,7 +381,7 @@ public class AccessControlService {
return userPermission;
}
- private PermissionEnum acquirePermissionRank(Artifact subject, AccessObject accessObject, PermissionEnum permission) {
+ private PermissionEnum acquirePermissionRank(IBasicArtifact<?> subject, AccessObject accessObject, PermissionEnum permission) {
PermissionEnum userPermission = null;
int subjectId = subject.getArtId();
@@ -374,7 +416,7 @@ public class AccessControlService {
if (newAccessControlData || permission != accessControlListCache.get(subject.getArtId(), accessObject)) {
AccessControlData data = new AccessControlData(subject, accessObject, permission, newAccessControlData);
- data.persist();
+ persistPermission(data);
}
}
@@ -497,7 +539,7 @@ public class AccessControlService {
return datas;
}
- private PermissionEnum getBranchPermission(Artifact subject, Object object) throws OseeCoreException {
+ private PermissionEnum getBranchPermission(IBasicArtifact<?> subject, Object object) throws OseeCoreException {
int branchId = ((AccessObject) object).getId();
Branch branch = BranchManager.getBranch(branchId);
@@ -561,7 +603,8 @@ public class AccessControlService {
if (!objectToBranchLockCache.containsKey(objectArtId)) {
AccessObject accessObject = getAccessObject(object);
- new AccessControlData(subject, accessObject, PermissionEnum.LOCK, true).persist();
+ AccessControlData data = new AccessControlData(subject, accessObject, PermissionEnum.LOCK, true);
+ persistPermission(data);
objectToBranchLockCache.put(objectArtId, objectBranchId);
lockedObjectToSubject.put(objectArtId, subjectArtId);
event.getArtifacts().add(object.getBasicGuidArtifact());
@@ -604,9 +647,11 @@ public class AccessControlService {
}
}
- public void removeAllPermissionsFromBranch(OseeConnection connection, Branch branch) throws OseeCoreException {
- ConnectionHandler.runPreparedUpdate(connection, DELETE_ARTIFACT_ACL_FROM_BRANCH, branch.getId());
- ConnectionHandler.runPreparedUpdate(connection, DELETE_BRANCH_ACL_FROM_BRANCH, branch.getId());
+ @Override
+ public void removePermissions(IOseeBranch branch) throws OseeCoreException {
+ Branch theBranch = getBranchCache().get(branch);
+ ConnectionHandler.runPreparedUpdate(DELETE_ARTIFACT_ACL_FROM_BRANCH, theBranch.getId());
+ ConnectionHandler.runPreparedUpdate(DELETE_BRANCH_ACL_FROM_BRANCH, theBranch.getId());
}
public boolean hasLock(Artifact object) {
@@ -648,25 +693,8 @@ public class AccessControlService {
return hasAccess;
}
- // public boolean isOseeAdmin() throws OseeCoreException {
- // return SystemGroup.OseeAdmin.isCurrentUserMember();
- // }
-
- public void main(String[] args) {
- PermissionEnum[] a = {PermissionEnum.DENY, PermissionEnum.FULLACCESS, null};
- PermissionEnum[] b = {PermissionEnum.LOCK, PermissionEnum.FULLACCESS, null};
- for (int i = 0; i < 3; i++) {
- for (int j = 0; j < 3; j++) {
- PermissionEnum branchPermission = a[i];
- PermissionEnum userPermission = b[j];
- if (branchPermission == PermissionEnum.DENY || userPermission == null) {
- System.out.print("T");
- } else {
- System.out.print("F");
- }
- }
- System.out.println();
- }
+ public boolean isOseeAdmin() throws OseeCoreException {
+ return SystemGroup.OseeAdmin.isCurrentUserMember();
}
private final class EventRelay implements IBranchEventListener, IArtifactsPurgedEventListener, IArtifactEventListener {
@@ -729,6 +757,10 @@ public class AccessControlService {
}
}
}
- }
+ @Override
+ public List<? extends IEventFilter> getEventFilters() {
+ return null;
+ }
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessProviderVisitor.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessProviderVisitor.java
index 37ddae9677..68f7bb2a1c 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessProviderVisitor.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessProviderVisitor.java
@@ -14,9 +14,9 @@ import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.access.AccessData;
import org.eclipse.osee.framework.access.IAccessProvider;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AccessData;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.lifecycle.AbstractLifecycleVisitor;
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/Activator.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/Activator.java
index bd87952a25..3b6115a2c2 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/Activator.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/Activator.java
@@ -2,32 +2,77 @@ package org.eclipse.osee.framework.access.internal;
import java.util.Map;
import java.util.logging.Level;
-import org.eclipse.osee.framework.access.AccessControlService;
import org.eclipse.osee.framework.access.IAccessProvider;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.services.IAccessControlService;
+import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.core.util.AbstractTrackingHandler;
import org.eclipse.osee.framework.core.util.ServiceDependencyTracker;
import org.eclipse.osee.framework.lifecycle.ILifecycleService;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransactionCheckPoint;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransactionHandler;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
public class Activator implements BundleActivator {
public static final String PLUGIN_ID = "org.eclipse.osee.framework.access";
- private ServiceDependencyTracker tracker;
+ private static AccessControlServiceRegHandler handler;
+
+ private ServiceDependencyTracker tracker1;
+ private ServiceDependencyTracker tracker2;
public void start(BundleContext context) throws Exception {
- tracker = new ServiceDependencyTracker(context, new TrackingHandler());
- tracker.open();
+ handler = new AccessControlServiceRegHandler();
+ tracker1 = new ServiceDependencyTracker(context, handler);
+ tracker1.open();
+
+ tracker2 = new ServiceDependencyTracker(context, new TrackingHandler());
+ tracker2.open();
}
public void stop(BundleContext context) throws Exception {
- if (tracker != null) {
- tracker.close();
+ if (tracker1 != null) {
+ tracker1.close();
+ }
+ if (tracker2 != null) {
+ tracker2.close();
+ }
+ }
+
+ public static AccessControlService getAccessControlService() {
+ return handler.getService();
+ }
+
+ private static final class AccessControlServiceRegHandler extends AbstractTrackingHandler {
+
+ private static final Class<?>[] DEPENDENCIES = new Class[] {IOseeCachingService.class};
+
+ private AccessControlService accessService;
+ private ServiceRegistration serviceRegistration;;
+
+ public AccessControlService getService() {
+ return accessService;
+ }
+
+ @Override
+ public Class<?>[] getDependencies() {
+ return DEPENDENCIES;
+ }
+
+ @Override
+ public void onActivate(BundleContext context, Map<Class<?>, Object> services) {
+ IOseeCachingService service = (IOseeCachingService) services.get(ILifecycleService.class);
+ accessService = new AccessControlService(service);
+ serviceRegistration = context.registerService(IAccessControlService.class.getName(), accessService, null);
+ }
+
+ @Override
+ public void onDeActivate() {
+ if (serviceRegistration != null) {
+ serviceRegistration.unregister();
+ }
}
}
@@ -35,7 +80,6 @@ public class Activator implements BundleActivator {
private static final Class<?>[] DEPENDENCIES = new Class[] {ILifecycleService.class};
- private SkynetTransactionHandler handler;
private IAccessProvider accessProvider;
private ILifecycleService service;
@@ -48,12 +92,8 @@ public class Activator implements BundleActivator {
public void onActivate(BundleContext context, Map<Class<?>, Object> services) {
service = (ILifecycleService) services.get(ILifecycleService.class);
try {
- handler = new SkynetTransactionAccessHandler(AccessControlService.getInstance());
- service.addHandler(SkynetTransactionCheckPoint.TYPE, handler);
-
accessProvider = new ObjectAccessProvider();
service.addHandler(AccessProviderVisitor.TYPE, accessProvider);
-
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
}
@@ -61,9 +101,8 @@ public class Activator implements BundleActivator {
@Override
public void onDeActivate() {
- if (handler != null) {
+ if (accessProvider != null) {
try {
- service.removeHandler(SkynetTransactionCheckPoint.TYPE, handler);
service.removeHandler(AccessProviderVisitor.TYPE, accessProvider);
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
@@ -72,4 +111,5 @@ public class Activator implements BundleActivator {
}
}
+
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java
index 5c82066809..e80c075551 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/ObjectAccessProvider.java
@@ -6,40 +6,36 @@
package org.eclipse.osee.framework.access.internal;
import java.util.Collection;
-import org.eclipse.osee.framework.access.AccessData;
import org.eclipse.osee.framework.access.IAccessProvider;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeStateException;
-import org.eclipse.osee.framework.core.model.Branch;
+import org.eclipse.osee.framework.core.model.AccessData;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
public class ObjectAccessProvider implements IAccessProvider {
@Override
public void computeAccess(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artsToCheck, AccessData accessData) throws OseeCoreException {
- PermissionEnum branchPermission = null;
- PermissionEnum permission = null;
- Branch branch = null;
-
- if (object instanceof Artifact) {
- Artifact artifact = (Artifact) object;
- branch = artifact.getBranch();
- userPermission = accessService.getArtifactPermission(userArtifact, artifact, permission);
- } else if (object instanceof Branch) {
- branch = (Branch) object;
- } else {
- throw new OseeStateException("Unhandled object type for access control - " + object);
- }
-
- PermissionEnum userPermission = null;
- PermissionEnum branchPermission = accessService.getBranchPermission(userArtifact, branch, permission);
- if (branchPermission == PermissionEnum.DENY || userPermission == null) {
- userPermission = branchPermission;
- }
-
- userPermission.matches();
+// PermissionEnum branchPermission = null;
+// PermissionEnum permission = null;
+// Branch branch = null;
+//
+// if (object instanceof Artifact) {
+// Artifact artifact = (Artifact) object;
+// branch = artifact.getBranch();
+// userPermission = accessService.getArtifactPermission(userArtifact, artifact, permission);
+// } else if (object instanceof Branch) {
+// branch = (Branch) object;
+// } else {
+// throw new OseeStateException("Unhandled object type for access control - " + object);
+// }
+//
+// PermissionEnum userPermission = null;
+// PermissionEnum branchPermission = accessService.getBranchPermission(userArtifact, branch, permission);
+// if (branchPermission == PermissionEnum.DENY || userPermission == null) {
+// userPermission = branchPermission;
+// }
+//
+// userPermission.matches();
}
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
index 4ff7713d5a..d726cdd86b 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java
@@ -26,6 +26,12 @@ public class ArtifactAccessObject extends AccessObject {
private static final DoubleKeyHashMap<Integer, Integer, ArtifactAccessObject> cache =
new DoubleKeyHashMap<Integer, Integer, ArtifactAccessObject>();
+ public ArtifactAccessObject(Integer artId, Integer branchId) {
+ super();
+ this.artId = artId;
+ this.branchId = branchId;
+ }
+
@Override
public int hashCode() {
int result = 17;
@@ -34,11 +40,7 @@ public class ArtifactAccessObject extends AccessObject {
return result;
}
- public ArtifactAccessObject(Integer artId, Integer branchId) {
- super();
- this.artId = artId;
- this.branchId = branchId;
- }
+
public Integer getArtId() {
return artId;
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/PermissionList.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/PermissionList.java
deleted file mode 100644
index a7331cceed..0000000000
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/PermissionList.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.access.internal.data;
-
-import java.util.ArrayList;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-
-/**
- * @author Jeff C. Phillips
- */
-public class PermissionList {
-
- private ArrayList<PermissionEnum> permissions = new ArrayList<PermissionEnum>();
-
- public PermissionList() {
- super();
-
- }
-
- /**
- * @return permission list.
- */
- public ArrayList<PermissionEnum> getPermissions() {
- return permissions;
- }
-
- public void addPermission(PermissionEnum permission) {
- permissions.add(permission);
- }
-
- public void resetPermissionList() {
- for (int i = 0; i < permissions.size(); i++) {
- permissions.remove(i);
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessData.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/AccessData.java
index 19cf2c94b6..8181c43848 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessData.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/AccessData.java
@@ -3,7 +3,7 @@
*
* PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
*/
-package org.eclipse.osee.framework.access;
+package org.eclipse.osee.framework.core.model;
import java.util.ArrayList;
import java.util.Collection;
@@ -16,7 +16,6 @@ import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.model.IBasicArtifact;
public class AccessData {
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IAccessControlService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IAccessControlService.java
new file mode 100644
index 0000000000..3c3d3f7c9e
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IAccessControlService.java
@@ -0,0 +1,22 @@
+/*
+ * Created on Jun 29, 2010
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.framework.core.services;
+
+import java.util.Collection;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AccessData;
+import org.eclipse.osee.framework.core.model.IBasicArtifact;
+
+public interface IAccessControlService {
+
+ boolean hasPermission(Object object, PermissionEnum permission) throws OseeCoreException;
+
+ void removePermissions(IOseeBranch branch) throws OseeCoreException;
+
+ AccessData getAccessData(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> itemsToCheck) throws OseeCoreException;
+}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/OseeServiceTrackerId.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/OseeServiceTrackerId.java
index dcd1698459..ac3b15a3be 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/OseeServiceTrackerId.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/OseeServiceTrackerId.java
@@ -19,6 +19,7 @@ public enum OseeServiceTrackerId {
BRANCH_EXCHANGE,
SEARCH_ENGINE,
SEARCH_TAGGER,
+ OSEE_ACCESS_CONTROL_SERVICE,
OSEE_ARTIFACT_SERVICE,
OSEE_DATABASE_SERVICE,
OSEE_FACTORY_SERVICE,
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/PermissionEnum.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/PermissionEnum.java
index 7a93bcbe33..0175ffcd75 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/PermissionEnum.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/PermissionEnum.java
@@ -25,10 +25,10 @@ public enum PermissionEnum {
// keeping this in sync with the number of permissions will ensure optimal memory usage
private static final int COUNT = 4;
- private static final Map<Integer, PermissionEnum> rankToPermissionHash =
- new HashMap<Integer, PermissionEnum>((int) (COUNT / .75) + 1, .75f);
- private static final Map<String, PermissionEnum> NameToPermissionHash =
- new HashMap<String, PermissionEnum>((int) (COUNT / .75) + 1, .75f);
+ private static final Map<Integer, PermissionEnum> rankToPermissionHash = new HashMap<Integer, PermissionEnum>(
+ (int) (COUNT / .75) + 1, .75f);
+ private static final Map<String, PermissionEnum> NameToPermissionHash = new HashMap<String, PermissionEnum>(
+ (int) (COUNT / .75) + 1, .75f);
private static final String[] NAME_ARRAY;
static {
@@ -67,6 +67,19 @@ public enum PermissionEnum {
return NameToPermissionHash.get(name);
}
+ public boolean matches(PermissionEnum toMatch) {
+ boolean hasPermission = false;
+
+ if (toMatch == PermissionEnum.READ && this == PermissionEnum.LOCK) {
+ hasPermission = true;
+ } else if (this == null || this == PermissionEnum.LOCK) {
+ hasPermission = false;
+ } else {
+ hasPermission = this.getRank() >= toMatch.getRank() && !this.equals(PermissionEnum.DENY);
+ }
+ return hasPermission;
+ }
+
public static String[] getPermissionNames() {
return NAME_ARRAY;
}
diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/InternalLifecycleTestSuite.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/InternalLifecycleTestSuite.java
index e5edff1a1c..40372cc5a9 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/InternalLifecycleTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/InternalLifecycleTestSuite.java
@@ -4,10 +4,9 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses( { //
+@Suite.SuiteClasses({ //
LifecycleServiceTest.class, //
LifecycleOperationTest.class, //
- OnEditOperationTest.class, //
})
public class InternalLifecycleTestSuite {
diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/OnEditOperationTest.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/OnEditOperationTest.java
deleted file mode 100644
index b59cabbd20..0000000000
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/internal/OnEditOperationTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.lifecycle.test.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.DefaultBasicArtifact;
-import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.core.operation.IOperation;
-import org.eclipse.osee.framework.core.operation.LogProgressMonitor;
-import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.lifecycle.AbstractLifecycleOperation;
-import org.eclipse.osee.framework.lifecycle.ILifecycleService;
-import org.eclipse.osee.framework.lifecycle.LifecycleServiceImpl;
-import org.eclipse.osee.framework.lifecycle.access.ChangeMgmtChkPoint;
-import org.eclipse.osee.framework.lifecycle.access.ChangeMgmtHandler;
-import org.eclipse.osee.framework.lifecycle.test.mock.access.MockAccessCheckPorovider;
-import org.eclipse.osee.framework.lifecycle.test.mock.access.OnEditOperation;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test Case for {@link AbstractLifecycleOperation}
- *
- * @author Roberto E. Escobar
- * @author Jeff C. Phillips
- */
-public class OnEditOperationTest {
-
- @Test
- public void testOperation() throws OseeCoreException {
- ILifecycleService service = new LifecycleServiceImpl();
-
- service.addHandler(ChangeMgmtChkPoint.TYPE, new ChangeMgmtHandler(new MockAccessCheckPorovider()));
-
- Assert.assertEquals(1, service.getHandlerCount(ChangeMgmtChkPoint.TYPE));
- Assert.assertFalse(service.getHandlerTypes().isEmpty());
-
- IBasicArtifact<?> user = new DefaultBasicArtifact(0, "1", "user");
- List<IBasicArtifact<?>> artsToChk = new ArrayList<IBasicArtifact<?>>();
- artsToChk.add(new DefaultBasicArtifact(1, "2", "check me out"));
- IOperation op = new OnEditOperation(service, user, artsToChk);
- Operations.executeWork(op, new LogProgressMonitor(), -1.0);
-
- IStatus status = op.getStatus();
- Assert.assertTrue(status.isOK());
-
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/AnotherMockLifecycePoint.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/AnotherMockLifecycePoint.java
index 993b9d62cb..4148996c40 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/AnotherMockLifecycePoint.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/AnotherMockLifecycePoint.java
@@ -22,15 +22,6 @@ public class AnotherMockLifecycePoint extends AbstractLifecycleVisitor<NonRunHan
public static final Type<NonRunHandler> TYPE = new Type<NonRunHandler>();
- private final String a;
- private final String b;
-
- public AnotherMockLifecycePoint(String a, String b) {
- super();
- this.a = a;
- this.b = b;
- }
-
@Override
public Type<NonRunHandler> getAssociatedType() {
return TYPE;
diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/MockAccessCheckPorovider.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/MockAccessCheckPorovider.java
deleted file mode 100644
index bbcf4abb82..0000000000
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/MockAccessCheckPorovider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Created on Jun 24, 2010
- *
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
-package org.eclipse.osee.framework.lifecycle.test.mock.access;
-
-import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.lifecycle.access.IAccessCheckProvider;
-
-public class MockAccessCheckPorovider implements IAccessCheckProvider {
-
- @Override
- public boolean canEdit(IBasicArtifact<?> user, IBasicArtifact<?> artTcheck) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/OnEditOperation.java b/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/OnEditOperation.java
deleted file mode 100644
index 4b1026eb43..0000000000
--- a/plugins/org.eclipse.osee.framework.lifecycle.test/src/org/eclipse/osee/framework/lifecycle/test/mock/access/OnEditOperation.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Created on Jun 17, 2010
- *
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
-package org.eclipse.osee.framework.lifecycle.test.mock.access;
-
-import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.lifecycle.AbstractLifecycleOperation;
-import org.eclipse.osee.framework.lifecycle.ILifecycleService;
-import org.eclipse.osee.framework.lifecycle.access.ChangeMgmtChkPoint;
-
-public class OnEditOperation extends AbstractLifecycleOperation {
-
- public OnEditOperation(ILifecycleService service, IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artsToCheck) {
- super(service, new ChangeMgmtChkPoint(userArtifact, artsToCheck), "On Edit Op", "TestBundle");
- }
-
- @Override
- protected void doCoreWork(IProgressMonitor monitor) throws Exception {
- System.out.println("I am going to do some edit ...");
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF
index cd099a10e5..1a1b9bd7f2 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.lifecycle/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2
Bundle-Name: Osee Lifecycle
Bundle-SymbolicName: org.eclipse.osee.framework.lifecycle;singleton:=true
Bundle-Version: 0.9.5.qualifier
-Bundle-Activator: org.eclipse.osee.framework.lifecycle.Activator
+Bundle-Activator: org.eclipse.osee.framework.lifecycle.internal.Activator
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.core.runtime;version="3.4.0",
+Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.core.operation,
@@ -14,9 +14,8 @@ Import-Package: org.eclipse.core.runtime;version="3.4.0",
org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.lifecycle,
- org.osgi.framework;version="1.3.0",
+ org.osgi.framework,
org.osgi.util.tracker
Eclipse-ExtensibleAPI: true
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.osee.framework.lifecycle,
- org.eclipse.osee.framework.lifecycle.access
+Export-Package: org.eclipse.osee.framework.lifecycle
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/IAccessCheckProvider.java b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/IAccessCheckProvider.java
index ef96c7d0ed..39bbdc7c69 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/IAccessCheckProvider.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/IAccessCheckProvider.java
@@ -3,7 +3,7 @@
*
* PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
*/
-package org.eclipse.osee.framework.lifecycle.access;
+package org.eclipse.osee.framework.lifecycle;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/AccessManagerChkPoint.java b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/AccessManagerChkPoint.java
deleted file mode 100644
index 6c546dfd39..0000000000
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/AccessManagerChkPoint.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.lifecycle.access;
-
-import java.util.Collection;
-import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.lifecycle.AbstractLifecyclePoint;
-
-/**
- * @author Jeff C. Phillips
- */
-public class AccessManagerChkPoint extends AbstractLifecyclePoint<AccessManagerHandler> {
-
- public static final Type<AccessManagerHandler> TYPE = new Type<AccessManagerHandler>();
- private final IBasicArtifact<?> userArtifact;
- private final Collection<IBasicArtifact<?>> artsToCheck;
-
- public AccessManagerChkPoint(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artsToCheck) {
- super();
- this.userArtifact = userArtifact;
- this.artsToCheck = artsToCheck;
- }
-
- @Override
- protected void initializeHandlerData(AccessManagerHandler handler) {
- handler.setData(userArtifact, artsToCheck);
- }
-
- @Override
- public Type<AccessManagerHandler> getAssociatedType() {
- return TYPE;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/AccessManagerHandler.java b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/AccessManagerHandler.java
deleted file mode 100644
index 91b3cbb0bf..0000000000
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/AccessManagerHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.lifecycle.access;
-
-import java.util.Collection;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.lifecycle.Activator;
-import org.eclipse.osee.framework.lifecycle.LifecycleOpHandler;
-
-/**
- * @author Jeff C. Phillips
- */
-public class AccessManagerHandler implements LifecycleOpHandler {
- private final IStatus status = Status.OK_STATUS;
- private IBasicArtifact<?> userArtifact;
- private Collection<IBasicArtifact<?>> artsToCheck;
- private final IAccessCheckProvider accessCheckProvider;
-
- public AccessManagerHandler(IAccessCheckProvider accessCheckProvider) {
- this.accessCheckProvider = accessCheckProvider;
- }
-
- public void setData(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artsToCheck) {
- this.userArtifact = userArtifact;
- this.artsToCheck = artsToCheck;
- }
-
- @Override
- public IStatus onCheck(IProgressMonitor monitor) {
- IStatus statusToReturn = status;
-
- for (IBasicArtifact<?> artifactToChk : artsToCheck) {
- if (!accessCheckProvider.canEdit(userArtifact, artifactToChk)) {
- statusToReturn = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error");
- break;
- }
- }
- return statusToReturn;
- }
-
- @Override
- public IStatus onPostCondition(IProgressMonitor monitor) {
- return status;
- }
-
- @Override
- public IStatus onPreCondition(IProgressMonitor monitor) {
- return status;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/Activator.java b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/internal/Activator.java
index d7db4f1633..89c21b0f09 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/Activator.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/internal/Activator.java
@@ -8,8 +8,10 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.lifecycle;
+package org.eclipse.osee.framework.lifecycle.internal;
+import org.eclipse.osee.framework.lifecycle.ILifecycleService;
+import org.eclipse.osee.framework.lifecycle.LifecycleServiceImpl;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
index 8fbf088b19..538995f25a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.osee.framework.messaging,
org.eclipse.osee.framework.lifecycle
Export-Package: org.eclipse.osee.framework.skynet.core,
- org.eclipse.osee.framework.skynet.core.access,
org.eclipse.osee.framework.skynet.core.artifact,
org.eclipse.osee.framework.skynet.core.artifact.annotation,
org.eclipse.osee.framework.skynet.core.artifact.factory,
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlData.java
deleted file mode 100644
index b52e891f8b..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlData.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.access;
-
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-
-/**
- * A data object in an access control list. Contains a subject (user artifact) and object (what the subject is trying to
- * access) and a permission level
- *
- * @author Jeff C. Phillips
- */
-public class AccessControlData implements Comparable<AccessControlData> {
-
- private boolean dirty = false;
- private boolean birth = false;
- private final Artifact subject;
- private final AccessObject object;
- private PermissionEnum permission;
- private PermissionEnum branchPermission = null;
- private PermissionEnum artifactTypePermission = null;
- private PermissionEnum artifactPermission = null;
-
- public AccessControlData(Artifact subject, AccessObject object, PermissionEnum permission, boolean birth) {
- this(subject, object, permission, birth, true);
- }
-
- public AccessControlData(Artifact subject, AccessObject object, PermissionEnum permission, boolean birth, boolean dirty) {
- super();
- this.subject = subject;
- this.permission = permission;
- this.dirty = dirty;
- this.birth = birth;
- this.object = object;
- }
-
- /**
- * @return Returns the user.
- */
- public Artifact getSubject() {
- return subject;
- }
-
- /**
- * @param permission The permissionLevel to set.
- */
- public void setPermission(PermissionEnum permission) {
-
- if (this.permission == permission) {
- return;
- }
-
- this.permission = permission;
- dirty = true;
- }
-
- public PermissionEnum getBranchPermission() {
- return branchPermission;
- }
-
- public PermissionEnum getArtifactPermission() {
- return artifactPermission;
- }
-
- public PermissionEnum getArtifactTypePermission() {
- return artifactTypePermission;
- }
-
- /**
- * @return PermissionEnum
- */
- public PermissionEnum getPermission() {
- return permission;
- }
-
- /**
- * @return Returns the dirty.
- */
- public boolean isDirty() {
- return dirty;
- }
-
- public void setNotDirty() {
- this.dirty = false;
- }
-
- /**
- * @return Returns the object.
- */
- public AccessObject getObject() {
- return object;
- }
-
- public boolean isBirth() {
- return birth;
- }
-
- public void persist() {
- AccessControlManager.persistPermission(this, false);
- }
-
- public void persist(boolean recurse) {
- AccessControlManager.persistPermission(this, recurse);
- }
-
- public int compareTo(AccessControlData data) {
- return subject.getName().compareTo(data.subject.getName());
- }
-
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof AccessControlData)) {
- return false;
- }
- return subject.getName().equals(((AccessControlData) obj).subject.getName());
- }
-
- @Override
- public int hashCode() {
- return subject.getName().hashCode();
- }
-
- /**
- * @param branchPermission the branchPermission to set
- */
- public void setBranchPermission(PermissionEnum branchPermission) {
- this.branchPermission = branchPermission;
- }
-
- /**
- * @param artifactTypePermission the artifactTypePermission to set
- */
- public void setArtifactTypePermission(PermissionEnum artifactTypePermission) {
- this.artifactTypePermission = artifactTypePermission;
- }
-
- /**
- * @param artifactPermission the artifactPermission to set
- */
- public void setArtifactPermission(PermissionEnum artifactPermission) {
- this.artifactPermission = artifactPermission;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java
deleted file mode 100644
index 6fb7a0bbcf..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java
+++ /dev/null
@@ -1,753 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.osee.framework.skynet.core.access;
-
-import static org.eclipse.osee.framework.core.enums.PermissionEnum.DENY;
-import static org.eclipse.osee.framework.core.enums.PermissionEnum.FULLACCESS;
-import static org.eclipse.osee.framework.core.enums.PermissionEnum.LOCK;
-import static org.eclipse.osee.framework.core.enums.PermissionEnum.READ;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.type.ArtifactType;
-import org.eclipse.osee.framework.core.operation.LogProgressMonitor;
-import org.eclipse.osee.framework.core.operation.Operations;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.database.core.OseeConnection;
-import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap;
-import org.eclipse.osee.framework.jdk.core.type.HashCollection;
-import org.eclipse.osee.framework.lifecycle.AbstractLifecycleOperation;
-import org.eclipse.osee.framework.lifecycle.ILifecycleService;
-import org.eclipse.osee.framework.lifecycle.access.AccessManagerChkPoint;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.SystemGroup;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.event.AccessControlEventType;
-import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
-import org.eclipse.osee.framework.skynet.core.event.IArtifactsPurgedEventListener;
-import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
-import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.AccessControlEvent;
-import org.eclipse.osee.framework.skynet.core.event2.ArtifactEvent;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactEventListener;
-import org.eclipse.osee.framework.skynet.core.event2.filter.IEventFilter;
-import org.eclipse.osee.framework.skynet.core.internal.Activator;
-import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
-import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;
-
-/**
- * Provides access control for OSEE. <REM2>
- *
- * @author Jeff C. Phillips
- */
-
-public class AccessControlManager {
- private static final String INSERT_INTO_ARTIFACT_ACL =
- "INSERT INTO OSEE_ARTIFACT_ACL (art_id, permission_id, privilege_entity_id, branch_id) VALUES (?, ?, ?, ?)";
- private static final String INSERT_INTO_BRANCH_ACL =
- "INSERT INTO OSEE_BRANCH_ACL (permission_id, privilege_entity_id, branch_id) VALUES (?, ?, ?)";
-
- private static final String UPDATE_ARTIFACT_ACL =
- "UPDATE OSEE_ARTIFACT_ACL SET permission_id = ? WHERE privilege_entity_id =? AND art_id = ? AND branch_id = ?";
- private static final String UPDATE_BRANCH_ACL =
- "UPDATE OSEE_BRANCH_ACL SET permission_id = ? WHERE privilege_entity_id =? AND branch_id = ?";
-
- private static final String GET_ALL_ARTIFACT_ACCESS_CONTROL_LIST =
- "SELECT aac1.*, art1.art_type_id FROM osee_artifact art1, osee_artifact_acl aac1 WHERE art1.art_id = aac1.privilege_entity_id";
- private static final String GET_ALL_BRANCH_ACCESS_CONTROL_LIST =
- "SELECT bac1.*, art1.art_type_id FROM osee_artifact art1, osee_branch_acl bac1 WHERE art1.art_id = bac1.privilege_entity_id";
-
- private static final String DELETE_ARTIFACT_ACL_FROM_BRANCH = "DELETE FROM OSEE_ARTIFACT_ACL WHERE branch_id =?";
- private static final String DELETE_BRANCH_ACL_FROM_BRANCH = "DELETE FROM OSEE_BRANCH_ACL WHERE branch_id =?";
- private static final String USER_GROUP_MEMBERS =
- "SELECT b_art_id FROM osee_relation_link WHERE a_art_id =? AND rel_link_type_id =? ORDER BY b_art_id";
-
- public static enum ObjectTypeEnum {
- ALL, BRANCH, REL_TYPE, ART_TYPE, ATTR_TYPE, ART;
- }
-
- private static DoubleKeyHashMap<Integer, AccessObject, PermissionEnum> accessControlListCache;
- private static HashCollection<AccessObject, Integer> objectToSubjectCache; // <subjectId, groupId>
- private static HashCollection<Integer, Integer> subjectToGroupCache; // <groupId, subjectId>
- private static HashCollection<Integer, Integer> groupToSubjectsCache; // <artId, branchId>
- private static Map<Integer, Integer> objectToBranchLockCache; // object, subject
- private static Map<Integer, Integer> lockedObjectToSubject; // subject, permission
- private static HashCollection<Integer, PermissionEnum> subjectToPermissionCache;
-
- private static final AccessControlManager instance = new AccessControlManager();
-
- private AccessControlManager() {
- reload();
- OseeEventManager.addListener(new EventRelay());
- }
-
- private static synchronized void reload() {
- initializeCaches();
- try {
- populateAccessControlLists();
- } catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
-
- private static void initializeCaches() {
- accessControlListCache = new DoubleKeyHashMap<Integer, AccessObject, PermissionEnum>();
- objectToSubjectCache = new HashCollection<AccessObject, Integer>();
- subjectToGroupCache = new HashCollection<Integer, Integer>();
- groupToSubjectsCache = new HashCollection<Integer, Integer>();
- objectToBranchLockCache = new HashMap<Integer, Integer>();
- lockedObjectToSubject = new HashMap<Integer, Integer>();
- subjectToPermissionCache = new HashCollection<Integer, PermissionEnum>();
- }
-
- private static void populateAccessControlLists() throws OseeCoreException {
- populateArtifactAccessControlList();
- populateBranchAccessControlList();
- }
-
- private static void populateBranchAccessControlList() throws OseeCoreException {
- IOseeStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(GET_ALL_BRANCH_ACCESS_CONTROL_LIST);
- while (chStmt.next()) {
- Integer subjectId = chStmt.getInt("privilege_entity_id");
- Integer branchId = chStmt.getInt("branch_id");
- int subjectArtifactTypeId = chStmt.getInt("art_type_id");
- PermissionEnum permission = PermissionEnum.getPermission(chStmt.getInt("permission_id"));
- BranchAccessObject branchAccessObject = BranchAccessObject.getBranchAccessObject(branchId);
-
- accessControlListCache.put(subjectId, branchAccessObject, permission);
- objectToSubjectCache.put(branchAccessObject, subjectId);
-
- ArtifactType toCheck = ArtifactTypeManager.getType("User Group");
- if (ArtifactTypeManager.getType(subjectArtifactTypeId).inheritsFrom(toCheck)) {
- populateGroupMembers(subjectId);
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- private static void populateArtifactAccessControlList() throws OseeCoreException {
- IOseeStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(GET_ALL_ARTIFACT_ACCESS_CONTROL_LIST);
-
- while (chStmt.next()) {
- Integer subjectId = chStmt.getInt("privilege_entity_id");
- Integer objectId = chStmt.getInt("art_id");
- Integer branchId = chStmt.getInt("branch_id");
- int subjectArtifactTypeId = chStmt.getInt("art_type_id");
- PermissionEnum permission = PermissionEnum.getPermission(chStmt.getInt("permission_id"));
-
- if (permission.equals(PermissionEnum.LOCK)) {
- objectToBranchLockCache.put(objectId, branchId);
- lockedObjectToSubject.put(objectId, subjectId);
- } else {
- AccessObject accessObject = ArtifactAccessObject.getArtifactAccessObject(objectId, branchId);
- cacheAccessObject(objectId, subjectId, permission, accessObject);
-
- ArtifactType toCheck = ArtifactTypeManager.getType("User Group");
- if (ArtifactTypeManager.getType(subjectArtifactTypeId).inheritsFrom(toCheck)) {
- populateGroupMembers(subjectId);
- }
- }
- }
- } finally {
- chStmt.close();
- }
- }
-
- private static void populateGroupMembers(Integer groupId) throws OseeCoreException {
- if (!groupToSubjectsCache.containsKey(groupId)) {
- Integer groupMember;
-
- IOseeStatement chStmt = ConnectionHandler.getStatement();
- try {
- chStmt.runPreparedQuery(USER_GROUP_MEMBERS, groupId,
- RelationTypeManager.getType(CoreRelationTypes.Users_User).getId());
-
- // get group members and populate subjectToGroupCache
- while (chStmt.next()) {
- groupMember = chStmt.getInt("b_art_id");
- subjectToGroupCache.put(groupMember, groupId);
- groupToSubjectsCache.put(groupId, groupMember);
- }
- } finally {
- chStmt.close();
- }
- }
- }
-
- public static boolean checkSubjectPermission(Artifact subject, PermissionEnum permission) {
- boolean isValid = false;
-
- if (subjectToPermissionCache.containsKey(subject.getArtId())) {
- for (PermissionEnum subjectPermission : subjectToPermissionCache.getValues(subject.getArtId())) {
- if (subjectPermission.getRank() >= permission.getRank()) {
- isValid = true;
- }
- }
- }
- return isValid;
- }
-
- public static boolean checkObjectListPermission(Collection<?> objectList, PermissionEnum permission) throws OseeCoreException {
- boolean isValid = true;
-
- if (objectList.isEmpty()) {
- isValid = false;
- }
-
- for (Object object : objectList) {
- isValid &= hasPermission(object, permission);
- }
- return isValid;
- }
-
- public static boolean hasPermission(Object object, PermissionEnum permission) throws OseeCoreException {
- return hasPermission(UserManager.getUser(), object, permission);
- }
-
- public static PermissionEnum getObjectPermission(Artifact subject, Object object) throws OseeCoreException {
- for (PermissionEnum permissionEnum : PermissionEnum.values()) {
- boolean result = hasPermission(subject, object, permissionEnum);
- System.out.println("subject " + subject + " object " + object + " permission " + permissionEnum.name() + " -> " + result);
- if (result) {
- return permissionEnum;
- }
- }
- return FULLACCESS;
- }
-
- private static boolean hasPermission(Artifact subject, Object object, PermissionEnum permission) throws OseeCoreException {
- ILifecycleService service = Activator.getInstance().getLifecycleServices();
- AccessCheckOperation accessCheckOperation = new AccessCheckOperation(service, subject, object, permission);
- Operations.executeWork(accessCheckOperation, new LogProgressMonitor(), -1.0);
- IStatus status = accessCheckOperation.getStatus();
- return accessCheckOperation.hasPermission();
- }
-
- private static PermissionEnum getBranchPermission(Artifact subject, Branch branch, PermissionEnum permission) {
- PermissionEnum userPermission = null;
- AccessObject accessObject = BranchAccessObject.getBranchAccessObjectFromCache(branch);
-
- if (accessObject == null) {
- userPermission = FULLACCESS;
- } else {
- userPermission = acquirePermissionRank(subject, accessObject, permission);
- }
- return userPermission;
- }
-
- public static PermissionEnum getArtifactPermission(Artifact subject, Artifact artifact, PermissionEnum permission) {
- PermissionEnum userPermission = null;
- AccessObject accessObject = null;
-
- // The artifact is new and has not been persisted.
- if (!artifact.isInDb()) {
- return PermissionEnum.FULLACCESS;
- }
-
- Integer artId = artifact.getArtId();
- Integer branchId = artifact.getBranch().getId();
- Integer lockedBranchId;
-
- // accessObject = accessObjectCache.get(artId, branchId);
- accessObject = ArtifactAccessObject.getArtifactAccessObjectFromCache(artId, branchId);
-
- if (objectToBranchLockCache.containsKey(artId)) {
- lockedBranchId = objectToBranchLockCache.get(artId);
-
- // this object is locked under a different branch
- if (lockedBranchId.intValue() != branchId.intValue()) {
- userPermission = PermissionEnum.LOCK;
- }
- }
-
- if (userPermission == null && accessObject != null) {
- userPermission = acquirePermissionRank(subject, accessObject, permission);
- }
- return userPermission;
- }
-
- private static PermissionEnum acquirePermissionRank(Artifact subject, AccessObject accessObject, PermissionEnum permission) {
- PermissionEnum userPermission = null;
- int subjectId = subject.getArtId();
-
- userPermission = accessControlListCache.get(subjectId, accessObject);
-
- if (subjectToGroupCache.containsKey(subjectId)) {
- for (int groupPermissionId : subjectToGroupCache.getValues(subjectId)) {
- PermissionEnum groupPermission = accessControlListCache.get(groupPermissionId, accessObject);
-
- if (groupPermission != null) {
- if (userPermission == null) {
- userPermission = groupPermission;
- }
-
- if (groupPermission.getRank() > userPermission.getRank()) {
- userPermission = groupPermission;
- }
- }
- }
- }
- return userPermission;
- }
-
- public static void persistPermission(AccessControlData data) {
- persistPermission(data, false);
- }
-
- public static void setPermission(Artifact subject, Object object, PermissionEnum permission) {
- AccessObject accessObject = getAccessObject(object);
-
- boolean newAccessControlData = !accessControlListCache.containsKey(subject.getArtId(), accessObject);
-
- if (newAccessControlData || permission != accessControlListCache.get(subject.getArtId(), accessObject)) {
- AccessControlData data = new AccessControlData(subject, accessObject, permission, newAccessControlData);
- data.persist();
- }
- }
-
- protected static void persistPermission(AccessControlData data, boolean recurse) {
- Artifact subject = data.getSubject();
- PermissionEnum permission = data.getPermission();
-
- if (data.isDirty()) {
- data.setNotDirty();
-
- try {
- if (data.getObject() instanceof ArtifactAccessObject) {
- ArtifactAccessObject artifactAccessObject = (ArtifactAccessObject) data.getObject();
-
- if (data.isBirth()) {
- ConnectionHandler.runPreparedUpdate(INSERT_INTO_ARTIFACT_ACL, artifactAccessObject.getArtId(),
- data.getPermission().getPermId(), data.getSubject().getArtId(), artifactAccessObject.getId());
- } else {
- ConnectionHandler.runPreparedUpdate(UPDATE_ARTIFACT_ACL, data.getPermission().getPermId(),
- data.getSubject().getArtId(), artifactAccessObject.getArtId(), artifactAccessObject.getId());
- }
-
- if (recurse) {
- Artifact artifact =
- ArtifactQuery.getArtifactFromId(artifactAccessObject.getArtId(),
- BranchManager.getBranch(artifactAccessObject.getId()));
- AccessControlData childAccessControlData = null;
-
- for (Artifact child : artifact.getChildren()) {
- AccessObject accessObject = getAccessObject(child);
-
- if (objectToSubjectCache.containsKey(accessObject)) {
- Collection<Integer> subjectIds = objectToSubjectCache.getValues(accessObject);
-
- for (int subjectId : subjectIds) {
- if (subjectId == subject.getArtId()) {
- childAccessControlData = new AccessControlData(subject, accessObject, permission, false);
- }
- }
- }
-
- if (childAccessControlData == null) {
- childAccessControlData = new AccessControlData(subject, accessObject, permission, true);
- }
- persistPermission(childAccessControlData, true);
- }
- }
- } else if (data.getObject() instanceof BranchAccessObject) {
- BranchAccessObject branchAccessObject = (BranchAccessObject) data.getObject();
-
- if (data.isBirth()) {
- ConnectionHandler.runPreparedUpdate(INSERT_INTO_BRANCH_ACL, data.getPermission().getPermId(),
- data.getSubject().getArtId(), branchAccessObject.getId());
- } else {
- ConnectionHandler.runPreparedUpdate(UPDATE_BRANCH_ACL, data.getPermission().getPermId(),
- data.getSubject().getArtId(), branchAccessObject.getId());
- }
- }
- cacheAccessControlData(data);
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
- }
-
- private static void cacheAccessControlData(AccessControlData data) throws OseeCoreException {
- AccessObject accessObject = data.getObject();
- int subjectId = data.getSubject().getArtId();
- PermissionEnum permission = data.getPermission();
-
- if (!permission.equals(PermissionEnum.LOCK)) {
- accessControlListCache.put(subjectId, accessObject, permission);
- objectToSubjectCache.put(accessObject, subjectId);
-
- populateGroupMembers(subjectId);
- }
- }
-
- public static List<AccessControlData> getAccessControlList(Object object) {
- List<AccessControlData> datas = new LinkedList<AccessControlData>();
- AccessObject accessObject = null;
-
- try {
- accessObject = AccessObject.getAccessObjectFromCache(object);
-
- if (accessObject == null) {
- return datas;
- }
-
- datas = generateAccessControlList(accessObject);
-
- } catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- return datas;
- }
-
- private static List<AccessControlData> generateAccessControlList(AccessObject accessObject) throws OseeCoreException {
- List<AccessControlData> datas = new LinkedList<AccessControlData>();
-
- Collection<Integer> subjects = objectToSubjectCache.getValues(accessObject);
- if (subjects == null) {
- return datas;
- }
-
- for (int subjectId : subjects) {
- Artifact subject = ArtifactQuery.getArtifactFromId(subjectId, BranchManager.getCommonBranch());
- PermissionEnum permissionEnum = accessControlListCache.get(subjectId, accessObject);
- AccessControlData accessControlData =
- new AccessControlData(subject, accessObject, permissionEnum, false, false);
- if (accessObject instanceof ArtifactAccessObject) {
- accessControlData.setArtifactPermission(permissionEnum);
- accessControlData.setBranchPermission(getBranchPermission(subject, accessObject));
- } else if (accessObject instanceof BranchAccessObject) {
- accessControlData.setBranchPermission(getBranchPermission(subject, accessObject));
- }
- datas.add(accessControlData);
- }
-
- return datas;
- }
-
- private static PermissionEnum getBranchPermission(Artifact subject, Object object) throws OseeCoreException {
- int branchId = ((AccessObject) object).getId();
- Branch branch = BranchManager.getBranch(branchId);
-
- return AccessControlManager.getBranchPermission(subject, branch, PermissionEnum.FULLACCESS);
- }
-
- public static void removeAccessControlDataIf(boolean removeFromDb, AccessControlData data) throws OseeDataStoreException {
- int subjectId = data.getSubject().getArtId();
- AccessObject accessControlledObject = data.getObject();
- if (removeFromDb) {
- accessControlledObject.removeFromDatabase(subjectId);
- }
-
- if (accessControlledObject instanceof ArtifactAccessObject) {
- accessControlledObject.removeFromCache();
- // accessControlledObject.removeFromCache(accessControlListCache);
- }
- // branchAccessObjectCache.remove(object.getId()); (commented out due to 3KJSW)
- deCacheAccessControlData(data);
- }
-
- private static void deCacheAccessControlData(AccessControlData data) {
- if (data == null) {
- throw new IllegalArgumentException("Can not remove a null AccessControlData.");
- }
-
- AccessObject accessObject = data.getObject();
- Integer subjectId = data.getSubject().getArtId();
-
- accessControlListCache.remove(subjectId, accessObject);
- objectToSubjectCache.removeValue(accessObject, subjectId);
- Collection<Integer> members = groupToSubjectsCache.getValues(subjectId);
-
- if (members != null) {
- for (Integer member : members) {
- subjectToGroupCache.removeValue(member, subjectId);
- }
- }
- if (!objectToSubjectCache.containsKey(accessObject)) {
- accessObject.removeFromCache();
- }
- }
-
- public static AccessObject getAccessObject(Object object) {
- return AccessObject.getAccessObject(object);
- }
-
- private static void cacheAccessObject(Integer objectId, Integer subjectId, PermissionEnum permission, AccessObject accessObject) {
- accessControlListCache.put(subjectId, accessObject, permission);
- objectToSubjectCache.put(accessObject, subjectId);
- }
-
- public static void lockObjects(Collection<Artifact> objects, Artifact subject) {
- AccessControlEvent event = new AccessControlEvent();
- event.setEventType(AccessControlEventType.ArtifactsLocked);
- Set<Artifact> lockedArts = new HashSet<Artifact>();
- for (Artifact object : objects) {
- Integer objectArtId = object.getArtId();
- Integer subjectArtId = subject.getArtId();
- Integer objectBranchId = object.getBranch().getId();
-
- if (!objectToBranchLockCache.containsKey(objectArtId)) {
- AccessObject accessObject = getAccessObject(object);
- new AccessControlData(subject, accessObject, PermissionEnum.LOCK, true).persist();
- objectToBranchLockCache.put(objectArtId, objectBranchId);
- lockedObjectToSubject.put(objectArtId, subjectArtId);
- event.getArtifacts().add(object.getBasicGuidArtifact());
- lockedArts.add(object);
- }
- }
- try {
- OseeEventManager.kickAccessControlArtifactsEvent(instance, event, new LoadedArtifacts(lockedArts));
- } catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
-
- public static void unLockObjects(Collection<Artifact> objects, Artifact subject) throws OseeDataStoreException, OseeAuthenticationRequiredException {
- AccessControlEvent event = new AccessControlEvent();
- event.setEventType(AccessControlEventType.ArtifactsUnlocked);
- Set<Artifact> lockedArts = new HashSet<Artifact>();
- for (Artifact object : objects) {
- Integer objectArtId = object.getArtId();
- Integer branchId = object.getBranch().getId();
- Integer lockedBranchId;
-
- if (objectToBranchLockCache.containsKey(objectArtId) && canUnlockObject(object, subject)) {
- lockedBranchId = objectToBranchLockCache.get(objectArtId);
-
- if (branchId.equals(lockedBranchId)) {
- AccessObject accessObject = getAccessObject(object);
- removeAccessControlDataIf(true, new AccessControlData(subject, accessObject, PermissionEnum.LOCK, false));
- objectToBranchLockCache.remove(objectArtId);
- lockedObjectToSubject.remove(objectArtId);
- event.getArtifacts().add(object.getBasicGuidArtifact());
- lockedArts.add(object);
- }
- }
- }
- try {
- OseeEventManager.kickAccessControlArtifactsEvent(instance, event, new LoadedArtifacts(lockedArts));
- } catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
-
- public static void removeAllPermissionsFromBranch(OseeConnection connection, Branch branch) throws OseeCoreException {
- ConnectionHandler.runPreparedUpdate(connection, DELETE_ARTIFACT_ACL_FROM_BRANCH, branch.getId());
- ConnectionHandler.runPreparedUpdate(connection, DELETE_BRANCH_ACL_FROM_BRANCH, branch.getId());
- }
-
- public static boolean hasLock(Artifact object) {
- if (!object.isInDb()) {
- return false;
- }
-
- return objectToBranchLockCache.containsKey(object.getArtId());
- }
-
- public static boolean canUnlockObject(Artifact object, Artifact subject) {
- Integer subjectId = lockedObjectToSubject.get(object.getArtId());
- return subjectId != null && subjectId.intValue() == subject.getArtId();
- }
-
- public static Artifact getSubjectFromLockedObject(Object object) throws OseeCoreException {
- Artifact subject = null;
-
- if (object instanceof Artifact) {
- Integer subjectArtId = lockedObjectToSubject.get(((Artifact) object).getArtId());
-
- if (subjectArtId != null) {
- subject = UserManager.getUserByArtId(subjectArtId);
- }
- }
- return subject;
- }
-
- public static boolean hasLockAccess(Artifact object) {
- boolean hasAccess = false;
-
- if (!object.isInDb()) {
- return true;
- }
-
- if (hasLock(object)) {
- hasAccess = objectToBranchLockCache.get(object.getArtId()) == object.getBranch().getId();
- }
- return hasAccess;
- }
-
- public static boolean isOseeAdmin() throws OseeCoreException {
- return SystemGroup.OseeAdmin.isCurrentUserMember();
- }
-
- private static final class EventRelay implements IBranchEventListener, IArtifactsPurgedEventListener, IArtifactEventListener {
-
- private void reload() {
- AccessControlManager.reload();
- }
-
- @Override
- public void handleBranchEvent(Sender sender, BranchEventType branchModType, int branchId) {
- try {
- if (branchModType == BranchEventType.Deleted || sender.isLocal() && branchModType == BranchEventType.Purged) {
- BranchAccessObject branchAccessObject = BranchAccessObject.getBranchAccessObject(branchId);
- List<AccessControlData> acl = generateAccessControlList(branchAccessObject);
- for (AccessControlData accessControlData : acl) {
- AccessControlManager.removeAccessControlDataIf(sender.isLocal(), accessControlData);
- }
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
-
- }
-
- @Override
- public void handleArtifactsPurgedEvent(Sender sender, LoadedArtifacts loadedArtifacts) throws OseeCoreException {
- try {
- for (Artifact artifact : loadedArtifacts.getLoadedArtifacts()) {
- ArtifactAccessObject artifactAccessObject = ArtifactAccessObject.getArtifactAccessObject(artifact);
- List<AccessControlData> acl = generateAccessControlList(artifactAccessObject);
- for (AccessControlData accessControlData : acl) {
- AccessControlManager.removeAccessControlDataIf(sender.isLocal(), accessControlData);
- }
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
-
- @Override
- public void handleArtifactEvent(ArtifactEvent artifactEvent, Sender sender) {
- for (EventBasicGuidArtifact guidArt : artifactEvent.getArtifacts()) {
- if (guidArt.is(EventModType.Added) && guidArt.is(CoreArtifactTypes.User)) {
- reload();
- }
- if (guidArt.is(EventModType.Purged)) {
- try {
- Artifact cacheArt = ArtifactCache.getActive(guidArt);
- if (cacheArt != null) {
- ArtifactAccessObject artifactAccessObject = ArtifactAccessObject.getArtifactAccessObject(cacheArt);
- List<AccessControlData> acl = generateAccessControlList(artifactAccessObject);
- for (AccessControlData accessControlData : acl) {
- AccessControlManager.removeAccessControlDataIf(sender.isLocal(), accessControlData);
- }
- }
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
-
- }
- }
- }
-
- @Override
- public List<? extends IEventFilter> getEventFilters() {
- return null;
- }
- }
-
- public static void main(String[] args) {
- PermissionEnum[] a = {DENY, FULLACCESS, null};
- PermissionEnum[] b = {LOCK, FULLACCESS, null};
- for (int i = 0; i < 3; i++) {
- for (int j = 0; j < 3; j++) {
- PermissionEnum branchPermission = a[i];
- PermissionEnum userPermission = b[j];
- if (branchPermission == DENY || userPermission == null) {
- System.out.print("T");
- } else {
- System.out.print("F");
- }
- }
- System.out.println();
- }
- }
-
- private static class AccessCheckOperation extends AbstractLifecycleOperation {
- private boolean hasPermission;
- private final Artifact subject;
- private final Object object;
- private final PermissionEnum permission;
-
- public AccessCheckOperation(ILifecycleService service, Artifact subject, Object object, PermissionEnum permission) {
- super(service, new AccessManagerChkPoint(null, null), "Check access control", Activator.PLUGIN_ID);
- this.hasPermission = false;
- this.subject = subject;
- this.object = object;
- this.permission = permission;
- }
-
- public boolean hasPermission() {
- return hasPermission;
- }
-
- @Override
- protected void doCoreWork(IProgressMonitor monitor) throws Exception {
- PermissionEnum userPermission = null;
- PermissionEnum branchPermission = null;
- Branch branch = null;
-
- if (object instanceof Artifact) {
- Artifact artifact = (Artifact) object;
- branch = artifact.getBranch();
- userPermission = getArtifactPermission(subject, (Artifact) object, permission);
- } else if (object instanceof Branch) {
- branch = (Branch) object;
- } else {
- throw new IllegalStateException("Unhandled object type for access control - " + object);
- }
-
- branchPermission = getBranchPermission(subject, branch, permission);
-
- if (branchPermission == DENY || userPermission == null) {
- userPermission = branchPermission;
- }
-
- if (permission == READ && userPermission == LOCK) {
- hasPermission = true;
- } else if (userPermission == null || userPermission == LOCK) {
- hasPermission = false;
- } else {
- hasPermission = userPermission.getRank() >= permission.getRank() && !userPermission.equals(DENY);
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessObject.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessObject.java
deleted file mode 100644
index 644812c690..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessObject.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.access;
-
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-
-/**
- * @author Jeff C. Phillips
- */
-public abstract class AccessObject {
- public abstract void removeFromCache();
-
- public abstract void removeFromDatabase(int subjectId) throws OseeDataStoreException;
-
- public abstract int getId();
-
- public static AccessObject getAccessObject(Object object) {
- if (object instanceof Artifact) {
- return ArtifactAccessObject.getArtifactAccessObject((Artifact) object);
- } else if (object instanceof Branch) {
- return BranchAccessObject.getBranchAccessObject((Branch) object);
- } else
- return null;
- }
-
- public static AccessObject getAccessObjectFromCache(Object object) {
- if (object instanceof Artifact) {
- return ArtifactAccessObject.getArtifactAccessObjectFromCache((Artifact) object);
- } else if (object instanceof Branch) {
- return BranchAccessObject.getBranchAccessObjectFromCache((Branch) object);
- } else
- return null;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/ArtifactAccessObject.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/ArtifactAccessObject.java
deleted file mode 100644
index d5af43f9d2..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/ArtifactAccessObject.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.access;
-
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-
-/**
- * @author Jeff C. Phillips
- */
-public class ArtifactAccessObject extends AccessObject {
-
- private final Integer artId;
- private final Integer branchId;
- private static final DoubleKeyHashMap<Integer, Integer, ArtifactAccessObject> cache =
- new DoubleKeyHashMap<Integer, Integer, ArtifactAccessObject>();
-
- @Override
- public int hashCode() {
- int result = 17;
- result = 31 * result + artId;
- result = 31 * result + branchId;
- return result;
- }
-
- public ArtifactAccessObject(Integer artId, Integer branchId) {
- super();
- this.artId = artId;
- this.branchId = branchId;
- }
-
- public Integer getArtId() {
- return artId;
- }
-
- @Override
- public int getId() {
- return branchId;
- }
-
- @Override
- public void removeFromCache() {
- cache.remove(artId, branchId);
- }
-
- @Override
- public void removeFromDatabase(int subjectId) throws OseeDataStoreException {
- final String DELETE_ARTIFACT_ACL =
- "DELETE FROM OSEE_ARTIFACT_ACL WHERE privilege_entity_id = ? AND art_id =? AND branch_id =?";
- ConnectionHandler.runPreparedUpdate(DELETE_ARTIFACT_ACL, subjectId, artId, branchId);
- }
-
- public static ArtifactAccessObject getArtifactAccessObject(Artifact artifact) {
- Integer artId = artifact.getArtId();
- Integer branchId = artifact.getBranch().getId();
- return getArtifactAccessObject(artId, branchId);
- }
-
- public static ArtifactAccessObject getArtifactAccessObject(Integer artId, Integer branchId) {
- ArtifactAccessObject accessObject = cache.get(artId, branchId);
-
- if (accessObject == null) {
- accessObject = new ArtifactAccessObject(artId, branchId);
- cache.put(artId, branchId, accessObject);
- }
- return accessObject;
- }
-
- public static AccessObject getArtifactAccessObjectFromCache(Artifact art) {
- return getArtifactAccessObjectFromCache(art.getArtId(), art.getBranch().getId());
- }
-
- public static AccessObject getArtifactAccessObjectFromCache(Integer artId2, Integer branchId2) {
- return cache.get(artId2, branchId2);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof ArtifactAccessObject)) {
- return false;
- }
- ArtifactAccessObject ao = (ArtifactAccessObject) obj;
- return ao.artId.equals(this.artId) && ao.branchId.equals(this.branchId);
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/BranchAccessObject.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/BranchAccessObject.java
deleted file mode 100644
index d56c43749b..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/BranchAccessObject.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.access;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-
-/**
- * @author Jeff C. Phillips
- */
-public class BranchAccessObject extends AccessObject {
- private final int branchId;
- private static final Map<Integer, BranchAccessObject> cache = new HashMap<Integer, BranchAccessObject>();
-
- @Override
- public int hashCode() {
- int result = 17;
- result = 31 * result + branchId;
- return result;
- }
-
- public BranchAccessObject(int branchId) {
- this.branchId = branchId;
- }
-
- @Override
- public int getId() {
- return branchId;
- }
-
- @Override
- public void removeFromCache() {
- cache.remove(branchId);
- }
-
- @Override
- public void removeFromDatabase(int subjectId) throws OseeDataStoreException {
- final String DELETE_BRANCH_ACL = "DELETE FROM OSEE_BRANCH_ACL WHERE privilege_entity_id = ? AND branch_id =?";
- ConnectionHandler.runPreparedUpdate(DELETE_BRANCH_ACL, subjectId, branchId);
- }
-
- public static BranchAccessObject getBranchAccessObject(Branch branch) {
- return getBranchAccessObject(branch.getId());
- }
-
- public static BranchAccessObject getBranchAccessObject(Integer branchId) {
- BranchAccessObject branchAccessObject;
- if (cache.containsKey(branchId)) {
- branchAccessObject = cache.get(branchId);
- } else {
- branchAccessObject = new BranchAccessObject(branchId);
- cache.put(branchId, branchAccessObject);
- }
- return branchAccessObject;
- }
-
- public static BranchAccessObject getBranchAccessObjectFromCache(Branch branch) {
- Integer branchId = branch.getId();
- return cache.get(branchId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof BranchAccessObject)) {
- return false;
- }
- return branchId == ((BranchAccessObject) obj).branchId;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/NoPoliciesException.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/NoPoliciesException.java
deleted file mode 100644
index da06389ba4..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/NoPoliciesException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.access;
-
-public class NoPoliciesException extends SecurityException {
-
- private static final long serialVersionUID = 7021179561030107435L;
-
- public NoPoliciesException() {
- super("NoPoliciesException");
- }
-
- public NoPoliciesException(String fname) {
- super(fname + " has no policies.");
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/PermissionList.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/PermissionList.java
deleted file mode 100644
index b0c9794090..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/PermissionList.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.access;
-
-import java.util.ArrayList;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-
-/**
- * @author Jeff C. Phillips
- */
-public class PermissionList {
-
- private ArrayList<PermissionEnum> permissions = new ArrayList<PermissionEnum>();
-
- public PermissionList() {
- super();
-
- }
-
- /**
- * @return permission list.
- */
- public ArrayList<PermissionEnum> getPermissions() {
- return permissions;
- }
-
- public void addPermission(PermissionEnum permission) {
- permissions.add(permission);
- }
-
- public void resetPermissionList() {
- for (int i = 0; i < permissions.size(); i++) {
- permissions.remove(i);
- }
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index fea3ca464f..99085eace7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -61,6 +61,7 @@ import org.eclipse.osee.framework.core.model.event.IBasicGuidArtifact;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.model.type.AttributeType;
import org.eclipse.osee.framework.core.model.type.RelationType;
+import org.eclipse.osee.framework.core.services.IAccessControlService;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
@@ -78,7 +79,6 @@ import org.eclipse.osee.framework.messaging.event.skynet.event.SkynetAttributeCh
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.annotation.ArtifactAnnotation;
import org.eclipse.osee.framework.skynet.core.artifact.annotation.AttributeAnnotationManager;
import org.eclipse.osee.framework.skynet.core.artifact.annotation.IArtifactAnnotation;
@@ -145,7 +145,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* A historical artifact always corresponds to a fixed revision of an artifact
- *
+ *
* @return whether this artifact represents a fixed revision
*/
public boolean isHistorical() {
@@ -172,7 +172,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* All the artifacts related to this artifact by relations of type relationTypeName are returned in a list order
* based on the stored relation order
- *
+ *
* @param relationTypeName
* @return the artifacts related to this artifact by relations of type relationTypeName
* @throws ArtifactDoesNotExist
@@ -225,7 +225,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Check if artifacts are related to each other by relation type
- *
+ *
* @param relationEnum
* @param other artifact to check
* @return whether they are related
@@ -239,7 +239,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Get the exactly one artifact related to this artifact by relations of type relationType are returned in a list
* order based on
- *
+ *
* @param relationType
* @return the related artifact
* @throws ArtifactDoesNotExist
@@ -330,7 +330,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Determines if this artifact type equals, or is a sub-type of, the artifact type specified by the
* <code>otherType</code> parameter.
- *
+ *
* @param artifactTypeName
* @return whether this artifact's type or any of its super-types (any ancestor type) are the specified type
* @throws OseeDataStoreException
@@ -343,7 +343,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Determines if this artifact type equals, or is a sub-type of, the artifact type specified by the
* <code>otherType</code> parameter.
- *
+ *
* @param oseeType
* @return
* @throws OseeCoreException
@@ -480,7 +480,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Creates an instance of <code>Attribute</code> of the given attribute type. This method should not be called by
* applications. Use addAttribute() instead
- *
+ *
* @param <T>
* @param attributeType
* @return new Attribute
@@ -525,7 +525,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* The use of this method is discouraged since it directly returns Attributes.
- *
+ *
* @param <T>
* @param attributeTypeName
* @param value
@@ -543,7 +543,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* The use of this method is discouraged since it directly returns Attributes.
- *
+ *
* @param <T>
* @param attributeTypeName
* @param value
@@ -555,7 +555,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* The use of this method is discouraged since it directly returns Attributes.
- *
+ *
* @return attributes All attributes including deleted and artifact deleted
* @throws OseeCoreException
*/
@@ -565,7 +565,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* The use of this method is discouraged since it directly returns Attributes.
- *
+ *
* @return attributes All attributes of the specified type name including deleted and artifact deleted
* @throws OseeCoreException
*/
@@ -575,7 +575,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* The use of this method is discouraged since it directly returns Attributes.
- *
+ *
* @return attributes
* @throws OseeCoreException
*/
@@ -595,7 +595,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* The use of this method is discouraged since it directly returns Attributes.
- *
+ *
* @param <T>
* @param attributeTypeName
* @throws OseeCoreException
@@ -641,7 +641,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Deletes all attributes of the given type, if any
- *
+ *
* @param attributeTypeName
* @throws OseeCoreException
*/
@@ -653,7 +653,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Deletes all attributes of the given type, if any
- *
+ *
* @param attributeTypeName
* @throws OseeCoreException
*/
@@ -724,7 +724,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
* invalid.<br>
* <br>
* Used for quick access to attribute value that should only have 0 or 1 instances of the attribute.
- *
+ *
* @param <T>
* @param attributeTypeName
* @return sole attribute value
@@ -760,7 +760,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
* defaultReturnValue.<br>
* <br>
* Used for display purposes where toString() of attribute is to be displayed.
- *
+ *
* @param attributeTypeName
* @param defaultReturnValue return value if attribute instance does not exist
* @return attribute value
@@ -795,7 +795,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
* defaultReturnValue.<br>
* <br>
* Used for purposes where attribute value of specified type is desired.
- *
+ *
* @param <T>
* @param attributeTypeName
* @param defaultReturnValue
@@ -836,7 +836,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
* NOTE: Use only for inline calls. This method returns identical data as
* getSoleTAttributeValue(attributeTypeName,defaultReturnValue) but provides an extra parameter that allows it to be
* called within another method call because it specifically defines the return type as clazz
- *
+ *
* @param <T>
* @param attributeTypeName
* @param defaultReturnValue
@@ -852,7 +852,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Delete attribute if exactly one exists. Does nothing if attribute does not exist and throw MultipleAttributesExist
* is more than one instance of the attribute type exsits for this artifact
- *
+ *
* @param attributeTypeName
* @throws OseeCoreException
*/
@@ -886,7 +886,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Used on attribute types with no more than one instance. If the attribute exists, it's value is changed, otherwise
* a new attribute is added and its value set.
- *
+ *
* @param <T>
* @param attributeTypeName
* @param value
@@ -939,7 +939,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
* All existing attributes matching a new value will be left untouched. Then for any remaining values, other existing
* attributes will be changed to match or if need be new attributes will be added to stored these values. Finally any
* excess attributes will be deleted.
- *
+ *
* @param attributeType
* @param newValues
* @throws OseeCoreException
@@ -952,7 +952,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
* All existing attributes matching a new value will be left untouched. Then for any remaining values, other existing
* attributes will be changed to match or if need be new attributes will be added to stored these values. Finally any
* excess attributes will be deleted.
- *
+ *
* @param attributeTypeName
* @param newValues
* @throws OseeCoreException
@@ -997,7 +997,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* adds a new attribute of the type named attributeTypeName and assigns it the given value
- *
+ *
* @param <T>
* @param attributeTypeName
* @param value
@@ -1009,7 +1009,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* adds a new attribute of the type named attributeTypeName and assigns it the given value
- *
+ *
* @param <T>
* @param attributeType
* @param value
@@ -1022,7 +1022,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* adds a new attribute of the type named attributeTypeName. The attribute is set to the default value for its type,
* if any.
- *
+ *
* @param attributeType
* @throws OseeCoreException
*/
@@ -1033,7 +1033,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* adds a new attribute of the type named attributeTypeName. The attribute is set to the default value for its type,
* if any.
- *
+ *
* @param attributeType
* @throws OseeCoreException
*/
@@ -1043,7 +1043,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* adds a new attribute of the type named attributeTypeName and assigns it the given value
- *
+ *
* @param attributeTypeName
* @param value
* @throws OseeCoreException
@@ -1056,7 +1056,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* we do not what duplicated enumerated values so this method silently returns if the specified attribute type is
* enumerated and value is already present
- *
+ *
* @param <T>
* @param attributeTypeName
* @param value
@@ -1125,7 +1125,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* This is used to mark that the artifact deleted.
- *
+ *
* @throws OseeCoreException
*/
public void internalSetDeleted() throws OseeCoreException {
@@ -1194,10 +1194,14 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
return hasDirtyAttributes() || hasDirtyRelations() || hasDirtyArtifactType();
}
+ private IAccessControlService getAccessControlService() throws OseeCoreException {
+ return Activator.getInstance().getAccessControlService();
+ }
+
public boolean isReadOnly() {
try {
- return isDeleted() || isHistorical() || !getBranch().isEditable() || !AccessControlManager.hasPermission(this,
- PermissionEnum.WRITE);
+ return isDeleted() || isHistorical() || !getBranch().isEditable() || !getAccessControlService().hasPermission(
+ this, PermissionEnum.WRITE);
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
return true;
@@ -1217,7 +1221,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Reloads this artifact's attributes and relations back to the last state saved. This will have no effect if the
* artifact has never been saved.
- *
+ *
* @throws OseeCoreException
*/
public void reloadAttributesAndRelations() throws OseeCoreException {
@@ -1236,7 +1240,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
}
private final void persistAttributes(SkynetTransaction transaction) throws OseeCoreException {
- if (!UserManager.duringMainUserCreation() && !AccessControlManager.hasPermission(getBranch(),
+ if (!UserManager.duringMainUserCreation() && !getAccessControlService().hasPermission(getBranch(),
PermissionEnum.WRITE)) {
throw new OseeArgumentException(
"No write permissions for the branch that this artifact belongs to:" + getBranch());
@@ -1278,7 +1282,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Returns all of the descendants through the primary decomposition tree that have a particular human readable id.
* This will not return the called upon node if the name matches since it can not be a descendant of itself.
- *
+ *
* @param humanReadableId The human readable id text to match against.
* @param caseSensitive Whether to use case sensitive matching.
* @return <code>Collection</code> of <code>Artifact</code>'s that match.
@@ -1302,7 +1306,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
* Starting from this artifact, walks down the child hierarchy based on the list of child names provided and returns
* the child of the last name provided. ArtifactDoesNotExist exception is thrown ff any child along the path does not
* exist.
- *
+ *
* @param names
* @return child at the leaf (bottom) of the specified hierarchy.
* @throws OseeCoreException
@@ -1344,7 +1348,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Remove artifact from a specific branch in the database
- *
+ *
* @throws OseeCoreException
*/
public void purgeFromBranch() throws OseeCoreException {
@@ -1429,7 +1433,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Creates new relations that don't already exist and removes relations to artifacts that are not in collection
- *
+ *
* @param relationSide
* @param artifacts
* @throws OseeCoreException
@@ -1518,7 +1522,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Return true if this artifact any of it's links specified or any of the artifacts on the other side of the links
* are dirty
- *
+ *
* @param links
*/
public String isRelationsAndArtifactsDirty(Set<IRelationEnumeration> links) {
@@ -1555,7 +1559,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Creates a new artifact and duplicates all of its attribute data.
- *
+ *
* @throws OseeCoreException
*/
public Artifact duplicate(Branch branch) throws OseeCoreException {
@@ -1582,7 +1586,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* An artifact reflected about its own branch returns itself. Otherwise a new artifact is introduced on the
* destinationBranch
- *
+ *
* @param destinationBranch
* @return the newly created artifact or this artifact if the destinationBranch is this artifact's branch
* @throws OseeCoreException
@@ -1698,7 +1702,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Changes the artifact type.
- *
+ *
* @param artifactType
* @throws OseeDataStoreException
*/
@@ -1725,7 +1729,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Since artifact names are free text it is important to reformat the name to ensure it is suitable as an element
* name
- *
+ *
* @return artifact name in a form that is valid as an XML element
*/
public String getSafeName() {
@@ -1886,7 +1890,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Return relations that exist between artifacts
- *
+ *
* @throws ArtifactDoesNotExist
*/
public ArrayList<RelationLink> internalGetRelations(Artifact artifact) throws OseeCoreException {
@@ -1909,7 +1913,7 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
/**
* Return relations that exist between artifacts of type side
- *
+ *
* @throws OseeCoreException
*/
@Deprecated
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java
index 395f27d1b6..2f56d22a79 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpCommitDataRequester.java
@@ -21,12 +21,12 @@ import org.eclipse.osee.framework.core.message.BranchCommitRequest;
import org.eclipse.osee.framework.core.message.BranchCommitResponse;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.TransactionRecord;
+import org.eclipse.osee.framework.core.services.IAccessControlService;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
@@ -59,9 +59,13 @@ public class HttpCommitDataRequester {
}
}
+ private static IAccessControlService getAccessControlService() throws OseeCoreException {
+ return Activator.getInstance().getAccessControlService();
+ }
+
private static void handleResponse(BranchCommitResponse response, Branch sourceBranch) throws OseeCoreException {
TransactionRecord newTransaction = response.getTransaction();
- AccessControlManager.removeAllPermissionsFromBranch(null, sourceBranch);
+ getAccessControlService().removePermissions(sourceBranch);
// Update commit artifact cache with new information
if (sourceBranch.getAssociatedArtifact().getArtId() > 0) {
TransactionManager.cacheCommittedArtifactTransaction((IArtifact) sourceBranch.getAssociatedArtifact(),
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java
index 60c980aeda..695bd70e6b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/Activator.java
@@ -15,14 +15,18 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.enums.OseeServiceTrackerId;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.services.IAccessControlService;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
import org.eclipse.osee.framework.core.services.IOseeModelFactoryServiceProvider;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
+import org.eclipse.osee.framework.core.util.AbstractTrackingHandler;
+import org.eclipse.osee.framework.core.util.ServiceDependencyTracker;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider;
import org.eclipse.osee.framework.lifecycle.ILifecycleService;
@@ -34,9 +38,13 @@ import org.eclipse.osee.framework.skynet.core.attribute.HttpAttributeTagger;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager;
import org.eclipse.osee.framework.skynet.core.event.RemoteEventManager2;
+import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransactionAccessHandler;
+import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransactionCheckPoint;
+import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransactionHandler;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceRegistration;
import org.osgi.util.tracker.ServiceTracker;
@@ -50,6 +58,7 @@ public class Activator implements BundleActivator, IOseeModelFactoryServiceProvi
private final Map<OseeServiceTrackerId, ServiceTracker> mappedTrackers;
private final List<ServiceRegistration> services;
private BundleContext context;
+ private ServiceDependencyTracker dependencyTracker;
public Activator() {
this.mappedTrackers = new HashMap<OseeServiceTrackerId, ServiceTracker>();
@@ -77,6 +86,10 @@ public class Activator implements BundleActivator, IOseeModelFactoryServiceProvi
createServiceTracker(context, IOseeModelFactoryService.class, OseeServiceTrackerId.OSEE_FACTORY_SERVICE);
createServiceTracker(context, IOseeDatabaseService.class, OseeServiceTrackerId.OSEE_DATABASE_SERVICE);
createServiceTracker(context, ILifecycleService.class, OseeServiceTrackerId.LIFECYCLE_SERVER);
+ createServiceTracker(context, IAccessControlService.class, OseeServiceTrackerId.OSEE_ACCESS_CONTROL_SERVICE);
+
+ dependencyTracker = new ServiceDependencyTracker(context, new TrackingHandler());
+ dependencyTracker.open();
RemoteEventManager2.getInstance().registerForRemoteEvents();
if (!OseeEventManager.isNewEvents() && !OseeEventManager.isOldEvents()) {
@@ -89,6 +102,10 @@ public class Activator implements BundleActivator, IOseeModelFactoryServiceProvi
HttpAttributeTagger.getInstance().deregisterFromEventManager();
RemoteEventManager.deregisterFromRemoteEventManager();
+ if (dependencyTracker != null) {
+ dependencyTracker.close();
+ }
+
for (ServiceRegistration service : services) {
service.unregister();
}
@@ -144,4 +161,53 @@ public class Activator implements BundleActivator, IOseeModelFactoryServiceProvi
Object service = tracker.getService();
return clazz.cast(service);
}
+
+ public IAccessControlService getAccessControlService() throws OseeCoreException {
+ try {
+ Bundle bundle = Platform.getBundle("org.eclipse.osee.framework.access");
+ if (bundle.getState() != Bundle.ACTIVE) {
+ bundle.start();
+ }
+ } catch (BundleException ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
+ }
+ return getTracker(OseeServiceTrackerId.OSEE_ACCESS_CONTROL_SERVICE, IAccessControlService.class);
+ }
+
+ private static final class TrackingHandler extends AbstractTrackingHandler {
+
+ private static final Class<?>[] DEPENDENCIES = new Class[] {ILifecycleService.class, IAccessControlService.class};
+
+ private SkynetTransactionHandler handler;
+ private ILifecycleService lifecycleService;
+ private IAccessControlService accessService;
+
+ @Override
+ public Class<?>[] getDependencies() {
+ return DEPENDENCIES;
+ }
+
+ @Override
+ public void onActivate(BundleContext context, Map<Class<?>, Object> services) {
+ lifecycleService = (ILifecycleService) services.get(ILifecycleService.class);
+ accessService = (IAccessControlService) services.get(IAccessControlService.class);
+ try {
+ handler = new SkynetTransactionAccessHandler(accessService);
+ lifecycleService.addHandler(SkynetTransactionCheckPoint.TYPE, handler);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
+ }
+ }
+
+ @Override
+ public void onDeActivate() {
+ if (handler != null) {
+ try {
+ lifecycleService.removeHandler(SkynetTransactionCheckPoint.TYPE, handler);
+ } catch (OseeCoreException ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
+ }
+ }
+ }
+ }
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
index b22201755c..7d82a0e377 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
@@ -46,7 +46,6 @@ import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.lifecycle.AbstractLifecycleOperation;
import org.eclipse.osee.framework.lifecycle.AbstractLifecyclePoint;
import org.eclipse.osee.framework.lifecycle.ILifecycleService;
-import org.eclipse.osee.framework.lifecycle.access.ChangeMgmtChkPoint;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -187,7 +186,7 @@ public class SkynetTransaction extends AbstractOperation {
* <br>
* IF transaction has not been executed, this is the transactionId that will be used.<br>
* ELSE this is next transaction to be used upon execute
- *
+ *
* @return
* @throws OseeCoreException
*/
@@ -318,7 +317,7 @@ public class SkynetTransaction extends AbstractOperation {
/**
* Always want to persist artifacts on other side of dirty relation. This is necessary for ordering attribute to be
* persisted and desired for other cases.
- *
+ *
* @throws OseeCoreException
*/
private void persitRelatedArtifact(Artifact artifact) throws OseeCoreException {
@@ -363,7 +362,7 @@ public class SkynetTransaction extends AbstractOperation {
private IOperation createLifeCycleOp() throws OseeCoreException {
ILifecycleService service = Activator.getInstance().getLifecycleServices();
AbstractLifecyclePoint<?> lifecyclePoint =
- new ChangeMgmtChkPoint(UserManager.getUser(), new ArrayList<IBasicArtifact<?>>(artifactReferences));
+ new SkynetTransactionCheckPoint(UserManager.getUser(), new ArrayList<IBasicArtifact<?>>(artifactReferences));
return new LifecycleOperation(this, service, lifecyclePoint, getName());
}
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/SkynetTransactionAccessHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionAccessHandler.java
index 3289d389ad..c75c333981 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/SkynetTransactionAccessHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionAccessHandler.java
@@ -8,23 +8,24 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.access.internal;
+package org.eclipse.osee.framework.skynet.core.transaction;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.framework.access.AccessControlService;
-import org.eclipse.osee.framework.access.AccessData;
-import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransactionHandler;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.AccessData;
+import org.eclipse.osee.framework.core.services.IAccessControlService;
+import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
* @author Jeff C. Phillips
*/
public class SkynetTransactionAccessHandler extends SkynetTransactionHandler {
- public final AccessControlService service;
+ public final IAccessControlService service;
- public SkynetTransactionAccessHandler(AccessControlService service) {
+ public SkynetTransactionAccessHandler(IAccessControlService service) {
super();
this.service = service;
}
@@ -32,10 +33,11 @@ public class SkynetTransactionAccessHandler extends SkynetTransactionHandler {
@Override
public IStatus onCheck(IProgressMonitor monitor) {
IStatus status = Status.OK_STATUS;
-
- AccessData accessData = service.getAccessData(getUserArtifact(), getItemsToPersist());
-
- status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error");
+ try {
+ AccessData accessData = service.getAccessData(getUserArtifact(), getItemsToPersist());
+ } catch (OseeCoreException ex) {
+ status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error");
+ }
return status;
}
}
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtChkPoint.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionCheckPoint.java
index 5bbf036feb..fc7e931dba 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtChkPoint.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionCheckPoint.java
@@ -8,35 +8,37 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.lifecycle.access;
+package org.eclipse.osee.framework.skynet.core.transaction;
import java.util.Collection;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.lifecycle.AbstractLifecyclePoint;
+import org.eclipse.osee.framework.lifecycle.AbstractLifecycleVisitor;
+import org.eclipse.osee.framework.lifecycle.AbstractLifecycleVisitor.Type;
/**
* @author Roberto E. Escobar
* @author Jeff C. Phillips
*/
-public class ChangeMgmtChkPoint extends AbstractLifecyclePoint<ChangeMgmtHandler> {
+public class SkynetTransactionCheckPoint extends AbstractLifecyclePoint<SkynetTransactionHandler> {
- public static final Type<ChangeMgmtHandler> TYPE = new Type<ChangeMgmtHandler>();
+ public static final Type<SkynetTransactionHandler> TYPE = new Type<SkynetTransactionHandler>();
private final IBasicArtifact<?> userArtifact;
private final Collection<IBasicArtifact<?>> artsToCheck;
- public ChangeMgmtChkPoint(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artsToCheck) {
+ public SkynetTransactionCheckPoint(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artsToCheck) {
super();
this.userArtifact = userArtifact;
this.artsToCheck = artsToCheck;
}
@Override
- protected void initializeHandlerData(ChangeMgmtHandler handler) {
+ protected void initializeHandlerData(SkynetTransactionHandler handler) {
handler.setData(userArtifact, artsToCheck);
}
@Override
- public Type<ChangeMgmtHandler> getAssociatedType() {
+ public Type<SkynetTransactionHandler> getAssociatedType() {
return TYPE;
}
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionHandler.java
index 379cb4ba73..b1358f6360 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/access/ChangeMgmtHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransactionHandler.java
@@ -8,56 +8,53 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.lifecycle.access;
+package org.eclipse.osee.framework.skynet.core.transaction;
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.lifecycle.Activator;
import org.eclipse.osee.framework.lifecycle.LifecycleOpHandler;
/**
* @author Roberto E. Escobar
* @author Jeff C. Phillips
*/
-public class ChangeMgmtHandler implements LifecycleOpHandler {
- private final IStatus status = Status.OK_STATUS;
+public class SkynetTransactionHandler implements LifecycleOpHandler {
private IBasicArtifact<?> userArtifact;
- private Collection<IBasicArtifact<?>> artsToCheck;
- private final IAccessCheckProvider accessCheckProvider;
+ private Collection<IBasicArtifact<?>> artifactToPersist;
- public ChangeMgmtHandler(IAccessCheckProvider accessCheckProvider) {
- this.accessCheckProvider = accessCheckProvider;
+ public SkynetTransactionHandler() {
+ super();
}
- public void setData(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artsToCheck) {
+ public void setData(IBasicArtifact<?> userArtifact, Collection<IBasicArtifact<?>> artifactToPersist) {
this.userArtifact = userArtifact;
- this.artsToCheck = artsToCheck;
+ this.artifactToPersist = artifactToPersist;
+ }
+
+ public IBasicArtifact<?> getUserArtifact() {
+ return userArtifact;
+ }
+
+ public Collection<IBasicArtifact<?>> getItemsToPersist() {
+ return artifactToPersist;
}
@Override
- public IStatus onCheck(IProgressMonitor monitor) {
- IStatus statusToReturn = status;
-
- for (IBasicArtifact<?> artifactToChk : artsToCheck) {
- if (!accessCheckProvider.canEdit(userArtifact, artifactToChk)) {
- statusToReturn = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error");
- break;
- }
- }
- return statusToReturn;
+ public IStatus onPreCondition(IProgressMonitor monitor) {
+ return Status.OK_STATUS;
}
@Override
public IStatus onPostCondition(IProgressMonitor monitor) {
- return status;
+ return Status.OK_STATUS;
}
@Override
- public IStatus onPreCondition(IProgressMonitor monitor) {
- return status;
+ public IStatus onCheck(IProgressMonitor monitor) {
+ return Status.OK_STATUS;
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF
index 5d1264ad7f..d5d86b1303 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.admin/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.logging,
org.eclipse.osee.framework.plugin.core,
org.eclipse.osee.framework.skynet.core,
- org.eclipse.osee.framework.skynet.core.access,
+ org.eclipse.osee.framework.access,
org.eclipse.osee.framework.skynet.core.artifact,
org.eclipse.osee.framework.skynet.core.event,
org.eclipse.osee.framework.skynet.core.event2,
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
index 2ad357b419..7309c80ceb 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
@@ -15,13 +15,13 @@ import java.util.logging.Level;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.event.BroadcastEventType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event2.BroadcastEvent;
@@ -48,7 +48,7 @@ import org.eclipse.ui.part.ViewPart;
/**
* Allows administration of access for OSEE environment <li>Database tables <li>OSEE user permissions
- *
+ *
* @author Jeff C. Phillips
*/
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
index 14bad18551..721a4cf1fb 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
@@ -20,13 +20,13 @@ import org.eclipse.jface.viewers.CheckboxTreeViewer;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.event.BroadcastEventType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event2.BroadcastEvent;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF
index d46e6f7b0b..5ff5386aba 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Export-Package: org.eclipse.osee.framework.ui.skynet.test,
org.eclipse.osee.framework.ui.skynet.test.cases
Import-Package: com.lowagie.text.pdf;version="2.1.7",
com.lowagie.text.rtf;version="2.1.7",
+ org.eclipse.osee.framework.access,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.model.test.mocks,
org.eclipse.osee.framework.jdk.core.util.windows,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java
index ec74070df6..8ed48a9a7c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java
@@ -19,6 +19,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
@@ -27,7 +28,6 @@ import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
index 85b2f4f26a..49ae98ab50 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
@@ -40,6 +40,7 @@ Import-Package: com.lowagie.text;version="2.1.7",
org.eclipse.core.resources,
org.eclipse.nebula.widgets.calendarcombo,
org.eclipse.nebula.widgets.xviewer,
+ org.eclipse.osee.framework.access,
org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.client.server,
org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java
index 1a07c43239..fa96a46e35 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java
@@ -16,12 +16,12 @@ import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactChangeListener;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java
index c27b3edeb2..906b55fb54 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java
@@ -29,6 +29,7 @@ import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.window.Window;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
@@ -41,7 +42,6 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java
index cca0431677..bab8cd1da3 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java
@@ -17,12 +17,12 @@ import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.preferences.EditorsPreferencePage;
import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java
index ba06682f41..0b8f2c5ea5 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDragDropSupport.java
@@ -14,7 +14,6 @@ import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
index 2337dfc6fb..5b29caa70b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
@@ -38,6 +38,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.window.Window;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -57,7 +58,6 @@ import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
@@ -67,6 +67,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.event.AccessControlEventType;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData.ChangeType;
import org.eclipse.osee.framework.skynet.core.event.IAccessControlEventListener;
import org.eclipse.osee.framework.skynet.core.event.IArtifactModifiedEventListener;
import org.eclipse.osee.framework.skynet.core.event.IArtifactsChangeTypeEventListener;
@@ -76,7 +77,6 @@ import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventLi
import org.eclipse.osee.framework.skynet.core.event.IRelationModifiedEventListener;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData.ChangeType;
import org.eclipse.osee.framework.skynet.core.event2.AccessControlEvent;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java
index 81f9b28fc4..8e2a46e67d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java
@@ -19,6 +19,7 @@ import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
@@ -31,7 +32,6 @@ import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.annotation.ArtifactAnnotation;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java
index 0919f7a327..f7a66dd1b4 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java
@@ -16,14 +16,14 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.logging.Level;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.osee.framework.access.AccessControlData;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlData;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -43,7 +43,7 @@ import org.eclipse.swt.widgets.Shell;
/**
* GUI that is used to maintain an <Code>Artifact</Code> access control list.
- *
+ *
* @author Jeff C. Phillips
*/
public class PolicyDialog extends Dialog {
@@ -155,7 +155,7 @@ public class PolicyDialog extends Dialog {
cmbPermissionLevel = new Combo(composite, SWT.NONE);
btnAdd = new Button(composite, SWT.PUSH);
btnAdd.setText("Add");
- (new Label(composite, SWT.NONE)).setText(" NOTE: Higher permission rank overrides lower rank.");
+ new Label(composite, SWT.NONE).setText(" NOTE: Higher permission rank overrides lower rank.");
chkChildrenPermission = new Button(mainComposite, SWT.CHECK);
chkChildrenPermission.setText("Set permission for artifact's default hierarchy descendents.");
@@ -191,7 +191,10 @@ public class PolicyDialog extends Dialog {
@Override
protected void okPressed() {
for (AccessControlData data : policyTableViewer.getAccessControlList().values()) {
- if (data.isDirty()) data.persist(chkChildrenPermission.getSelection());
+ if (data.isDirty()) {
+ boolean isRecursionAllowed = chkChildrenPermission.getSelection();
+ AccessControlManager.persistPermission(data, isRecursionAllowed);
+ }
}
super.okPressed();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java
index 3f07272449..4ce817aad6 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java
@@ -14,8 +14,8 @@ import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider;
+import org.eclipse.osee.framework.access.AccessControlData;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlData;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.swt.ImageManager;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java
index 57ba792b83..7630dd2642 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.ui.skynet.access;
import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlData;
+import org.eclipse.osee.framework.access.AccessControlData;
import org.eclipse.swt.widgets.TreeItem;
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java
index 45c9405a35..b617084ffd 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java
@@ -20,12 +20,12 @@ import org.eclipse.jface.viewers.CheckboxCellEditor;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.nebula.widgets.xviewer.XViewer;
+import org.eclipse.osee.framework.access.AccessControlData;
+import org.eclipse.osee.framework.access.AccessControlManager;
+import org.eclipse.osee.framework.access.AccessObject;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlData;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessObject;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.PolicyTableXViewerFactory;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java
index 69f0b54fed..09c694f614 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java
@@ -13,12 +13,12 @@ package org.eclipse.osee.framework.ui.skynet.artifact;
import java.net.HttpURLConnection;
import java.util.Map;
import java.util.logging.Level;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.client.server.HttpResponse;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.jdk.core.type.MutableBoolean;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.httpRequests.BaseArtifactLoopbackCmd;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
index 64ab91c28c..4b687b7341 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
@@ -16,6 +16,7 @@ import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
@@ -23,7 +24,6 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Displays;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java
index 5bc7a6b5cd..916d0d06c9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java
@@ -18,13 +18,13 @@ import java.util.Set;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.plugin.OseeUiActions;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java
index b5e2b8ad82..76ffb1baea 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java
@@ -17,9 +17,9 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.ui.plugin.PluginUiImage;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java
index 0fdaa576b2..d7efac0666 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java
@@ -28,8 +28,8 @@ import org.eclipse.osee.framework.database.core.AbstractDbTxOperation;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.JoinUtility;
-import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.database.core.JoinUtility.ExportImportJoinQuery;
+import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.plugin.core.util.OseeData;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java
index 6046c47440..c8a6e2a86d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java
@@ -15,12 +15,12 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeAccessDeniedException;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.util.AXml;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java
index 168a545961..16e139a7cb 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/AccessControlHandler.java
@@ -15,11 +15,11 @@ import java.util.logging.Level;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java
index 1c449146aa..43df1251b2 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java
@@ -21,11 +21,11 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.word.WordUtil;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java
index c74534a513..bb46883f90 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java
@@ -16,11 +16,11 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java
index 3e710f2125..107392542e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/OpenMassArtifactEditorHandler.java
@@ -14,9 +14,9 @@ import java.util.List;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java
index 360b0b7560..55efb63646 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java
@@ -20,11 +20,11 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java
index 9ec771da41..557408e8b9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java
@@ -20,9 +20,9 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.change.Change;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java
index 057ac4d53c..4097151247 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.database.core.DbTransaction;
@@ -28,7 +29,6 @@ import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java
index 9d75cba444..5e12d234a8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java
@@ -14,11 +14,11 @@ import java.util.List;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java
index b8d2aa667a..2cdcc57395 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchHandler.java
@@ -16,12 +16,12 @@ import java.util.List;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
index 83c3a05efa..a51dda4bf5 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java
@@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -27,7 +28,6 @@ import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.IExceptionableRunnable;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java
index 800dca0747..bf0ad28966 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/DeleteBranchHandler.java
@@ -16,9 +16,9 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
index dbea182859..fa4ac6083b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java
@@ -14,13 +14,13 @@ import java.util.List;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java
index 1fbf725081..7a5f109e64 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java
@@ -16,11 +16,11 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java
index af503c8fe5..37de652dc0 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java
@@ -18,11 +18,11 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java
index 9e4e182f7d..66c04a0b03 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java
@@ -16,12 +16,12 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java
index 41a4365aaf..672bcec254 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/SetAssociatedBranchArtifactHandler.java
@@ -15,11 +15,11 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java
index d847407963..1f616f68e9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java
@@ -17,9 +17,9 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.utility.DbUtil;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java
index 242fb48810..beb296ead8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java
@@ -17,9 +17,9 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.utility.DbUtil;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java
index 2b9ce26451..b5b4eed4f9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.TransactionRecord;
@@ -26,7 +27,6 @@ import org.eclipse.osee.framework.jdk.core.type.MutableInteger;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java
index ab98963744..4158e90c21 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoHandler.java
@@ -16,6 +16,7 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -23,7 +24,6 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java
index e7b4db52d3..26effabfa4 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.commit;
import java.util.List;
-
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java
index 1e8ddf366a..8decab5000 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java
@@ -15,11 +15,11 @@ import java.util.Collection;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
import org.eclipse.osee.framework.skynet.core.change.Change;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/AbstractEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/AbstractEditorHandler.java
index 6c8ee1eb03..913ae54c93 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/AbstractEditorHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/AbstractEditorHandler.java
@@ -13,9 +13,9 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers.renderer.handlers;
import java.util.List;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.CommandHandler;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java
index 795cb47b50..c6447714ba 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WholeDocumentEditorHandler.java
@@ -14,10 +14,10 @@ import java.util.logging.Level;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers;
import org.eclipse.osee.framework.ui.skynet.render.WholeDocumentRenderer;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java
index aba2b8c14a..edfabbe2a8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/WordEditorHandler.java
@@ -14,10 +14,10 @@ import java.util.logging.Level;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers;
import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java
index 45eecca0cf..ac27cd37ae 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java
@@ -22,10 +22,10 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -47,7 +47,7 @@ import org.eclipse.ui.PlatformUI;
/**
* Provided so all OSEE context menus (and programatic manipulations) can share the same menu items, dialogs,
* permissions checks and code.
- *
+ *
* @author Donald G. Dunne
*/
public class GlobalMenu {
@@ -248,7 +248,7 @@ public class GlobalMenu {
/**
* This method is provided for programatic access to delete artifact. No permissions are checked. Preferred use is by
* adding item as menu item.
- *
+ *
* @return the deleteArtifactAction
*/
public Action getDeleteArtifactAction() {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java
index 799554ebd0..236ffb8f43 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenuPermissions.java
@@ -12,11 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.menu;
import java.util.Arrays;
import java.util.Collection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
@@ -29,12 +29,12 @@ public class GlobalMenuPermissions {
private boolean readPermission;
private boolean fullAccess;
private String subjectFromLockedObjectName;
- private boolean hasArtifacts;
+ private final boolean hasArtifacts;
/**
* Return permission set. This is a one-shot deal at the time of instantiation. Permissions are not kept up to date
* with changes to getSelectedArtifacts in given globalMenuHelper. Must be called again to get refreshed permissions.
- *
+ *
* @param globalMenuHelper
*/
public GlobalMenuPermissions(IGlobalMenuHelper globalMenuHelper) throws OseeCoreException {
@@ -43,7 +43,7 @@ public class GlobalMenuPermissions {
/**
* Return permission set for given artifact.
- *
+ *
* @param artifact
*/
public GlobalMenuPermissions(Artifact artifact) throws OseeCoreException {
@@ -52,7 +52,7 @@ public class GlobalMenuPermissions {
/**
* Return permission set for given artifacts.
- *
+ *
* @param artifacts
*/
public GlobalMenuPermissions(Collection<Artifact> artifacts) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java
index 9316a04f42..936ee68d73 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java
@@ -14,10 +14,10 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.ArtifactContentProvider;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java
index c022f3558c..143f7e8db0 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandler.java
@@ -17,6 +17,7 @@ import java.util.LinkedList;
import java.util.List;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
@@ -26,7 +27,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.OseeSql;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java
index 2eea687a80..de94ba8a19 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java
@@ -12,9 +12,9 @@ package org.eclipse.osee.framework.ui.skynet.update;
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
import org.eclipse.jface.viewers.StyledString.Styler;
import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
import org.eclipse.swt.SWT;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java
index 7e79bcd909..8fcba80b0c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.util.email;
import java.util.HashSet;
import java.util.Set;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
@@ -21,14 +22,13 @@ import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
-import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java
index 4c05d37f44..65e85ac876 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java
@@ -16,8 +16,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.core.runtime.IStatus;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java
index d9da892e8c..2ce98aecab 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.framework.ui.skynet.widgets;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
index 1cfdc49bbf..1152323124 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java
@@ -20,13 +20,13 @@ import org.eclipse.nebula.widgets.xviewer.action.ColumnMultiEditAction;
import org.eclipse.nebula.widgets.xviewer.action.TableCustomizationAction;
import org.eclipse.nebula.widgets.xviewer.action.ViewSelectedCellDataAction;
import org.eclipse.nebula.widgets.xviewer.action.ViewTableReportAction;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.event.BranchEventType;
import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
import org.eclipse.osee.framework.skynet.core.event.ITransactionsDeletedEventListener;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java
index 6f711751bf..93a87132cd 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java
@@ -12,11 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xBranch;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
+import org.eclipse.core.runtime.preferences.IPreferencesService;
+import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
index 9104b3971c..d1af3682f4 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewerFactory.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xBranch;
import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
import org.eclipse.swt.SWT;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java
index 1f004615a9..cf7de42b19 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java
@@ -19,13 +19,13 @@ import java.util.List;
import java.util.logging.Level;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java
index f1ebfbbb8f..7471786956 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java
@@ -14,16 +14,15 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xmerge;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict;
import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
index c87fb703c4..245f34998a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
@@ -27,6 +27,7 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
@@ -35,7 +36,6 @@ import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.IActionable;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict;
diff --git a/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
index 193254903a..c1fa310e2f 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ote.ui.define/META-INF/MANIFEST.MF
@@ -35,6 +35,7 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.lowagie.text;version="2.1.7",
org.apache.commons.lang;version="2.4.0",
+ org.eclipse.osee.framework.access,
org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.client.server,
org.eclipse.osee.framework.core.data,
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/EditDispositionAction.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/EditDispositionAction.java
index 189ea04ac5..b7ad88241b 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/EditDispositionAction.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/EditDispositionAction.java
@@ -13,12 +13,12 @@ package org.eclipse.osee.ote.ui.define.viewers.actions;
import java.util.logging.Level;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
import org.eclipse.osee.ote.define.artifacts.TestRunOperator;
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenInArtifactEditor.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenInArtifactEditor.java
index 1a55093e65..dc560a7e09 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenInArtifactEditor.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/actions/OpenInArtifactEditor.java
@@ -13,12 +13,12 @@ package org.eclipse.osee.ote.ui.define.viewers.actions;
import java.util.logging.Level;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
import org.eclipse.osee.ote.define.artifacts.TestRunOperator;

Back to the top