diff options
56 files changed, 428 insertions, 191 deletions
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java index e68512e7b41..d664d91feb7 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java @@ -90,6 +90,7 @@ import org.eclipse.osee.support.test.util.TestUtil; */ public class PopulateDemoActions extends XNavigateItemAction { + private static boolean DEBUG = false; private final String[] TITLE_PREFIX = new String[] { "Problem with the", "Can't see the", @@ -126,6 +127,8 @@ public class PopulateDemoActions extends XNavigateItemAction { if (DbUtil.isDbInit() || !prompt || prompt && MessageDialog.openConfirm(Displays.getActiveShell(), getName(), getName())) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Populate Demo Database"); + AtsBulkLoad.reloadConfig(true); WorkItemDefinitionFactory.loadDefinitions(true); @@ -174,27 +177,31 @@ public class PopulateDemoActions extends XNavigateItemAction { createNonReqChangeDemoActions(); // Mark all CIS Code "Team Workflows" as Favorites for "Joe Smith" - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Add Favorites"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Add Favorites"); + } for (Artifact art : ArtifactQuery.getArtifactListFromTypeAndName(DemoArtifactTypes.DemoCodeTeamWorkflow, "%Diagram View%", AtsUtil.getAtsBranch())) { new FavoritesManager((AbstractWorkflowArtifact) art).toggleFavorite(false); } // Mark all Tools Team "Team Workflows" as Subscribed for "Joe Smith" - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Add Subscribed"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Add Subscribed"); + } for (Artifact art : ArtifactQuery.getArtifactListFromTypeAndName(DemoArtifactTypes.DemoCodeTeamWorkflow, "%Even%", AtsUtil.getAtsBranch())) { new SubscribeManager((AbstractWorkflowArtifact) art).toggleSubscribe(false); } // Create some tasks off sample workflows - DemoDbTasks.createTasks(); + DemoDbTasks.createTasks(DEBUG); // Create group of sample artifacts - DemoDbGroups.createGroups(); + DemoDbGroups.createGroups(DEBUG); // Create and transition reviews off sample workflows - DemoDbReviews.createReviews(); + DemoDbReviews.createReviews(DEBUG); TestUtil.severeLoggingEnd(monitorLog); OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Populate Complete"); @@ -203,7 +210,9 @@ public class PopulateDemoActions extends XNavigateItemAction { private void createMainWorkingBranchTx() { try { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating SAW_Bld_2 branch off SAW_Bld_1"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating SAW_Bld_2 branch off SAW_Bld_1"); + } // Create SAW_Bld_2 branch off SAW_Bld_1 Branch childBranch = BranchManager.createBaselineBranch(DemoSawBuilds.SAW_Bld_1, DemoSawBuilds.SAW_Bld_2, @@ -221,7 +230,9 @@ public class PopulateDemoActions extends XNavigateItemAction { } private void makeAction1ReqChanges(Artifact actionArt) throws OseeCoreException { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Making Action 1 Requirement Changes"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Making Action 1 Requirement Changes"); + } TeamWorkFlowArtifact reqTeam = null; for (TeamWorkFlowArtifact team : ActionManager.getTeams(actionArt)) { if (team.getTeamDefinition().getName().contains("Req")) { @@ -232,7 +243,9 @@ public class PopulateDemoActions extends XNavigateItemAction { if (reqTeam == null) { throw new OseeArgumentException("Can't locate Req team."); } - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating working branch"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating working branch"); + } Result result = AtsBranchManager.createWorkingBranch(reqTeam, null, false); if (result.isFalse()) { throw new OseeArgumentException( @@ -241,9 +254,12 @@ public class PopulateDemoActions extends XNavigateItemAction { DemoDbUtil.sleep(5000); - for (Artifact art : DemoDbUtil.getSoftwareRequirements(SoftwareRequirementStrs.Robot, reqTeam.getWorkingBranch())) { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - new StringBuilder("Modifying artifact => ").append(art).toString()); + for (Artifact art : DemoDbUtil.getSoftwareRequirements(DEBUG, SoftwareRequirementStrs.Robot, + reqTeam.getWorkingBranch())) { + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + new StringBuilder("Modifying artifact => ").append(art).toString()); + } art.setSoleAttributeValue(CoreAttributeTypes.Csci, DemoCscis.Navigation.name()); art.setSoleAttributeValue(CoreAttributeTypes.Subsystem, DemoSubsystems.Navigation.name()); Artifact navArt = @@ -253,9 +269,12 @@ public class PopulateDemoActions extends XNavigateItemAction { art.persist(); } - for (Artifact art : DemoDbUtil.getSoftwareRequirements(SoftwareRequirementStrs.Event, reqTeam.getWorkingBranch())) { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - new StringBuilder("Modifying artifact => ").append(art).toString()); + for (Artifact art : DemoDbUtil.getSoftwareRequirements(DEBUG, SoftwareRequirementStrs.Event, + reqTeam.getWorkingBranch())) { + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + new StringBuilder("Modifying artifact => ").append(art).toString()); + } art.setSoleAttributeValue(CoreAttributeTypes.Csci, DemoCscis.Interface.name()); art.setSoleAttributeValue(CoreAttributeTypes.Subsystem, DemoSubsystems.Communications.name()); Artifact robotArt = @@ -266,18 +285,22 @@ public class PopulateDemoActions extends XNavigateItemAction { } // Delete two artifacts - for (Artifact art : DemoDbUtil.getSoftwareRequirements(SoftwareRequirementStrs.daVinci, + for (Artifact art : DemoDbUtil.getSoftwareRequirements(DEBUG, SoftwareRequirementStrs.daVinci, reqTeam.getWorkingBranch())) { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - new StringBuilder("Deleting artifact => ").append(art).toString()); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + new StringBuilder("Deleting artifact => ").append(art).toString()); + } art.deleteAndPersist(); } // Add three new artifacts - Artifact parentArt = DemoDbUtil.getInterfaceInitializationSoftwareRequirement(reqTeam.getWorkingBranch()); + Artifact parentArt = DemoDbUtil.getInterfaceInitializationSoftwareRequirement(DEBUG, reqTeam.getWorkingBranch()); for (int x = 1; x < 4; x++) { String name = "Robot Interface Init " + x; - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Adding artifact => " + name); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Adding artifact => " + name); + } Artifact newArt = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, parentArt.getBranch(), name); newArt.setSoleAttributeValue(CoreAttributeTypes.Subsystem, DemoSubsystems.Communications.name()); @@ -287,7 +310,9 @@ public class PopulateDemoActions extends XNavigateItemAction { } DemoDbUtil.sleep(2000L); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Committing branch"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Committing branch"); + } Job job = AtsBranchManager.commitWorkingBranch(reqTeam, false, true, reqTeam.getTargetedVersion().getParentBranch(), true); @@ -296,7 +321,9 @@ public class PopulateDemoActions extends XNavigateItemAction { } catch (InterruptedException ex) { OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Completing Action"); } - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Completing Action"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Completing Action"); + } } private void makeAction3ReqChanges(Artifact actionArt) throws Exception { @@ -310,7 +337,9 @@ public class PopulateDemoActions extends XNavigateItemAction { if (reqTeam == null) { throw new OseeArgumentException("Can't locate Req team."); } - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating working branch"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating working branch"); + } Result result = AtsBranchManager.createWorkingBranch(reqTeam, null, false); if (result.isFalse()) { throw new OseeArgumentException( @@ -320,10 +349,12 @@ public class PopulateDemoActions extends XNavigateItemAction { DemoDbUtil.sleep(5000); Artifact branchArtifact = - DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SoftwareRequirement, DemoDbUtil.HAPTIC_CONSTRAINTS_REQ, - reqTeam.getWorkingBranch()).iterator().next(); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - new StringBuilder("Modifying branch artifact => ").append(branchArtifact).toString()); + DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SoftwareRequirement, + DemoDbUtil.HAPTIC_CONSTRAINTS_REQ, reqTeam.getWorkingBranch()).iterator().next(); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + new StringBuilder("Modifying branch artifact => ").append(branchArtifact).toString()); + } branchArtifact.setSoleAttributeValue(CoreAttributeTypes.Csci, DemoCscis.Interface.name()); branchArtifact.setSoleAttributeValue(CoreAttributeTypes.Subsystem, DemoSubsystems.Communications.name()); Artifact comArt = @@ -333,10 +364,12 @@ public class PopulateDemoActions extends XNavigateItemAction { branchArtifact.persist(); Artifact parentArtifact = - DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SoftwareRequirement, DemoDbUtil.HAPTIC_CONSTRAINTS_REQ, - reqTeam.getWorkingBranch()).iterator().next(); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - new StringBuilder("Modifying parent artifact => ").append(parentArtifact).toString()); + DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SoftwareRequirement, + DemoDbUtil.HAPTIC_CONSTRAINTS_REQ, reqTeam.getWorkingBranch()).iterator().next(); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + new StringBuilder("Modifying parent artifact => ").append(parentArtifact).toString()); + } parentArtifact.setSoleAttributeValue(CoreAttributeTypes.Csci, DemoCscis.Navigation.name()); parentArtifact.setSoleAttributeValue(CoreAttributeTypes.Subsystem, DemoSubsystems.Cognitive_Decision_Aiding.name()); @@ -355,7 +388,9 @@ public class PopulateDemoActions extends XNavigateItemAction { if (reqTeam == null) { throw new OseeArgumentException("Can't locate Req team."); } - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating working branch"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating working branch"); + } Result result = AtsBranchManager.createWorkingBranch(reqTeam, null, false); if (result.isFalse()) { throw new OseeArgumentException( @@ -364,10 +399,12 @@ public class PopulateDemoActions extends XNavigateItemAction { DemoDbUtil.sleep(5000); - for (Artifact art : DemoDbUtil.getSoftwareRequirements(SoftwareRequirementStrs.Functional, + for (Artifact art : DemoDbUtil.getSoftwareRequirements(DEBUG, SoftwareRequirementStrs.Functional, reqTeam.getWorkingBranch())) { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - new StringBuilder("Modifying artifact => ").append(art).toString()); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + new StringBuilder("Modifying artifact => ").append(art).toString()); + } art.setSoleAttributeValue(CoreAttributeTypes.Csci, DemoCscis.Interface.name()); art.setSoleAttributeValue(CoreAttributeTypes.Subsystem, DemoSubsystems.Communications.name()); Artifact comArt = @@ -379,17 +416,22 @@ public class PopulateDemoActions extends XNavigateItemAction { } // Delete one artifacts - for (Artifact art : DemoDbUtil.getSoftwareRequirements(SoftwareRequirementStrs.CISST, reqTeam.getWorkingBranch())) { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - new StringBuilder("Deleting artifact => ").append(art).toString()); + for (Artifact art : DemoDbUtil.getSoftwareRequirements(DEBUG, SoftwareRequirementStrs.CISST, + reqTeam.getWorkingBranch())) { + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + new StringBuilder("Deleting artifact => ").append(art).toString()); + } art.deleteAndPersist(); } // Add two new artifacts - Artifact parentArt = DemoDbUtil.getInterfaceInitializationSoftwareRequirement(reqTeam.getWorkingBranch()); + Artifact parentArt = DemoDbUtil.getInterfaceInitializationSoftwareRequirement(DEBUG, reqTeam.getWorkingBranch()); for (int x = 15; x < 17; x++) { String name = "Claw Interface Init " + x; - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Adding artifact => " + name); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Adding artifact => " + name); + } Artifact newArt = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, parentArt.getBranch(), name); newArt.setSoleAttributeValue(CoreAttributeTypes.Subsystem, DemoSubsystems.Communications.name()); @@ -403,14 +445,23 @@ public class PopulateDemoActions extends XNavigateItemAction { private void createNonReqChangeDemoActions() throws Exception { SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Populate Demo DB - Create Actions"); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_3"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_3"); + } createActions(DemoDbActionData.getNonReqSawActionData(), DemoSawBuilds.SAW_Bld_3.toString(), null, transaction); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_2"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_2"); + } createActions(DemoDbActionData.getNonReqSawActionData(), DemoSawBuilds.SAW_Bld_2.toString(), null, transaction); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_1"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "createNonReqChangeDemoActions - SAW_Bld_1"); + } createActions(DemoDbActionData.getNonReqSawActionData(), DemoSawBuilds.SAW_Bld_1.toString(), TeamState.Completed, transaction); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "createNonReqChangeDemoActions - getGenericActionData"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + "createNonReqChangeDemoActions - getGenericActionData"); + } createActions(DemoDbActionData.getGenericActionData(), null, null, transaction); transaction.execute(); } @@ -419,7 +470,10 @@ public class PopulateDemoActions extends XNavigateItemAction { Set<Artifact> actionArts = new HashSet<Artifact>(); int currNum = 1; for (DemoDbActionData aData : actionDatas) { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Creating " + currNum++ + "/" + actionDatas.size()); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + "Creating " + currNum++ + "/" + actionDatas.size()); + } int x = 0; Date createdDate = new Date(); User createdBy = UserManager.getUser(); @@ -471,8 +525,10 @@ public class PopulateDemoActions extends XNavigateItemAction { private void importRequirements(IOseeBranch branch, String rootArtifactName, IArtifactType requirementType, String filename) throws Exception { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - String.format("Importing \"%s\" requirements on branch \"%s\"", rootArtifactName, branch)); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + String.format("Importing \"%s\" requirements on branch \"%s\"", rootArtifactName, branch)); + } Artifact systemReq = ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.Folder, rootArtifactName, branch); File file = OseeAtsConfigDemoActivator.getInstance().getPluginFile(filename); @@ -500,21 +556,24 @@ public class PopulateDemoActions extends XNavigateItemAction { private void demoDbTraceabilityTx(SkynetTransaction transaction, IOseeBranch branch) { try { Collection<Artifact> systemArts = - DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SystemRequirement, "Robot", branch); + DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SystemRequirement, "Robot", branch); - Collection<Artifact> component = DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.Component, "API", branch); - component.addAll(DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.Component, "Hardware", branch)); - component.addAll(DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.Component, "Sensor", branch)); + Collection<Artifact> component = + DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.Component, "API", branch); + component.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.Component, "Hardware", branch)); + component.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.Component, "Sensor", branch)); Collection<Artifact> subSystemArts = - DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SubsystemRequirement, "Robot", branch); - subSystemArts.addAll(DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SubsystemRequirement, "Video", branch)); - subSystemArts.addAll(DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SubsystemRequirement, "Interface", + DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement, "Robot", branch); + subSystemArts.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement, "Video", branch)); + subSystemArts.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement, + "Interface", branch)); Collection<Artifact> softArts = - DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SoftwareRequirement, "Robot", branch); - softArts.addAll(DemoDbUtil.getArtTypeRequirements(CoreArtifactTypes.SoftwareRequirement, "Interface", branch)); + DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SoftwareRequirement, "Robot", branch); + softArts.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SoftwareRequirement, "Interface", + branch)); // Relate System to SubSystem to Software Requirements for (Artifact systemArt : systemArts) { diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbGroups.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbGroups.java index 149089521f6..b2f7c0cf54d 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbGroups.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbGroups.java @@ -30,11 +30,13 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; public class DemoDbGroups { public static String TEST_GROUP_NAME = "Test Group"; - public static List<TeamWorkFlowArtifact> createGroups() throws Exception { + public static List<TeamWorkFlowArtifact> createGroups(boolean DEBUG) throws Exception { // Create group of all resulting objects List<TeamWorkFlowArtifact> codeWorkflows = new ArrayList<TeamWorkFlowArtifact>(); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Create Groups and add objects"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Create Groups and add objects"); + } Artifact groupArt = UniversalGroup.addGroup(TEST_GROUP_NAME, AtsUtil.getAtsBranch()); for (TeamWorkFlowArtifact codeArt : DemoDbUtil.getSampleCodeWorkflows()) { diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java index afb5867b427..a9d37d3b1a3 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java @@ -46,11 +46,11 @@ import org.eclipse.osee.support.test.util.DemoUsers; */ public class DemoDbReviews { - public static void createReviews() throws Exception { + public static void createReviews(boolean DEBUG) throws Exception { SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Demo Database Config - Create Reviews"); - createPeerToPeerReviews(transaction); - createDecisionReviews(transaction); + createPeerToPeerReviews(DEBUG, transaction); + createDecisionReviews(DEBUG, transaction); transaction.execute(); } @@ -61,12 +61,14 @@ public class DemoDbReviews { * 3) Decision in Complete state w Joe Smith assignee and completed<br> * <br> */ - public static void createDecisionReviews(SkynetTransaction transaction) throws Exception { + public static void createDecisionReviews(boolean DEBUG, SkynetTransaction transaction) throws Exception { Date createdDate = new Date(); User createdBy = UserManager.getUser(); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Create Decision reviews"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Create Decision reviews"); + } TeamWorkFlowArtifact firstTestArt = getSampleReviewTestWorkflows().get(0); TeamWorkFlowArtifact secondTestArt = getSampleReviewTestWorkflows().get(1); @@ -116,9 +118,11 @@ public class DemoDbReviews { * 3) PeerToPeer in Prepare state w Joe Smith assignee and completed<br> * <br> */ - public static void createPeerToPeerReviews(SkynetTransaction transaction) throws Exception { + public static void createPeerToPeerReviews(boolean DEBUG, SkynetTransaction transaction) throws Exception { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Create Peer To Peer reviews"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Create Peer To Peer reviews"); + } TeamWorkFlowArtifact firstCodeArt = DemoDbUtil.getSampleCodeWorkflows().get(0); TeamWorkFlowArtifact secondCodeArt = DemoDbUtil.getSampleCodeWorkflows().get(1); diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java index 27ced47c06a..94c67ed5273 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java @@ -27,8 +27,10 @@ import org.eclipse.osee.support.test.util.DemoUsers; */ public class DemoDbTasks { - public static void createTasks() throws Exception { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Create tasks off code workflows"); + public static void createTasks(boolean DEBUG) throws Exception { + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Create tasks off code workflows"); + } boolean firstTaskWorkflow = true; Date createdDate = new Date(); User createdBy = UserManager.getUser(); diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java index 4ea78b1c759..2b2073f7d4c 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java @@ -66,25 +66,29 @@ public class DemoDbUtil { } } - public static Result isDbPopulatedWithDemoData(Branch branch) throws OseeCoreException { - if (DemoDbUtil.getSoftwareRequirements(SoftwareRequirementStrs.Robot, branch).size() != 6) { + public static Result isDbPopulatedWithDemoData(boolean DEBUG, Branch branch) throws OseeCoreException { + if (DemoDbUtil.getSoftwareRequirements(DEBUG, SoftwareRequirementStrs.Robot, branch).size() != 6) { return new Result( "Expected at least 6 Software Requirements with word \"Robot\". Database is not be populated with demo data."); } return Result.TrueResult; } - public static Collection<Artifact> getSoftwareRequirements(SoftwareRequirementStrs str, Branch branch) throws OseeCoreException { - return getArtTypeRequirements(CoreArtifactTypes.SoftwareRequirement, str.name(), branch); + public static Collection<Artifact> getSoftwareRequirements(boolean DEBUG, SoftwareRequirementStrs str, Branch branch) throws OseeCoreException { + return getArtTypeRequirements(DEBUG, CoreArtifactTypes.SoftwareRequirement, str.name(), branch); } - public static Collection<Artifact> getArtTypeRequirements(IArtifactType artifactType, String artifactNameStr, IOseeBranch branch) throws OseeCoreException { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - "Getting \"" + artifactNameStr + "\" requirement(s) from Branch " + branch.getName()); + public static Collection<Artifact> getArtTypeRequirements(boolean DEBUG, IArtifactType artifactType, String artifactNameStr, IOseeBranch branch) throws OseeCoreException { + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + "Getting \"" + artifactNameStr + "\" requirement(s) from Branch " + branch.getName()); + } Collection<Artifact> arts = ArtifactQuery.getArtifactListFromTypeAndName(artifactType, "%" + artifactNameStr + "%", branch); - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Found " + arts.size() + " Artifacts"); + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Found " + arts.size() + " Artifacts"); + } return arts; } public static enum SoftwareRequirementStrs { @@ -97,9 +101,11 @@ public class DemoDbUtil { }; public static String HAPTIC_CONSTRAINTS_REQ = "Haptic Constraints"; - public static Artifact getInterfaceInitializationSoftwareRequirement(Branch branch) throws OseeCoreException { - OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, - "Getting \"" + INTERFACE_INITIALIZATION + "\" requirement."); + public static Artifact getInterfaceInitializationSoftwareRequirement(boolean DEBUG, Branch branch) throws OseeCoreException { + if (DEBUG) { + OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, + "Getting \"" + INTERFACE_INITIALIZATION + "\" requirement."); + } return ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.SoftwareRequirement, INTERFACE_INITIALIZATION, branch); } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java index ceb151fcdbb..372c0f0578d 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java @@ -23,7 +23,6 @@ import org.eclipse.osee.ats.core.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.workflow.ITeamWorkflowProvider; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -82,10 +81,7 @@ public class WorkDefinitionFactory { match = WorkDefinitionFactoryLegacyMgr.getWorkFlowDefinitionFromReverseId(id); } if (match.isMatched()) { - if (!OseeProperties.isInTest()) { - OseeLog.log(Activator.class, Level.INFO, null, "Loaded Work Definition [%s]", match); - System.out.println(); - } + OseeLog.log(Activator.class, Level.INFO, null, "Loaded Work Definition [%s]", match); workDefIdToWorkDefintion.put(id, match); } } @@ -232,7 +228,7 @@ public class WorkDefinitionFactory { String overrideId = WorkDefinitionFactoryLegacyMgr.getOverrideId(id); if (Strings.isValid(overrideId)) { // Only display this override once in log - if (!errorDisplayed.contains(overrideId) && !OseeProperties.isInTest()) { + if (!errorDisplayed.contains(overrideId)) { OseeLog.log(Activator.class, Level.INFO, String.format("Override WorkDefinition [%s] with [%s]", id, overrideId)); errorDisplayed.add(overrideId); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Config_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Config_Suite.java index 17d7a0d0b58..b4879e35ca8 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Config_Suite.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Config_Suite.java @@ -18,6 +18,7 @@ import org.eclipse.osee.ats.config.copy.CopyAtsUtilTest; import org.eclipse.osee.ats.config.copy.CopyAtsValidationTest; import org.eclipse.osee.ats.workflow.AtsWorkItemDefinitionTest; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -40,5 +41,11 @@ public class AtsTest_Config_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Demo_Access_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Demo_Access_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java index b971b3ae125..2989a4ced6a 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Access_Suite.java @@ -12,6 +12,7 @@ package org.eclipse.osee.ats; import org.eclipse.osee.ats.access.AtsBranchAccessManagerTest; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -25,5 +26,11 @@ public class AtsTest_Demo_Access_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Demo_Access_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Demo_Access_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java index 714e965243d..eddadd21d56 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Column_Suite.java @@ -35,6 +35,7 @@ import org.eclipse.osee.ats.column.TeamColumnTest; import org.eclipse.osee.ats.column.TypeColumnTest; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -74,5 +75,11 @@ public class AtsTest_Demo_Column_Suite { ClientSessionManager.getAuthenticationProtocols().contains("demo")); assertTrue("Client must authenticate using demo protocol", ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); + System.out.println("\n\nBegin " + AtsTest_Demo_Column_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Demo_Column_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java index f9e945f83aa..2fce44810e6 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java @@ -17,6 +17,7 @@ import org.eclipse.osee.ats.editor.stateItem.AtsHandleAddReviewRuleStateItemTest import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewPrepareStateItemTest; import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewReviewStateItemTest; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -38,5 +39,11 @@ public class AtsTest_Demo_StateItem_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AtsTest_Demo_StateItem_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Demo_StateItem_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java index 08cbd979366..fd32a4ed55c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_Suite.java @@ -31,6 +31,7 @@ import org.eclipse.osee.ats.util.ImportActionsViaSpreadsheetTest; import org.eclipse.osee.ats.workflow.SMAPromptChangeStatusTest; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -68,5 +69,11 @@ public class AtsTest_Demo_Suite { ClientSessionManager.getAuthenticationProtocols().contains("demo")); assertTrue("Client must authenticate using demo protocol", ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); + System.out.println("\n\nBegin " + AtsTest_Demo_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AtsTest_Demo_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Production_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Production_Suite.java index 866a1788ec3..c8f26f4903c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Production_Suite.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Production_Suite.java @@ -12,6 +12,7 @@ package org.eclipse.osee.ats; import org.eclipse.osee.ats.util.AtsImageTest; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -25,5 +26,11 @@ public class AtsTest_Production_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + Review_Demo_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + Review_Demo_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/Review_Demo_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/Review_Demo_Suite.java index 661144b59c9..555253b8c04 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/Review_Demo_Suite.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/Review_Demo_Suite.java @@ -13,6 +13,7 @@ package org.eclipse.osee.ats; import org.eclipse.osee.ats.review.ReviewNavigateItemsToWorldViewTest; import org.eclipse.osee.ats.review.ReviewWorldSearchItemDemoTest; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -28,5 +29,11 @@ public class Review_Demo_Suite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + Review_Demo_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + Review_Demo_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java index 70c84e1a670..ba42d227cb7 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java @@ -88,8 +88,6 @@ public class AtsNavigateItemsToWorldViewTest { arts.clear(); NavigateTestUtil.getAllArtifactChildren(getXViewer().getTree().getItems(), arts); // delete an artifact, look for expected !Errors in the XCol - deleteAttributesForXColErrorTest(arts, AtsAttributeTypes.TeamDefinition); - deleteAttributesForXColErrorTest(arts, AtsAttributeTypes.ActionableItem); deleteAttributesForXColErrorTest(arts, AtsAttributeTypes.ChangeType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAIsAndTeamDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAIsAndTeamDefinitions.java index aea6de10d35..f0c178b7617 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAIsAndTeamDefinitions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/migrate/ConvertAIsAndTeamDefinitions.java @@ -25,7 +25,7 @@ public class ConvertAIsAndTeamDefinitions extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws Exception { - XResultData resultData = new XResultData(); + XResultData resultData = new XResultData(false); AtsWorkDefinitionProvider.get().convertAndOpenAIandTeamAtsDsl(resultData); resultData.report(getName()); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java index 02d333c1711..16d37055f3d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java @@ -160,7 +160,7 @@ public class ImportAIsAndTeamDefinitionsToDb { Map<String, Artifact> nameToVerArt = new HashMap<String, Artifact>(); for (VersionDef dslVersionDef : versionDefs) { String dslVerName = Strings.unquote(dslVersionDef.getName()); - System.out.println(" - Importing Version " + dslVerName); + // System.out.println(" - Importing Version " + dslVerName); Artifact newVer = ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), dslVerName); teamDef.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, newVer); @@ -186,8 +186,7 @@ public class ImportAIsAndTeamDefinitionsToDb { String aiName = Strings.unquote(dslVersionDef.getName()); Artifact verArt = nameToVerArt.get(aiName); for (String parallelVerStr : dslVersionDef.getParallelVersion()) { - System.out.println(String.format(" - Importing Parallel Version [%s] -> Child [%s]", aiName, - parallelVerStr)); + // System.out.println(String.format(" - Importing Parallel Version [%s] -> Child [%s]", aiName, parallelVerStr)); Artifact childArt = nameToVerArt.get(parallelVerStr); verArt.addRelation(AtsRelationTypes.ParallelVersion_Child, childArt); } @@ -197,7 +196,7 @@ public class ImportAIsAndTeamDefinitionsToDb { public void importActionableItems(EList<ActionableItemDef> aiDefs, Artifact parentArtifact) throws OseeCoreException { for (ActionableItemDef dslAIDef : aiDefs) { String dslAIName = Strings.unquote(dslAIDef.getName()); - System.out.println(" - Importing Actionable Item " + dslAIName); + // System.out.println(" - Importing Actionable Item " + dslAIName); Artifact newAi = null; if (dslAIDef.getAiDefOption().contains("GetOrCreate")) { newAi = getOrCreate(dslAIName, false, parentArtifact); diff --git a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF index 9f8d133409a..33a0ec12a1f 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-Activator: org.eclipse.osee.client.integration.tests.Activator Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.core.runtime, - org.eclipse.osee.ats.config.demo, org.eclipse.osee.ats, + org.eclipse.osee.ats.config.demo, org.eclipse.osee.coverage, org.eclipse.osee.coverage.import01, org.eclipse.osee.coverage.import02, @@ -37,6 +37,7 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.logging, org.eclipse.osee.framework.messaging.event.res.test, org.eclipse.osee.framework.skynet.core, + org.eclipse.osee.framework.skynet.core.artifact, org.eclipse.osee.framework.ui.plugin.xnavigate, org.eclipse.osee.framework.ui.skynet.render, org.eclipse.osee.framework.ui.skynet.test, 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 fde499ff996..d1d5bda36c6 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch +++ b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch @@ -31,12 +31,12 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.client.integration.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=INFO -Dequinox.ds.debug=true -Dosee.application.server=http://localhost:8089 -Dosee.authentication.protocol=demo -DeventDebug=log -DeventSystem=new -Dosee.is.in.db.init=true -Dats.useNewWorkDefinitions=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=WARNING -Dequinox.ds.debug=true -Dosee.application.server=http://localhost:8089 -Dosee.authentication.protocol=demo -DeventDebug=log -DeventSystem=new -Dosee.is.in.db.init=true -Dats.useNewWorkDefinitions=true"/> <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.core.filebuffers@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.birt.chart.device.svg@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.p2.director@default:default,org.mozilla.javascript@default:default,org.eclipse.ecf@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.core.net.win32.x86@default:false,org.antlr.runtime@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.team.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.ui.win32@default:false,org.sat4j.core@default:default,org.apache.commons.el@default:default,org.eclipse.team.core@default:default,org.objectweb.asm@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.apache.batik.css@default:default,org.eclipse.equinox.http.servlet@default:default,org.sat4j.pb@default:default,org.aopalliance@default:default,org.eclipse.update.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.ui.forms@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.ui.views.log@default:default,javax.wsdl@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.apache.jasper@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ant.ui@default:default,com.google.inject@default:default,org.eclipse.team.svn@default:default,org.eclipse.jface.text@default:default,org.eclipse.xtext.ui.shared@default:default,org.h2@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.birt.chart.engine@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.cvs@default:default,org.apache.commons.net@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.birt.core@default:default,org.eclipse.jdt.junit4.runtime@default:default,com.google.collect@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui@default:default,org.eclipse.jface.databinding@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.update.core.win32@default:false,org.apache.commons.lang@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.emf.mwe2.language@default:default,org.apache.ant@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.osgi.services@default:default,org.w3c.dom.smil@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.jarprocessor@default:default,javax.mail.glassfish@default:default,org.eclipse.help.ui@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.equinox.util@default:default,org.eclipse.rcp@default:default,org.eclipse.ant.core@default:default,org.apache.batik.util@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.jdt.doc.user@default:default,org.apache.batik.parser@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.birt.chart.device.swt@default:default,org.eclipse.pde.ui@default:default,org.eclipse.birt.chart.device.extension@default:default,javax.xml@default:default,org.eclipse.update.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.apache.batik.xml@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.pde.launching@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.xtext@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.security.ui@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.boot@default:default,org.apache.log4j@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.emf.edit@default:default,org.apache.batik.svggen@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.codegen@default:default,org.apache.commons.cli@default:default,org.eclipse.jface@default:default,javax.servlet@default:default,org.apache.batik.transcoder@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.swt@default:default,org.eclipse.draw2d@default:default,org.eclipse.compare.win32@default:default,org.mortbay.jetty.util@default:default,org.junit4@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.jdt.junit.runtime@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.debug.ui@default:default,org.eclipse.help.appserver@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.batik.bridge@default:default,org.eclipse.ui.intro@default:default,org.apache.batik.ext.awt@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.equinox.p2.publisher@default:default,org.apache.batik.dom@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.apache.batik.pdf@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jdt@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.engine@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jdt.doc.isv@default:default,org.apache.batik.dom.svg@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.xpand@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.apache.xerces@default:default,org.apache.batik.util.gui@default:default,org.eclipse.pde@default:default,org.eclipse.search@default:default,org.eclipse.help@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.platform@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.commons.httpclient@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.xtend.typesystem.emf@default:default,com.lowagie.text@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.compare@default:default,org.eclipse.ui.intro.universal@default:default,org.apache.lucene@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.core.externaltools@default:default,org.apache.commons.codec@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.pde.core@default:default,org.eclipse.xtext.util@default:default,org.eclipse.equinox.security@default:default,org.w3c.dom.svg@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.pde.build@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.antlr.gen@default:default,org.eclipse.help.base@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.debug.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.app@default:default,org.eclipse.xtext.logging@default:false,javax.activation@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.xtend@default:default,org.eclipse.ant.launching@default:default,org.apache.oro@default:default,org.eclipse.gef@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.runtime.compatibility@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.ide@default:default,org.apache.lucene.analysis@default:default,org.eclipse.sdk@default:default,org.eclipse.jsch.core@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.zest.core@default:default,org.eclipse.text@default:default,javax.servlet.jsp@default:default,org.eclipse.jdt.launching@default:default,org.w3c.css.sac@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.help.webapp@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.eclipse.team.svn.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.update.configurator@3:true"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.ats.core@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.nebula.widgets.xviewer.tests@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.templates@default:default,net.jini@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.help.ui@default:default,org.postgresql.driver@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.coverage.test@default:false,jms.libraries@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.define.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.messaging.event.res.test@default:false"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.ant.core@default:default,org.eclipse.sdk@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.compare.core@default:default,org.apache.oro@default:default,org.eclipse.jdt@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.core.databinding.property@default:default,com.ibm.icu@default:default,org.h2@default:default,org.eclipse.pde@default:default,org.eclipse.birt.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.birt.chart.device.svg@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.cvs@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.apache.lucene.analysis@default:default,org.eclipse.debug.core@default:default,org.eclipse.osgi.util@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.w3c.css.sac@default:default,org.eclipse.ui.win32@default:false,org.apache.batik.util.gui@default:default,org.aopalliance@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.osgi.services@default:default,org.eclipse.xtext@default:default,org.eclipse.ui.views@default:default,org.apache.batik.css@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.team.core@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.jdt.ui@default:default,org.apache.batik.parser@default:default,org.eclipse.ui.cheatsheets@default:default,org.apache.ant@default:default,org.eclipse.equinox.preferences@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.ui.ide.application@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.team.cvs.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.svn@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.pde.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.mortbay.jetty.server@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.jsch.core@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.core.databinding@default:default,org.apache.batik.svggen@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.core.resources@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.search@default:default,org.eclipse.xpand@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.engine@default:default,org.apache.lucene@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,javax.xml@default:default,org.junit4@default:default,org.apache.commons.lang@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.jdt.junit.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.birt.chart.device.extension@default:default,com.jcraft.jsch@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.equinox.p2.ui@default:default,org.apache.log4j@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.p2.publisher@default:default,org.apache.batik.bridge@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.hamcrest.core@default:default,org.eclipse.ui.intro.universal@default:default,org.objectweb.asm@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.text@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.compare@default:default,org.eclipse.pde.build@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help.base@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.gef@default:default,org.eclipse.ant.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ui.intro@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ui.externaltools@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.commands@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.mwe.core@default:default,org.sat4j.core@default:default,org.eclipse.help.appserver@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.xtext.logging@default:false,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.sat4j.pb@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.help.webapp@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.security@default:default,javax.mail.glassfish@default:default,org.eclipse.emf.compare@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.jasper@default:default,com.google.inject@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.platform@default:default,org.eclipse.zest.core@default:default,javax.activation@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.apache.batik.util@default:default,org.eclipse.rcp@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.xtext.generator@default:default,org.apache.batik.dom.svg@default:default,com.lowagie.text@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.ui.navigator.resources@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.help.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.osgi@-1:true,org.apache.commons.el@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.antlr.gen@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.commons.net@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.birt.chart.device.swt@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.debug@default:default,org.mozilla.javascript@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.core.boot@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.team.ui@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.batik.dom@default:default,org.antlr.runtime@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net.win32.x86@default:false,org.apache.xerces@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.update.configurator@3:true,org.eclipse.pde.launching@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.ecf@default:default,org.eclipse.swt@default:default,javax.servlet@default:default,org.apache.xml.serializer@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.compare.win32@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.security.ui@default:default,org.w3c.dom.svg@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.ext.awt@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.emf.ecore.edit@default:default,org.apache.batik.xml@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.ui@default:default,org.eclipse.draw2d@default:default,org.apache.xml.resolver@default:default,org.w3c.dom.smil@default:default,org.eclipse.help@default:default,org.eclipse.ant.launching@default:default,org.eclipse.emf.codegen.ecore@default:default,com.google.collect@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.core.filesystem@default:default,org.apache.batik.pdf@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.expressions@default:default,org.eclipse.team.svn.core@default:default,org.apache.commons.cli@default:default,org.eclipse.core.variables@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.xtend@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.metadata@default:default,javax.wsdl@default:default,org.eclipse.equinox.p2.garbagecollector@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.ats.core@default:default,org.postgresql.driver@default:default,jms.libraries@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.svn@default:default,net.jini@default:default,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.nebula.widgets.xviewer.tests@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.messaging@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/MasterTestSuite_DemoDbTests.launch b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch index 462790ee01a..45f251a0111 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch +++ b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch @@ -31,12 +31,12 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.client.integration.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=INFO -Dequinox.ds.debug=true -Dosee.application.server=http://localhost:8089 -Dosee.authentication.protocol=demo -DeventDebug=log -DeventSystem=new -Dats.useNewWorkDefinitions=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=WARNING -Dequinox.ds.debug=true -Dosee.application.server=http://localhost:8089 -Dosee.authentication.protocol=demo -DeventDebug=log -DeventSystem=new -Dats.useNewWorkDefinitions=true"/> <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.eclipse.core.filebuffers@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.p2.director@default:default,org.mozilla.javascript@default:default,org.eclipse.ecf@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.hamcrest.core@default:default,org.eclipse.core.net.win32.x86@default:false,org.antlr.runtime@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.team.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.ui.win32@default:false,org.sat4j.core@default:default,org.apache.commons.el@default:default,org.eclipse.team.core@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.http.servlet@default:default,org.sat4j.pb@default:default,org.eclipse.jsch.ui@default:default,org.aopalliance@default:default,org.eclipse.update.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.ui.forms@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.apache.jasper@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ant.ui@default:default,com.google.inject@default:default,org.eclipse.team.svn@default:default,org.eclipse.jface.text@default:default,org.eclipse.xtext.ui.shared@default:default,org.h2@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.birt.chart.engine@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.cvs@default:default,org.apache.commons.net@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.birt.core@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.jdt.junit4.runtime@default:default,com.google.collect@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui@default:default,org.eclipse.jface.databinding@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.update.core.win32@default:false,org.apache.commons.lang@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.emf.mwe2.language@default:default,org.apache.ant@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.osgi.services@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.jarprocessor@default:default,javax.mail.glassfish@default:default,org.eclipse.help.ui@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.equinox.util@default:default,org.eclipse.rcp@default:default,org.eclipse.ant.core@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.pde.ui@default:default,javax.xml@default:default,org.eclipse.update.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.pde.launching@default:default,org.eclipse.xtext@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.security.ui@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.boot@default:default,org.apache.log4j@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.emf.edit@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.codegen@default:default,org.apache.commons.cli@default:default,org.eclipse.jface@default:default,javax.servlet@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.swt@default:default,org.eclipse.draw2d@default:default,org.mortbay.jetty.util@default:default,org.junit4@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.jdt.junit.runtime@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.debug.ui@default:default,org.eclipse.help.appserver@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jdt@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.engine@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.xpand@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.apache.xerces@default:default,org.eclipse.pde@default:default,org.eclipse.search@default:default,org.eclipse.help@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.platform@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.commons.httpclient@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.xtend.typesystem.emf@default:default,com.lowagie.text@default:default,org.eclipse.compare@default:default,org.eclipse.ui.intro.universal@default:default,org.apache.lucene@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.core.externaltools@default:default,org.apache.commons.codec@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.pde.core@default:default,org.eclipse.xtext.util@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.pde.build@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.antlr.gen@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.debug.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.app@default:default,org.eclipse.xtext.logging@default:false,javax.activation@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.xtend@default:default,org.eclipse.ant.launching@default:default,org.apache.oro@default:default,org.eclipse.gef@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.runtime.compatibility@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.ide@default:default,org.apache.lucene.analysis@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.sdk@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.ui.net@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.zest.core@default:default,org.eclipse.text@default:default,javax.servlet.jsp@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.help.webapp@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.team.svn.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.update.configurator@3:true"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.coverage.help.ui@default:default,jms.activemq.launch@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.ats.core@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.nebula.widgets.xviewer.tests@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.templates@default:default,net.jini@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.help.ui@default:default,org.postgresql.driver@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ote.client.msg@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.framework.core.dsl.ui@default:default,jms.libraries@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.dsl.edit@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.ote.message.test@default:false,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.define.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ote.messaging.dds@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.ant.core@default:default,org.eclipse.sdk@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.compare.core@default:default,org.apache.oro@default:default,org.eclipse.jdt@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.core.databinding.property@default:default,com.ibm.icu@default:default,org.h2@default:default,org.eclipse.pde@default:default,org.eclipse.birt.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.xtext.builder@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.cvs@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ui.net@default:default,org.eclipse.jsch.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.debug.core@default:default,org.eclipse.osgi.util@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.ui.win32@default:false,org.aopalliance@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.osgi.services@default:default,org.eclipse.xtext@default:default,org.eclipse.ui.views@default:default,org.eclipse.team.core@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.apache.ant@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ui.presentations.r21@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.ui.ide.application@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.team.cvs.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.svn@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.pde.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.mortbay.jetty.server@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.jsch.core@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.core.resources@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.search@default:default,org.eclipse.xpand@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.lucene@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.ui.browser@default:default,javax.xml@default:default,org.junit4@default:default,org.apache.commons.lang@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jdt.junit.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.ds@1:true,com.jcraft.jsch@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.equinox.p2.ui@default:default,org.apache.log4j@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.p2.publisher@default:default,org.hamcrest.core@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.text@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.compare@default:default,org.eclipse.pde.build@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help.base@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.gef@default:default,org.eclipse.ant.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ui.intro@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ui.externaltools@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.commands@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.mwe.core@default:default,org.sat4j.core@default:default,org.eclipse.help.appserver@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.xtext.logging@default:false,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.sat4j.pb@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.help.webapp@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.security@default:default,javax.mail.glassfish@default:default,org.eclipse.emf.compare@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.jasper@default:default,com.google.inject@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.platform@default:default,org.eclipse.zest.core@default:default,org.eclipse.equinox.p2.console@default:default,javax.activation@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.rcp@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.xtext.generator@default:default,com.lowagie.text@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.ui.navigator.resources@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.help.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.osgi@-1:true,org.apache.commons.el@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.antlr.gen@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.commons.net@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.debug@default:default,org.mozilla.javascript@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.core.boot@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.team.ui@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.antlr.runtime@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net.win32.x86@default:false,org.apache.xerces@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.update.configurator@3:true,org.eclipse.pde.launching@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.ecf@default:default,org.eclipse.swt@default:default,javax.servlet@default:default,org.apache.xml.serializer@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.ui@default:default,org.eclipse.draw2d@default:default,org.apache.xml.resolver@default:default,org.eclipse.help@default:default,org.eclipse.ant.launching@default:default,org.eclipse.emf.codegen.ecore@default:default,com.google.collect@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.expressions@default:default,org.eclipse.team.svn.core@default:default,org.apache.commons.cli@default:default,org.eclipse.core.variables@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.xtend@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.pde.ui.templates@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.ats.core@default:default,org.postgresql.driver@default:default,jms.activemq.launch@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,jms.libraries@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.ote.client.msg@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.core.dsl.edit@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.coverage@default:default,net.jini@default:default,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.ote.message.test@default:false,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.nebula.widgets.xviewer.tests@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.dsl.ui@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.messaging@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/CoreRuntimeFeatureTestsSuite.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java index 8bf10f85680..6f4f1b4102b 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/CoreRuntimeFeatureTestsSuite.java @@ -17,6 +17,7 @@ import org.eclipse.osee.framework.database.test.DatabaseTestSuite; import org.eclipse.osee.framework.jdk.core.JdkCoreTestSuite; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.lifecycle.test.AllLifecycleTestSuite; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -33,5 +34,11 @@ public class CoreRuntimeFeatureTestsSuite { @BeforeClass public static void setUp() throws Exception { OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + CoreRuntimeFeatureTestsSuite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + CoreRuntimeFeatureTestsSuite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbInit.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbInit.java index 58ed2c1cb49..f3ca5a30376 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbInit.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbInit.java @@ -44,7 +44,7 @@ public class MasterTestSuite_DemoDbInit { @org.junit.Test public void testDemoDbInit() throws Exception { - OseeLog.log(DatabaseInitializationOperation.class, Level.INFO, "Begin database initialization..."); + System.out.println("\nBegin database initialization..."); String lastAuthenticationProtocol = OseeClientProperties.getAuthenticationProtocol(); try { @@ -66,11 +66,13 @@ public class MasterTestSuite_DemoDbInit { ClientSessionManager.getSession(); } OseeClientProperties.setInDbInit(false); + System.out.println("End database initialization..."); } @org.junit.Test public void testPopulateDemoDb() { + System.out.println("\nBegin Populate Demo DB..."); Assert.assertTrue("DbInit must be successful to continue", wasDbInitSuccessful); try { ClientSessionManager.releaseSession(); @@ -84,6 +86,7 @@ public class MasterTestSuite_DemoDbInit { PopulateDemoActions populateDemoActions = new PopulateDemoActions(null); populateDemoActions.run(false); + System.out.println("End Populate Demo DB..."); } catch (Exception ex) { Assert.fail(Lib.exceptionToString(ex)); } 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 8d01c946616..1588333d7a0 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 @@ -21,9 +21,11 @@ import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.messaging.event.res.test.AllEventResTestSuite; import org.eclipse.osee.framework.skynet.core.FrameworkCore_Demo_Suite; +import org.eclipse.osee.framework.skynet.core.artifact.DirtyArtifactCacheTest; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.eclipse.osee.framework.ui.skynet.test.FrameworkUi_Demo_Suite; import org.eclipse.osee.support.test.util.TestUtil; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -39,7 +41,9 @@ import org.junit.runners.Suite; AtsTest_Config_Suite.class, AtsTest_Demo_Suite.class, FrameworkUi_Demo_Suite.class, - AllDefineTestSuite.class}) + AllDefineTestSuite.class, + // This should always be last test of master suite + DirtyArtifactCacheTest.class}) /** * This suite should contain all cases and suites that can be run against a Demo Db Init and Demo Populated osee * database. @@ -49,6 +53,7 @@ import org.junit.runners.Suite; public class MasterTestSuite_DemoDbTests { @BeforeClass public static void setUp() throws Exception { + System.out.println("\nBegin " + MasterTestSuite_DemoDbTests.class.getSimpleName()); OseeProperties.setIsInTest(true); assertTrue("Demo Application Server must be running.", ClientSessionManager.getAuthenticationProtocols().contains("demo")); @@ -59,4 +64,8 @@ public class MasterTestSuite_DemoDbTests { RenderingUtil.setPopupsAllowed(false); } + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + MasterTestSuite_DemoDbTests.class.getSimpleName() + "\n\n"); + } } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/Coverage_Db_Suite.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/Coverage_Db_Suite.java index dbded351706..00be384eb46 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/Coverage_Db_Suite.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/Coverage_Db_Suite.java @@ -21,6 +21,7 @@ import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.eclipse.osee.support.test.util.TestUtil; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -54,6 +55,12 @@ public class Coverage_Db_Suite { ClientSessionManager.getSession().getAuthenticationProtocol().equals("lba") || ClientSessionManager.getSession().getAuthenticationProtocol().equals( "demo")); RenderingUtil.setPopupsAllowed(false); + System.out.println("\n\nBegin " + Coverage_Db_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + Coverage_Db_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/AllDefineTestSuite.java b/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/AllDefineTestSuite.java index 477fa8106cf..489645b59dc 100644 --- a/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/AllDefineTestSuite.java +++ b/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/AllDefineTestSuite.java @@ -13,11 +13,23 @@ package org.eclipse.osee.define; import org.eclipse.osee.define.blam.operation.BlamTestSuite; import org.eclipse.osee.define.jobs.JobsTestSuite; import org.eclipse.osee.define.traceability.TestUnitAnnotationUtilityTest; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({BlamTestSuite.class, JobsTestSuite.class, TestUnitAnnotationUtilityTest.class}) public final class AllDefineTestSuite { - // Tests added above + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AllDefineTestSuite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AllDefineTestSuite.class.getSimpleName()); + } } diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java index 14cccaf0aca..d5d2e8245e5 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/AllCoreMessageTestSuite.java @@ -12,6 +12,9 @@ package org.eclipse.osee.framework.core.message.test; import org.eclipse.osee.framework.core.message.test.data.DataTestSuite; import org.eclipse.osee.framework.core.message.test.translation.TranslationTestSuite; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -21,5 +24,14 @@ import org.junit.runners.Suite; * @author Roberto E. Escobar */ public class AllCoreMessageTestSuite { - // Test Suite + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\nBegin " + AllCoreMessageTestSuite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AllCoreMessageTestSuite.class.getSimpleName() + "\n\n"); + } } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/AllCoreModelTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/AllCoreModelTestSuite.java index 92c9167ed94..56009112f98 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/AllCoreModelTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/AllCoreModelTestSuite.java @@ -14,6 +14,9 @@ import org.eclipse.osee.framework.core.model.test.access.AccessTestSuite; import org.eclipse.osee.framework.core.model.test.cache.CacheTestSuite; import org.eclipse.osee.framework.core.model.test.fields.FieldTestSuite; import org.eclipse.osee.framework.core.model.test.type.TypeTestSuite; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -28,5 +31,14 @@ AccessTestSuite.class, // * @author Roberto E. Escobar */ public class AllCoreModelTestSuite { - // Test Suite + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AllCoreModelTestSuite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AllCoreModelTestSuite.class.getSimpleName()); + } } diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java index f6688e63444..447fd71f3bd 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCache.java @@ -29,7 +29,6 @@ import org.eclipse.osee.framework.core.model.AbstractOseeType; import org.eclipse.osee.framework.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.logging.OseeLog; /** @@ -300,9 +299,7 @@ public abstract class AbstractOseeCache<T extends AbstractOseeType> implements I @Override public synchronized boolean reloadCache() throws OseeCoreException { getDataAccessor().load(this); - if (!OseeProperties.isInTest()) { - OseeLog.log(this.getClass(), Level.INFO, "Loaded " + getCacheId().toString().toLowerCase()); - } + OseeLog.log(this.getClass(), Level.INFO, "Loaded " + getCacheId().toString().toLowerCase()); setLastLoaded(System.currentTimeMillis()); return true; } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/LogProgressMonitor.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/LogProgressMonitor.java index bfa53bf4bb4..d2837a232d5 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/LogProgressMonitor.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/LogProgressMonitor.java @@ -13,6 +13,7 @@ package org.eclipse.osee.framework.core.operation; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.internal.Activator; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; @@ -31,12 +32,16 @@ public class LogProgressMonitor implements IProgressMonitor { @Override public void beginTask(String name, int totalWork) { this.taskName = name; - OseeLog.log(Activator.class, Level.INFO, String.format("Start: %s", taskName)); + if (!OseeProperties.isInTest()) { + OseeLog.log(Activator.class, Level.INFO, String.format("Start: %s", taskName)); + } } @Override public void done() { - OseeLog.log(Activator.class, Level.INFO, String.format("Finish: %s", taskName)); + if (!OseeProperties.isInTest()) { + OseeLog.log(Activator.class, Level.INFO, String.format("Finish: %s", taskName)); + } } @Override @@ -58,7 +63,9 @@ public class LogProgressMonitor implements IProgressMonitor { public void setTaskName(String name) { if (Strings.isValid(name)) { this.taskName = name; - OseeLog.log(Activator.class, Level.INFO, name); + if (!OseeProperties.isInTest()) { + OseeLog.log(Activator.class, Level.INFO, name); + } } } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java index 7465ea97197..c0209e87d6e 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java @@ -105,10 +105,7 @@ public class HttpProcessor { config.setProxy(data.getHost(), data.getPort()); } } - // Don't display INFO if running tests - if (!OseeProperties.isInTest()) { - OseeLog.format(Activator.class, Level.INFO, "Http-Request: [%s] [%s]", requests++, uri.toASCIIString()); - } + OseeLog.format(Activator.class, Level.INFO, "Http-Request: [%s] [%s]", requests++, uri.toASCIIString()); } public static String acquireString(URL url) throws Exception { diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DatabaseInitializationOperation.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DatabaseInitializationOperation.java index d49d6ab25d8..dd9ada84f45 100644 --- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DatabaseInitializationOperation.java +++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/DatabaseInitializationOperation.java @@ -29,7 +29,6 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.util.Conditions; import org.eclipse.osee.framework.database.init.internal.DatabaseInitActivator; -import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.osgi.framework.Bundle; @@ -92,13 +91,13 @@ public class DatabaseInitializationOperation { if (line.equalsIgnoreCase("Y")) { isConfigured = true; OseeLog.log(DatabaseInitActivator.class, Level.INFO, "Configuring Database..."); - long startTime = System.currentTimeMillis(); + // long startTime = System.currentTimeMillis(); try { processTasks(); } finally { - System.out.println(String.format("Database Configuration completed in [%s] ms", - Lib.getElapseString(startTime))); + // System.out.println(String.format("Database Configuration completed in [%s] ms", + // Lib.getElapseString(startTime))); } } @@ -255,7 +254,7 @@ public class DatabaseInitializationOperation { boolean serverOk = isApplicationServerAlive(serverUrl); Conditions.checkExpressionFailOnTrue(!serverOk, "Error connecting to application server [%s].\nPlease ensure server is running and try again.", serverUrl); - System.out.println("OSEE Application Server Validation [PASSED]"); + // System.out.println("OSEE Application Server Validation [PASSED]"); } public static void executeWithoutPrompting(String choice) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/AllEventResTestSuite.java b/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/AllEventResTestSuite.java index 6f1d446d3e9..7c0edd956f6 100644 --- a/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/AllEventResTestSuite.java +++ b/plugins/org.eclipse.osee.framework.messaging.event.res.test/src/org/eclipse/osee/framework/messaging/event/res/test/AllEventResTestSuite.java @@ -10,7 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.framework.messaging.event.res.test; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.messaging.event.res.test.internal.InternalResTestSuite; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -20,5 +23,14 @@ import org.junit.runners.Suite; * @author Donald G. Dunne */ public class AllEventResTestSuite { - // Test Suite + @BeforeClass + public static void setUp() throws Exception { + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + AllEventResTestSuite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + AllEventResTestSuite.class.getSimpleName()); + } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java index 3d742973933..c18f677a828 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/FrameworkCore_Demo_Suite.java @@ -50,6 +50,7 @@ import org.eclipse.osee.framework.skynet.core.revision.ConflictTest; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManagerTest; import org.eclipse.osee.framework.skynet.core.utility.CsvArtifactTest; import org.eclipse.osee.framework.skynet.core.word.UpdateBookmarkIdTest; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -100,6 +101,7 @@ import org.junit.runners.Suite; public class FrameworkCore_Demo_Suite { @BeforeClass public static void setUp() throws Exception { + System.out.println("\n\nBegin " + FrameworkCore_Demo_Suite.class.getSimpleName()); OseeProperties.setIsInTest(true); assertTrue("Demo Application Server must be running.", ClientSessionManager.getAuthenticationProtocols().contains("demo")); @@ -107,4 +109,9 @@ public class FrameworkCore_Demo_Suite { ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); } + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + FrameworkCore_Demo_Suite.class.getSimpleName()); + } + } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java index 6f8e5f68e0a..c3e6fe689a5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ChangeManagerTest.java @@ -12,11 +12,9 @@ package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.logging.Level; - import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -117,8 +115,8 @@ public class ChangeManagerTest { } public static void sleep(long milliseconds) throws Exception { - OseeLog.log(ChangeManagerTest.class, Level.INFO, "Sleeping " + milliseconds); + // OseeLog.log(ChangeManagerTest.class, Level.INFO, "Sleeping " + milliseconds); Thread.sleep(milliseconds); - OseeLog.log(ChangeManagerTest.class, Level.INFO, "Awake"); + // OseeLog.log(ChangeManagerTest.class, Level.INFO, "Awake"); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java new file mode 100644 index 00000000000..55b6ad4953c --- /dev/null +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java @@ -0,0 +1,24 @@ +/* + * Created on May 17, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.framework.skynet.core.artifact; + +import junit.framework.Assert; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; + +/** + * This test should be run as the last test of a suite to make sure that the ArtifactCache has no dirty artifacts. + * + * @author Donald G. Dunne + */ +public class DirtyArtifactCacheTest { + + @org.junit.Test + public void testArtifactCacheNotDirty() { + Assert.assertTrue(String.format( + "After all tests are run, there should be no dirty artifacts in Artifact Cache; Found [%s]", + Artifacts.artNames(ArtifactCache.getDirtyArtifacts())), ArtifactCache.getDirtyArtifacts().isEmpty()); + } +} diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java index 1c63baca1dc..e9f4d1dee3c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DuplicateHridTest.java @@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.artifact; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; @@ -35,8 +34,8 @@ public class DuplicateHridTest { String random_HRID = generate_random_HRID(); assertFalse("Duplicate check returned false positive", ArtifactFactory.isUniqueHRID(known_duplicate)); assertTrue("Duplicate check returned false negative", ArtifactFactory.isUniqueHRID(random_HRID)); - System.out.println("isUniqueHrid(\"" + known_duplicate + "\") returns " + ArtifactFactory.isUniqueHRID(known_duplicate)); - System.out.println("isUnqiueHrid(\"" + random_HRID + "\") returns " + ArtifactFactory.isUniqueHRID(random_HRID)); + // System.out.println("isUniqueHrid(\"" + known_duplicate + "\") returns " + ArtifactFactory.isUniqueHRID(known_duplicate)); + // System.out.println("isUnqiueHrid(\"" + random_HRID + "\") returns " + ArtifactFactory.isUniqueHRID(random_HRID)); } /* Queries the database and grabs the first HRID it sees */ diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java index 521ac399fa0..82818e102aa 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifactTest.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.importing; -import org.junit.BeforeClass; -import org.junit.Test; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; /** * @author Ryan D. Brooks @@ -22,19 +22,19 @@ public class RoughArtifactTest { private static RoughArtifact ra; - @BeforeClass + @org.junit.BeforeClass public static void setUpBeforeClass() { ra = new RoughArtifact(RoughArtifactKind.PRIMARY); } - @Test - public void testAddAttributeWithNulls() { - String nullString = null; - ra.addAttribute(nullString, ""); + //TODO: Not sure what this is testing + @org.junit.Test(expected = NullPointerException.class) + public void testAddAttributeWithNulls() throws OseeCoreException { + ra.addAttribute((String) null, ""); } - @Test - public void nonExistingEnumeration() { + @org.junit.Test(expected = OseeTypeDoesNotExist.class) + public void testNonExistingEnumeration() throws OseeCoreException { ra.addAttribute("Apple", "Orange"); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java index 11562bc1c87..27d0cb6c5e5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationCacheTest.java @@ -22,9 +22,11 @@ import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.mocks.DataFactory; import org.eclipse.osee.framework.skynet.core.mocks.MockLinker; import org.eclipse.osee.framework.skynet.core.types.IArtifact; +import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -50,8 +52,10 @@ public class RelationCacheTest { private static RelationType relType1; private static RelationType relType2; + private static SevereLoggingMonitor severeLoggingMonitor; + @BeforeClass - public static void setup() throws OseeCoreException { + public static void setup() throws Exception { branch1 = MockDataFactory.createBranch(100); branch1.setId(100); @@ -75,10 +79,12 @@ public class RelationCacheTest { DataFactory.setEveryOtherToDeleted(sourceLinksRelType2); checkAssumptions(); + + severeLoggingMonitor = TestUtil.severeLoggingStart(); } @AfterClass - public static void tearDown() { + public static void tearDown() throws Exception { branch1 = null; branch2 = null; @@ -91,6 +97,8 @@ public class RelationCacheTest { relType1 = null; relType2 = null; + + TestUtil.severeLoggingEnd(severeLoggingMonitor); } @Test diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java index 3a226c2bef1..845cecf7272 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/revision/ConflictTestManager.java @@ -15,7 +15,6 @@ import java.util.Collection; import java.util.Date; import java.util.LinkedList; import java.util.List; - import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.BranchArchivedState; @@ -60,7 +59,7 @@ public class ConflictTestManager { MODIFY_AND_DELETE; }; - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; // "TRUE".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.osee.framework.skynet.core.test/debug/Junit")); private static final String FOLDER = "System Requirements"; @@ -217,11 +216,15 @@ public class ConflictTestManager { } for (int i = 0; i < NUMBER_OF_ARTIFACTS; i++) { if (conflictDefs[i].destDelete) { - System.out.println("Deleting Artifact with ID " + destArtifacts[i].getArtId() + " index " + i); + if (DEBUG) { + System.out.println("Deleting Artifact with ID " + destArtifacts[i].getArtId() + " index " + i); + } destArtifacts[i].deleteAndPersist(); } if (conflictDefs[i].sourceDelete) { - System.out.println("Deleting Artifact with ID " + sourceArtifacts[i].getArtId() + " index " + i); + if (DEBUG) { + System.out.println("Deleting Artifact with ID " + sourceArtifacts[i].getArtId() + " index " + i); + } sourceArtifacts[i].deleteAndPersist(); } if (DEBUG) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java index 19463a53774..73e9c970e4b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java @@ -450,7 +450,7 @@ public class BranchManager { ExtensionDefinedObjects<IDefaultInitialBranchesProvider> extensions = new ExtensionDefinedObjects<IDefaultInitialBranchesProvider>( "org.eclipse.osee.framework.skynet.core.DefaultInitialBranchProvider", "DefaultInitialBranchProvider", - "class"); + "class", true); for (IDefaultInitialBranchesProvider provider : extensions.getObjects()) { try { // Guard against problematic extensions diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java index 5bd4f3ffc33..eec78154e72 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java @@ -20,7 +20,6 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.AttributeType; -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.artifact.Artifact; @@ -42,7 +41,7 @@ public class RoughArtifact { private final Collection<RoughArtifact> children; private IArtifactType primaryArtifactType; - public RoughArtifact(RoughArtifactKind roughArtifactKind, String name) { + public RoughArtifact(RoughArtifactKind roughArtifactKind, String name) throws OseeCoreException { this(roughArtifactKind); addAttribute("Name", name); } @@ -92,19 +91,15 @@ public class RoughArtifact { addURIAttribute(attributeType.getName(), file); } - public void addAttribute(String typeName, String value) { - if (Strings.isValid(typeName, value)) { - if (isEnumeration(typeName)) { - if (isMultipleEnum(typeName, value)) { - attributes.addMultiple(typeName, getEnumValues(value)); - } else { - attributes.add(typeName, value.trim()); - } + public void addAttribute(String typeName, String value) throws OseeCoreException { + if (isEnumeration(typeName)) { + if (isMultipleEnum(typeName, value)) { + attributes.addMultiple(typeName, getEnumValues(value)); } else { - attributes.add(typeName, value); + attributes.add(typeName, value.trim()); } } else { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "typeName or value is invalid. addAttribute(...) failed"); + attributes.add(typeName, value); } } @@ -116,14 +111,10 @@ public class RoughArtifact { return data; } - private boolean isEnumeration(String typeName) { + private boolean isEnumeration(String typeName) throws OseeCoreException { boolean result = false; - try { - AttributeType type = AttributeTypeManager.getType(typeName); - result = type.isEnumerated(); - } catch (OseeCoreException ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); - } + AttributeType type = AttributeTypeManager.getType(typeName); + result = type.isEnumerated(); return result; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java index 49e23aa55cf..20a913246dc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java @@ -175,7 +175,7 @@ public class ExcelArtifactExtractor extends AbstractArtifactExtractor { } @Override - public void processRow(String[] row) throws OseeArgumentException { + public void processRow(String[] row) throws OseeCoreException { rowCount++; if (importingRelations) { String guida = null; diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java index e67f510b8ad..0513039a8e0 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java @@ -14,6 +14,7 @@ import java.io.File; import java.io.FileFilter; import java.net.URI; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; @@ -28,7 +29,7 @@ public class NativeDocumentExtractor extends AbstractArtifactExtractor { } @Override - protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) { + protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) throws OseeCoreException { String extension = Lib.getExtension(source.toASCIIString()); String name = Lib.removeExtension(new File(source).getName()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/SoftwareRequirementHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/SoftwareRequirementHandler.java index f03e9fbaa4a..813b54d5430 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/SoftwareRequirementHandler.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/SoftwareRequirementHandler.java @@ -13,6 +13,7 @@ package org.eclipse.osee.framework.skynet.core.importing.parsers; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; @@ -30,7 +31,7 @@ public abstract class SoftwareRequirementHandler extends WordOutlineExtractorDel } @Override - public void processHeadingText(RoughArtifact roughArtifact, String headingText) { + public void processHeadingText(RoughArtifact roughArtifact, String headingText) throws OseeCoreException { StringBuilder text = new StringBuilder(headingText); Matcher matcher = partitionPattern.matcher(text); boolean isRequirement = false; diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java index 83cf8814c5c..53523d9fdd8 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java @@ -256,7 +256,7 @@ public class WordOutlineExtractorDelegate implements IArtifactExtractorDelegate /** * Specializes in extraction of "1.0 scope" type of outline number and names. Outline name can also be spread out * over multiple {@code <w:t> } elements.<br/> - * + * * @note Paragraph numbering must be zero based. "1.0 SCOPE" instead of "1. SCOPE" */ private void specializedOutlineNumberTitleExtract(String paragraph, StringBuilder outlineNumberStorage, StringBuilder outlineTitleStorage) throws OseeCoreException { @@ -333,7 +333,7 @@ public class WordOutlineExtractorDelegate implements IArtifactExtractorDelegate setContent(); } - public void processHeadingText(RoughArtifact roughArtifact, String headingText) { + public void processHeadingText(RoughArtifact roughArtifact, String headingText) throws OseeCoreException { roughArtifact.addAttribute("Name", headingText.trim()); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java index 62902344236..82044b9b7c2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.skynet.core.importing.parsers; import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.io.xml.AbstractSaxHandler; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind; @@ -33,7 +34,7 @@ public class XmlDataSaxHandler extends AbstractSaxHandler { } @Override - public void endElementFound(String uri, String localName, String name) { + public void endElementFound(String uri, String localName, String name) throws OseeCoreException { if (level == 3) { roughArtifact.addAttribute(localName, getContents()); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java index 8bfe7b2a4f8..73749bf55aa 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java @@ -15,7 +15,6 @@ import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; @@ -38,10 +37,8 @@ public class NewArtifactImportResolver implements IArtifactImportResolver { public Artifact resolve(final RoughArtifact roughArtifact, final IOseeBranch branch, Artifact realParent, Artifact root) throws OseeCoreException { IArtifactType artifactType = getArtifactType(roughArtifact.getRoughArtifactKind()); - if (!OseeProperties.isInTest()) { - OseeLog.format(NewArtifactImportResolver.class, Level.INFO, "New artifact: [%s]. Attributes: [%s]", - roughArtifact, roughArtifact.getAttributes()); - } + OseeLog.format(NewArtifactImportResolver.class, Level.INFO, "New artifact: [%s]. Attributes: [%s]", + roughArtifact, roughArtifact.getAttributes()); Artifact realArtifact = ArtifactTypeManager.addArtifact(artifactType, branch, roughArtifact.getGuid(), diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/FrameworkUi_Demo_Suite.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/FrameworkUi_Demo_Suite.java index 33122258bb9..f56163fb68b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/FrameworkUi_Demo_Suite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/FrameworkUi_Demo_Suite.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.test; import static org.junit.Assert.assertTrue; import org.eclipse.osee.framework.core.client.ClientSessionManager; +import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.ui.skynet.test.artifact.ArtifactPromptChangeTest; import org.eclipse.osee.framework.ui.skynet.test.blam.BlamXWidgetTest; import org.eclipse.osee.framework.ui.skynet.test.blam.operation.EmailGroupsBlamTest; @@ -33,6 +34,7 @@ import org.eclipse.osee.framework.ui.skynet.test.renderer.imageDetection.WordIma import org.eclipse.osee.framework.ui.skynet.test.util.enumeration.AbstractEnumerationTest; import org.eclipse.osee.framework.ui.skynet.test.widgets.workflow.WorkPageAdapterTest; import org.eclipse.osee.framework.ui.skynet.test.render.word.WordTestSuite; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -70,5 +72,12 @@ public class FrameworkUi_Demo_Suite { ClientSessionManager.getAuthenticationProtocols().contains("demo")); assertTrue("Client must authenticate using demo protocol", ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); + OseeProperties.setIsInTest(true); + System.out.println("\n\nBegin " + FrameworkUi_Demo_Suite.class.getSimpleName()); + } + + @AfterClass + public static void tearDown() throws Exception { + System.out.println("End " + FrameworkUi_Demo_Suite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java index a985f0236f6..86418dd4de2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java @@ -81,7 +81,7 @@ public abstract class ImageManagerTest { /** * Test that image that is not found, returns MISSING image */ - @org.junit.Test + @org.junit.Test(expected = Exception.class) public void testFrameworkImageMissing() throws Exception { // This will throw an OseeLog exception cause NOT_HERE can't be found; this is expected assertEquals(ImageManager.getImage(MissingImage.NOT_HERE), ImageManager.getImage(ImageManager.MISSING)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java index 8e45c0d6119..5e3444b6534 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java @@ -27,6 +27,7 @@ import org.eclipse.osee.framework.core.model.test.mocks.MockOseeDataAccessor; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.linking.OseeLinkBuilder; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData; @@ -34,6 +35,7 @@ import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvi import org.eclipse.osee.framework.ui.skynet.render.ArtifactGuidToWordML; import org.eclipse.osee.framework.ui.skynet.render.RelationOrderRenderer; import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer; +import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -46,21 +48,26 @@ public class RelationOrderRendererTest { private static RelationOrderRenderer renderer; private static RelationSorterProvider sorterProvider; + private static SevereLoggingMonitor severeLoggingMonitor; @BeforeClass - public static void prepareTest() throws OseeCoreException { + public static void prepareTest() throws Exception { MockArtifactGuidResolver resolver = new MockArtifactGuidResolver(null); AbstractOseeCache<RelationType> typeCache = new RelationTypeCache(new MockOseeDataAccessor<RelationType>()); addRelationTypeData(typeCache); sorterProvider = new RelationSorterProvider(); renderer = new RelationOrderRenderer(typeCache, resolver, sorterProvider); + + severeLoggingMonitor = TestUtil.severeLoggingStart(); } @AfterClass - public static void cleanupTest() { + public static void cleanupTest() throws Exception { sorterProvider = null; renderer = null; + + TestUtil.severeLoggingEnd(severeLoggingMonitor); } @Test diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ResultsEditorConverterTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ResultsEditorConverterTest.java index 6ed77aa9e5d..df4b8628402 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ResultsEditorConverterTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ResultsEditorConverterTest.java @@ -64,8 +64,8 @@ public class ResultsEditorConverterTest { StringWriter writer = new StringWriter(); MockResultsProvider provider = new MockResultsProvider("Test Provider"); executeConversion("html", writer, provider); - System.out.println(writer.toString()); - // Assert.assertEquals(getExpectedHTMLReport(provider), writer.toString().replaceAll("\n", "")); + Assert.fail("The below line was commented out and fails, don't know why."); + Assert.assertEquals(getExpectedHTMLReport(provider), writer.toString().replaceAll("\n", "")); } @Test @@ -206,7 +206,7 @@ public class ResultsEditorConverterTest { private byte[] getExpectedOtherReport(String type, MockResultsProvider provider) throws Exception { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); TableWriterAdaptor writerAdaptor = new TableWriterAdaptor(type, outputStream); - writerAdaptor.writeTitle("Report"); + writerAdaptor.writeTitle("Report from " + getClass().getSimpleName()); writerAdaptor.openDocument(); for (IResultsEditorTab tab : provider.getResultsEditorTabs()) { writerAdaptor.writeTitle(tab.getTabName()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java index 4f1c917773f..63115258f59 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java @@ -30,7 +30,7 @@ public final class WordUiUtil { Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { - XResultData rd = new XResultData(); + XResultData rd = new XResultData(false); rd.logWarning("\nYou chose to preview/edit artifacts that could not be handled: "); rd.log(warningString + "\n"); rd.addRaw(AHTML.beginMultiColumnTable(60, 1)); diff --git a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java index 2e181e1a794..558b2c27c94 100644 --- a/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java +++ b/plugins/org.eclipse.osee.framework.ui.swt/src/org/eclipse/osee/framework/ui/swt/ImageManager.java @@ -67,7 +67,7 @@ public final class ImageManager { String imageKey = imageEnum != null ? imageEnum.getImageKey() : MISSING.getImageKey(); if (getImageRegistry().getDescriptor(imageKey) == null) { ImageDescriptor imageDescriptor = imageEnum.createImageDescriptor(); - if (imageDescriptor == null) { + if (imageDescriptor == null && !System.getProperty("isInTest").equals("true")) { OseeLog.log(Activator.class, Level.SEVERE, String.format("Unable to load the image for [%s]", imageEnum.toString())); return setupImage(MISSING); diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/internal/Activator.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/internal/Activator.java index 7fb7683caef..948c9bf7439 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/internal/Activator.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/internal/Activator.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ote.core.internal; import java.util.Hashtable; - import org.eclipse.osee.framework.core.util.ServiceDependencyTracker; import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap; import org.eclipse.osee.ote.core.OteProperties; @@ -52,7 +51,6 @@ public class Activator implements BundleActivator { @Override public void start(BundleContext context) throws Exception { - System.out.println("Activator for osee.ote.core"); activator = this; statusBoard = new StatusBoard(); bundleContext = context; diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Application Server[H2].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Application Server[H2].launch index 1c06cead11c..b406fba68f6 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Application Server[H2].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Application Server[H2].launch @@ -15,12 +15,12 @@ <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -XX:MaxPermSize=256m -Dosee.log.default=INFO -Declipse.ignoreApp=false -Dosgi.noShutdown=true -DNequinox.ds.debug=true -Dorg.osgi.service.http.port=8089 -Dosee.db.connection.id=h2 -Dosee.db.embedded.server=0.0.0.0:8088"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -XX:MaxPermSize=256m -Dosee.log.default=WARNING -Declipse.ignoreApp=false -Dosgi.noShutdown=true -DNequinox.ds.debug=true -Dorg.osgi.service.http.port=8089 -Dosee.db.connection.id=h2 -Dosee.db.embedded.server=0.0.0.0:8088"/> <stringAttribute key="pde.version" value="3.3"/> <booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="target_bundles" value="org.eclipse.emf.ecore@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding.property@default:default,org.apache.xerces@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ant.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.databinding@default:default,org.eclipse.core.resources@default:default,org.h2@default:default,org.eclipse.emf.ecore.xmi@default:default,org.antlr.gen@default:default,org.eclipse.equinox.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.el@default:default,org.junit4@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.xpand@default:default,org.eclipse.emf.mwe.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.mortbay.jetty.util@default:default,org.eclipse.xtext@default:default,de.itemis.xtext.antlr@default:default,org.aopalliance@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.common@default:default,javax.servlet.jsp@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.core.filesystem@default:default,org.apache.ant@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.registry@default:default,org.mortbay.jetty.server@default:default,org.eclipse.xtext.util@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.apache.jasper@default:default,org.apache.commons.cli@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,javax.xml@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.antlr.runtime@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.mwe2.language@default:default,org.apache.xml.serializer@default:default,com.lowagie.text@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.commons.httpclient@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.core.expressions@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.emf.compare@default:default,com.google.collect@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.equinox.ds@1:true,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.xtend@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.jobs@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.equinox.app@default:default,org.apache.xml.resolver@default:default,com.google.inject@default:default,org.apache.log4j@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.emf.edit@default:default,org.eclipse.core.runtime.compatibility.auth@default:default"/> +<stringAttribute key="target_bundles" value="org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.databinding.property@default:default,com.ibm.icu@default:default,org.h2,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.emf.mwe2.language@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.aopalliance@default:default,org.eclipse.osgi.services@default:default,org.eclipse.xtext@default:default,org.apache.ant@default:default,org.eclipse.equinox.preferences@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.compare.match@default:default,org.eclipse.ecf.filetransfer@default:default,org.mortbay.jetty.server@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.resources@default:default,org.eclipse.xpand@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.engine@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,javax.xml@default:default,org.junit4@default:default,org.apache.commons.lang@default:default,org.eclipse.equinox.p2.repository@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.apache.log4j@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.commands@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.xtext.logging@default:false,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.security@default:default,org.eclipse.emf.compare@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.jasper@default:default,com.google.inject@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.xtext.generator@default:default,com.lowagie.text@default:default,org.apache.commons.codec@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.osgi@-1:true,org.apache.commons.el@default:default,org.eclipse.emf.edit@default:default,org.antlr.gen@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.mwe.utils@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.registry@default:default,org.antlr.runtime@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.net.win32.x86@default:false,org.apache.xerces@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ecf@default:default,javax.servlet@default:default,org.apache.xml.serializer@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.app@default:default,org.apache.xml.resolver@default:default,com.google.collect@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.expressions@default:default,org.apache.commons.cli@default:default,org.eclipse.core.variables@default:default,org.eclipse.xtend@default:default,org.eclipse.equinox.util@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.p2.metadata@default:default"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<stringAttribute key="workspace_bundles" value="org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.core.datastore.test@default:false,lba.server.customizations@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.postgresql@default:default,lba.authentication.provider@default:default,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core@default:default,lba.db.connection@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.database@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.manager.servlet.test@default:false"/> +<stringAttribute key="workspace_bundles" value="org.eclipse.osee.framework.lifecycle,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.demo.db.connection,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.lifecycle.test,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.framework.core.server@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.core.server.test@default:false,lba.server.customizations@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.manager.servlet.test@default:false,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.branch.management@default:default,lba.authentication.provider@default:default,org.eclipse.osee.framework.h2,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.resource.locator.attribute@default:default,lba.db.connection@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.core.datastore.test@default:false"/> </launchConfiguration> diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch index 5f3c2eb999b..b260ab35d3d 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [H2].launch @@ -163,12 +163,12 @@ </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -XX:MaxPermSize=256m -Dosee.log.default=INFO -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DNequinox.ds.debug=true -DNequinox.ds.print=true -Dorg.osgi.service.http.port=8089 -Dosee.db.connection.id=h2 -Dosee.db.embedded.server=0.0.0.0:8088"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -XX:MaxPermSize=256m -Dosee.log.default=WARNING -Declipse.ignoreApp=true -Dosgi.noShutdown=true -DNequinox.ds.debug=true -DNequinox.ds.print=true -Dorg.osgi.service.http.port=8089 -Dosee.db.connection.id=h2 -Dosee.db.embedded.server=0.0.0.0:8088"/> <stringAttribute key="pde.version" value="3.3"/> <booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="target_bundles" value="org.eclipse.emf.compare@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.app@default:default,com.jcraft.jsch@default:default,org.apache.commons.lang@default:default,org.eclipse.team.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.emf.edit@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.util@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,javax.xml@default:default,org.eclipse.core.resources.win32.x86@default:false,org.apache.xerces@default:default,org.h2@default:default,org.antlr.runtime@default:default,org.eclipse.equinox.security@default:default,org.apache.xml.resolver@default:default,com.google.inject@default:default,org.eclipse.equinox.http.servlet@default:default,javax.servlet@default:default,org.eclipse.core.net@default:default,com.lowagie.text@default:default,org.junit4@default:default,org.eclipse.xtext.util@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.core.runtime@default:true,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.emf.compare.diff@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.concurrent@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.apache.log4j@default:default,org.aopalliance@default:default,org.hamcrest.core@default:default,org.eclipse.osgi.services@default:default,com.google.collect@default:default,org.apache.commons.httpclient@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.emf.compare.match@default:default,org.apache.commons.codec@default:default,org.eclipse.core.jobs@default:default,org.eclipse.xtext@default:default,org.eclipse.emf.ecore.xmi@default:default"/> +<stringAttribute key="target_bundles" value="javax.xml@default:default,org.eclipse.core.contenttype@default:default,com.lowagie.text@default:default,org.apache.xml.resolver@default:default,javax.servlet@default:default,org.eclipse.core.resources.win32.x86@default:false,org.hamcrest.core@default:default,org.eclipse.emf.compare.diff@default:default,com.jcraft.jsch,org.eclipse.core.expressions@default:default,org.eclipse.equinox.ds@1:true,org.mortbay.jetty.server@default:default,org.eclipse.xtext@default:default,org.eclipse.core.runtime@default:true,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.commons.codec@default:default,com.google.inject@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.util@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.compare@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.emf.common@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.osgi.services@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.team.core@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.resources@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.core.net@default:default,org.antlr.runtime@default:default,org.eclipse.core.jobs@default:default,com.google.collect@default:default,org.eclipse.osgi@-1:true,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.aopalliance@default:default,org.h2,org.apache.xerces@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.apache.log4j@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.emf.edit@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.xtext.util@default:default,org.eclipse.equinox.security@default:default"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<stringAttribute key="workspace_bundles" value="org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.manager.servlet.test@default:false,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.core.datastore.test@default:false,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.core.message@default:default"/> +<stringAttribute key="workspace_bundles" value="org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.manager.servlet.test@default:false,org.eclipse.osee.framework.h2,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.core.datastore.test@default:false,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.database.test@default:false"/> </launchConfiguration> diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch index 0d2daa2456d..1a1581ec7de 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo Application Server [localhost].launch @@ -52,6 +52,7 @@ <listEntry value="/org.eclipse.osee.framework.types.bridge/bin"/> <listEntry value="/org.eclipse.osee.framework.ui.service.control/bin"/> <listEntry value="/lba.framework.ui.skynet/bin"/> +<listEntry value="/org.eclipse.osee.framework.oracle/bin"/> <listEntry value="/org.postgresql.driver/bin"/> <listEntry value="/org.eclipse.osee.support.build/bin"/> <listEntry value="/org.eclipse.osee.framework.branch.management/bin"/> @@ -80,6 +81,7 @@ <listEntry value="/org.eclipse.osee.ote.messaging.dds/bin"/> <listEntry value="/org.eclipse.osee.framework.server.admin/bin"/> <listEntry value="/org.eclipse.osee.framework.core.server/bin"/> +<listEntry value="/org.eclipse.osee.framework.postgresql/bin"/> <listEntry value="/lba.ats.config.cte/bin"/> <listEntry value="/org.eclipse.osee.framework.messaging/bin"/> <listEntry value="/org.eclipse.osee.framework.jdk.core/bin"/> @@ -125,6 +127,7 @@ <listEntry value="/org.eclipse.osee.framework.core.client/bin"/> <listEntry value="/lba.tte/bin"/> <listEntry value="/org.eclipse.osee.framework.ui.plugin/bin"/> +<listEntry value="/org.eclipse.osee.framework.jdbcodbc/bin"/> <listEntry value="/net.jini/bin"/> <listEntry value="/lba.ote.msg.gen/bin"/> <listEntry value="/lba.ote.client/bin"/> @@ -163,12 +166,12 @@ </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -XX:MaxPermSize=256m -Dosee.log.default=INFO -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dequinox.ds.debug=true -DNequinox.ds.print=true -Dorg.osgi.service.http.port=8089 -Dosee.db.connection.id=postgresqlLocalhost"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -XX:MaxPermSize=256m -Dosee.log.default=WARNING -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dequinox.ds.debug=true -DNequinox.ds.print=true -Dorg.osgi.service.http.port=8089 -Dosee.db.connection.id=postgresqlLocalhost"/> <stringAttribute key="pde.version" value="3.3"/> <booleanAttribute key="show_selected_only" value="true"/> -<stringAttribute key="target_bundles" value="org.eclipse.emf.edit@default:default,org.eclipse.core.runtime@default:true,org.mortbay.jetty.util@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.compare.match@default:default,org.aopalliance@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.expressions@default:default,org.apache.commons.lang@default:default,org.eclipse.emf.compare.diff@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.xtext@default:default,org.apache.xerces@default:default,org.eclipse.core.contenttype@default:default,com.google.inject@default:default,org.eclipse.emf.ecore.change@default:default,org.mortbay.jetty.server@default:default,org.eclipse.emf.ecore@default:default,org.apache.log4j@default:default,org.eclipse.xtext.common.types@default:default,org.antlr.runtime@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.filesystem@default:default,javax.xml@default:default,org.eclipse.emf.compare@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,com.lowagie.text@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.registry@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.team.core@default:default,org.apache.commons.codec@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.emf.common@default:default,javax.servlet@default:default,org.eclipse.xtext.util@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.junit4@default:default,org.eclipse.equinox.common@2:true,com.google.collect@default:default,org.apache.commons.cli@default:default,org.eclipse.equinox.app@default:default,org.apache.commons.httpclient@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.ds@1:true,org.eclipse.compare.core@default:default,org.eclipse.core.jobs@default:default,org.apache.commons.el@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.antlr.gen@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.commands@default:default,com.ibm.icu@default:default,org.hamcrest.core@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default"/> +<stringAttribute key="target_bundles" value="javax.xml@default:default,org.eclipse.core.contenttype@default:default,com.lowagie.text@default:default,org.apache.xml.resolver@default:default,javax.servlet@default:default,org.eclipse.core.resources.win32.x86@default:false,org.hamcrest.core@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.core.expressions@default:default,com.ibm.icu@default:default,org.eclipse.equinox.ds@1:true,org.mortbay.jetty.server@default:default,org.eclipse.xtext@default:default,org.eclipse.core.runtime@default:true,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.commons.codec@default:default,com.google.inject@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.util@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.filesystem@default:default,org.antlr.gen@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.compare@default:default,org.eclipse.core.commands@default:default,org.junit4@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.emf.common@default:default,org.apache.commons.httpclient@default:default,de.itemis.xtext.antlr@default:default,org.apache.commons.lang@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.osgi.services@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.team.core@default:default,org.apache.commons.el@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.resources@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.core.net@default:default,org.antlr.runtime@default:default,org.eclipse.core.jobs@default:default,com.google.collect@default:default,org.eclipse.osgi@-1:true,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.aopalliance@default:default,org.apache.xerces@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.apache.log4j@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.emf.edit@default:default,org.eclipse.emf.compare.match@default:default,javax.servlet.jsp@default:default,org.eclipse.xtext.util@default:default,org.eclipse.equinox.security@default:default,org.apache.commons.cli@default:default"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<stringAttribute key="workspace_bundles" value="org.postgresql.driver@default:default,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.manager.servlet.test@default:false,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.core.datastore.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false"/> +<stringAttribute key="workspace_bundles" value="org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.manager.servlet.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.resource.provider.attribute@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.core.datastore@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.search.engine.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.search.engine@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.resource.locator.attribute.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.core.datastore.test@default:false,org.eclipse.osee.framework.resource.locator.attribute@default:default,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.server.admin@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.branch.management@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.resource.provider.attribute.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.branch.management.test@default:false,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.database.test@default:false"/> </launchConfiguration> |