diff options
| author | ddunne | 2011-05-18 19:37:14 +0000 |
|---|---|---|
| committer | Ryan D. Brooks | 2011-05-18 19:37:14 +0000 |
| commit | 2990406c32803b4b02552082b3613702568781a7 (patch) | |
| tree | 07f54f36c56008dddb346355eb5b7913475a7cc3 /plugins | |
| parent | 1bb1a658ff009d68cdcef46391ae68f871a3dd31 (diff) | |
| download | org.eclipse.osee-2990406c32803b4b02552082b3613702568781a7.tar.gz org.eclipse.osee-2990406c32803b4b02552082b3613702568781a7.tar.xz org.eclipse.osee-2990406c32803b4b02552082b3613702568781a7.zip | |
refactor: Remove StaticIdManager and auto-caching of all StaticId attributes
Diffstat (limited to 'plugins')
30 files changed, 363 insertions, 408 deletions
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsLoadConfigArtifactsOperation.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsLoadConfigArtifactsOperation.java index 6d78deff33b..827a978570a 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsLoadConfigArtifactsOperation.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsLoadConfigArtifactsOperation.java @@ -16,11 +16,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.core.internal.Activator; import org.eclipse.osee.ats.core.type.AtsRelationTypes; import org.eclipse.osee.ats.core.util.AtsUtilCore; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; /** @@ -44,8 +46,13 @@ public class AtsLoadConfigArtifactsOperation extends AbstractOperation { OseeLog.log(Activator.class, Level.INFO, "Loading ATS Configuration"); Artifact headingArt = AtsUtilCore.getFromToken(AtsArtifactToken.HeadingFolder); // Loading artifacts will cache them in ArtifactCache - RelationManager.getRelatedArtifacts(Collections.singleton(headingArt), 8, - CoreRelationTypes.Default_Hierarchical__Child, AtsRelationTypes.TeamDefinitionToVersion_Version); + for (Artifact artifact : RelationManager.getRelatedArtifacts(Collections.singleton(headingArt), 8, + CoreRelationTypes.Default_Hierarchical__Child, AtsRelationTypes.TeamDefinitionToVersion_Version)) { + // CacheByText for all staticId values + for (String staticId : artifact.getAttributesToStringList(CoreAttributeTypes.StaticId)) { + ArtifactCache.cacheByTextId(staticId, artifact); + } + } // Load Work Definitions // TODO not doing anymore // WorkItemDefinitionFactory.loadDefinitions(); 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 b4879e35ca8..8c7fc561257 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 @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats; +import junit.framework.Assert; import org.eclipse.osee.ats.artifact.AtsTeamDefintionToWorkflowTest; import org.eclipse.osee.ats.config.AtsActionableItemToTeamDefinitionTest; import org.eclipse.osee.ats.config.copy.ConfigDataTest; @@ -18,6 +19,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.eclipse.osee.framework.plugin.core.util.OseeData; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -42,10 +44,12 @@ public class AtsTest_Config_Suite { public static void setUp() throws Exception { OseeProperties.setIsInTest(true); System.out.println("\n\nBegin " + AtsTest_Demo_Access_Suite.class.getSimpleName()); + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); } @AfterClass public static void tearDown() throws Exception { + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); 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_StateItem_Suite.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/AtsTest_Demo_StateItem_Suite.java index 2fce44810e6..7fffede5792 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 @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats; +import junit.framework.Assert; import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewDecisionStateItemTest; import org.eclipse.osee.ats.editor.stateItem.AtsDecisionReviewPrepareStateItemTest; import org.eclipse.osee.ats.editor.stateItem.AtsForceAssigneesToTeamLeadsStateItemTest; @@ -17,6 +18,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.eclipse.osee.framework.plugin.core.util.OseeData; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -40,10 +42,12 @@ public class AtsTest_Demo_StateItem_Suite { public static void setUp() throws Exception { OseeProperties.setIsInTest(true); System.out.println("\n\nBegin " + AtsTest_Demo_StateItem_Suite.class.getSimpleName()); + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); } @AfterClass public static void tearDown() throws Exception { + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); 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 fd32a4ed55c..49fd7a6aa2f 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 @@ -11,6 +11,7 @@ package org.eclipse.osee.ats; import static org.junit.Assert.assertTrue; +import junit.framework.Assert; import org.eclipse.osee.ats.artifact.log.AtsLogTest; import org.eclipse.osee.ats.artifact.log.LogItemTest; import org.eclipse.osee.ats.artifact.note.AtsNoteTest; @@ -31,6 +32,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.eclipse.osee.framework.plugin.core.util.OseeData; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -70,10 +72,12 @@ public class AtsTest_Demo_Suite { assertTrue("Client must authenticate using demo protocol", ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); System.out.println("\n\nBegin " + AtsTest_Demo_Suite.class.getSimpleName()); + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); } @AfterClass public static void tearDown() throws Exception { + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); System.out.println("End " + AtsTest_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 555253b8c04..abb2e80f8a2 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 @@ -10,9 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.ats; +import junit.framework.Assert; 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.eclipse.osee.framework.plugin.core.util.OseeData; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -30,10 +32,12 @@ public class Review_Demo_Suite { public static void setUp() throws Exception { OseeProperties.setIsInTest(true); System.out.println("\n\nBegin " + Review_Demo_Suite.class.getSimpleName()); + Assert.assertTrue(OseeData.isProjectOpen()); } @AfterClass public static void tearDown() throws Exception { + Assert.assertTrue(OseeData.isProjectOpen()); System.out.println("End " + Review_Demo_Suite.class.getSimpleName()); } } 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 16d37055f3d..f779371c032 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 @@ -31,7 +31,6 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; -import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; public class ImportAIsAndTeamDefinitionsToDb { @@ -123,7 +122,7 @@ public class ImportAIsAndTeamDefinitionsToDb { boolean hasVersions = dslTeamDef.getVersion().size() > 0; newTeam.setSoleAttributeValue(AtsAttributeTypes.TeamUsesVersions, configuredForTeamUsesVersions | hasVersions); for (String staticId : dslTeamDef.getStaticId()) { - StaticIdManager.setSingletonAttributeValue(newTeam, staticId); + newTeam.setSingletonAttributeValue(CoreAttributeTypes.StaticId, staticId); } for (Artifact user : UserRefUtil.getUsers(dslTeamDef.getLead())) { newTeam.addRelation(AtsRelationTypes.TeamLead_Lead, user); @@ -178,7 +177,7 @@ public class ImportAIsAndTeamDefinitionsToDb { newVer.setSoleAttributeValue(AtsAttributeTypes.BaselineBranchGuid, dslVersionDef.getBaselineBranchGuid()); } for (String staticId : dslVersionDef.getStaticId()) { - StaticIdManager.setSingletonAttributeValue(newVer, staticId); + newVer.setSingletonAttributeValue(CoreAttributeTypes.StaticId, staticId); } } // Handle parallel versions @@ -213,7 +212,7 @@ public class ImportAIsAndTeamDefinitionsToDb { // newAi.setSoleAttributeValue(CoreAttributeTypes.Active, BooleanDefUtil.get(dslAIDef.getActive(), true)); newAi.setSoleAttributeValue(AtsAttributeTypes.Actionable, BooleanDefUtil.get(dslAIDef.getActionable(), true)); for (String staticId : dslAIDef.getStaticId()) { - StaticIdManager.setSingletonAttributeValue(newAi, staticId); + newAi.setSingletonAttributeValue(CoreAttributeTypes.StaticId, staticId); } for (Artifact user : UserRefUtil.getUsers(dslAIDef.getLead())) { newAi.addRelation(AtsRelationTypes.TeamLead_Lead, user); 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 45f251a0111..a6c61022d00 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch +++ b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch @@ -35,8 +35,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.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"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.codegen.ecore@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.update.configurator@3:true,org.eclipse.zest.core@default:default,com.lowagie.text@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.console@default:default,org.apache.commons.lang@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.ui.editors@default:default,org.eclipse.xtend@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.update.ui@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.team.svn@default:default,org.apache.xml.resolver@default:default,org.eclipse.jface.text@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.edit@default:default,org.apache.oro@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.sdk@default:default,org.eclipse.pde.junit.runtime@default:default,org.apache.xerces@default:default,org.eclipse.ui.win32@default:false,org.eclipse.swt.win32.win32.x86@default:false,org.polarion.eclipse.team.svn.connector@default:default,org.apache.jasper@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.boot@default:default,org.apache.log4j@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.help.appserver@default:default,org.apache.xml.serializer@default:default,org.eclipse.emf.compare@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.forms@default:default,org.eclipse.help.ui@default:default,org.eclipse.jface@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.pde.build@default:default,org.apache.lucene@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.equinox.http.jetty@default:default,org.junit4@default:default,org.eclipse.equinox.frameworkadmin@default:default,com.google.inject@default:default,org.eclipse.jsch.core@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.net@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.xtext.util@default:default,org.mozilla.javascript@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.console@default:default,org.antlr.gen@default:default,org.eclipse.search@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.ant@default:default,org.eclipse.core.databinding@default:default,org.eclipse.team.cvs.ui@default:default,org.apache.lucene.analysis@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.runtime.compatibility@default:default,javax.xml@default:default,org.eclipse.team.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views@default:default,org.eclipse.gef@default:default,javax.mail.glassfish@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.pde.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.pde.ui.templates@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.commons.codec@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.team.core@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.h2@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.birt.core@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding.beans@default:default,org.antlr.runtime@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.pde@default:default,org.eclipse.core.variables@default:default,org.eclipse.ant.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.xpand@default:default,com.ibm.icu@default:default,org.eclipse.ecf@default:default,org.eclipse.core.externaltools@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.ds@1:true,org.aopalliance@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.pde.launching@default:default,org.eclipse.xtext@default:default,com.google.collect@default:default,javax.servlet@default:default,org.apache.commons.cli@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.osgi.util@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.update.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.platform@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.core.jobs@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.compare.core@default:default,org.eclipse.text@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.cvs@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.pde.core@default:default,org.eclipse.platform.doc.user@default:default,javax.activation@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.help@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.swt@default:default,javax.servlet.jsp@default:default,org.hamcrest.core@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.osgi.services@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.commons.net@default:default,org.eclipse.equinox.common@2:true,org.eclipse.pde.doc.user@default:default,org.sat4j.core@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.expressions@default:default,org.mortbay.jetty.server@default:default,org.eclipse.xtext.builder@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.ats.core@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.ats@default:default,jms.libraries@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.define@default:default,org.eclipse.nebula.widgets.xviewer.tests@default:false,org.eclipse.osee.framework.core.dsl.edit@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.ote.message.test@default:false,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.dsl.ui@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.ote.client.msg@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,jms.activemq.launch@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,net.jini@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbInit.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/suite/MasterTestSuite_DemoDbInit.java index f3ca5a30376..caf5b057add 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 @@ -86,7 +86,7 @@ public class MasterTestSuite_DemoDbInit { PopulateDemoActions populateDemoActions = new PopulateDemoActions(null); populateDemoActions.run(false); - System.out.println("End Populate Demo DB..."); + System.out.println("End Populate Demo DB...\n"); } catch (Exception ex) { Assert.fail(Lib.exceptionToString(ex)); } 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 00be384eb46..83c33e913fe 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 @@ -11,6 +11,7 @@ package org.eclipse.osee.coverage; import static org.junit.Assert.assertTrue; +import junit.framework.Assert; import org.eclipse.osee.coverage.model.CoverageItemPersistTest; import org.eclipse.osee.coverage.model.CoverageOptionManagerStoreTest; import org.eclipse.osee.coverage.model.CoveragePreferencesTest; @@ -19,6 +20,7 @@ import org.eclipse.osee.coverage.test.store.ArtifactTestUnitStoreTest; import org.eclipse.osee.coverage.test.store.TestUnitCacheTest; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; @@ -56,10 +58,12 @@ public class Coverage_Db_Suite { "demo")); RenderingUtil.setPopupsAllowed(false); System.out.println("\n\nBegin " + Coverage_Db_Suite.class.getSimpleName()); + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); } @AfterClass public static void tearDown() throws Exception { + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); System.out.println("End " + Coverage_Db_Suite.class.getSimpleName()); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/util/CoverageTestUtil.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/util/CoverageTestUtil.java index 46559faff10..bf430abc14b 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/util/CoverageTestUtil.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/util/CoverageTestUtil.java @@ -23,11 +23,12 @@ import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts; -import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.support.test.util.DemoSawBuilds; /** @@ -55,7 +56,7 @@ public class CoverageTestUtil { * Adds the static id to the artifact to ensure that test cleans (purges) this artifact after completion. */ public static void registerAsTestArtifact(Artifact artifact, boolean recurse) throws OseeCoreException { - StaticIdManager.setSingletonAttributeValue(artifact, CoverageTestUtil.COVERAGE_STATIC_ID); + artifact.setSingletonAttributeValue(CoreAttributeTypes.StaticId, CoverageTestUtil.COVERAGE_STATIC_ID); if (recurse) { for (Artifact childArt : artifact.getChildren()) { if (childArt.isOfType(CoverageArtifactTypes.CoveragePackage, CoverageArtifactTypes.CoveragePackage)) { @@ -83,18 +84,18 @@ public class CoverageTestUtil { } public static Collection<Artifact> getCoverageUnitArtifacts() throws OseeCoreException { - return StaticIdManager.getArtifactsFromArtifactQuery(CoverageArtifactTypes.CoverageUnit, COVERAGE_STATIC_ID, - CoverageTestUtil.getTestBranch()); + return ArtifactQuery.getArtifactListFromTypeAndAttribute(CoverageArtifactTypes.CoverageUnit, + CoreAttributeTypes.StaticId, COVERAGE_STATIC_ID, CoverageTestUtil.getTestBranch()); } public static Collection<Artifact> getCoveragePackageArtifacts() throws OseeCoreException { - return StaticIdManager.getArtifactsFromArtifactQuery(CoverageArtifactTypes.CoveragePackage, COVERAGE_STATIC_ID, - CoverageTestUtil.getTestBranch()); + return ArtifactQuery.getArtifactListFromTypeAndAttribute(CoverageArtifactTypes.CoveragePackage, + CoreAttributeTypes.StaticId, COVERAGE_STATIC_ID, CoverageTestUtil.getTestBranch()); } public static Collection<Artifact> getCoverageRecordArtifacts() throws OseeCoreException { - return StaticIdManager.getArtifactsFromArtifactQuery(CoreArtifactTypes.GeneralDocument, COVERAGE_STATIC_ID, - CoverageTestUtil.getTestBranch()); + return ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.GeneralDocument, + CoreAttributeTypes.StaticId, COVERAGE_STATIC_ID, CoverageTestUtil.getTestBranch()); } public static void setAllCoverageMethod(CoverageUnit coverageUnit, CoverageOption CoverageOption, boolean recurse) { 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 489645b59dc..1602e9faa57 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 @@ -10,10 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.define; +import junit.framework.Assert; 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.eclipse.osee.framework.plugin.core.util.OseeData; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; @@ -26,10 +28,12 @@ public final class AllDefineTestSuite { public static void setUp() throws Exception { OseeProperties.setIsInTest(true); System.out.println("\n\nBegin " + AllDefineTestSuite.class.getSimpleName()); + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); } @AfterClass public static void tearDown() throws Exception { + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); System.out.println("End " + AllDefineTestSuite.class.getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/OseeData.java b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/OseeData.java index 8432f7b3581..96f36d2d3be 100644 --- a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/OseeData.java +++ b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/OseeData.java @@ -36,7 +36,7 @@ import org.eclipse.osee.framework.plugin.core.internal.PluginCoreActivator; */ public class OseeData { private static final IPath workspacePath = ResourcesPlugin.getWorkspace().getRoot().getLocation(); - private static final String oseeDataPathName = ".osee.data"; + private static final String oseeDataPathName = "osee.data"; private static final IPath oseeDataPath = workspacePath.append(oseeDataPathName); private static final File oseeDir = oseeDataPath.toFile(); private static IProject project; @@ -50,6 +50,22 @@ public class OseeData { createProject(); } + public static void ensureProjectOpen() { + if (project != null) { + if (!project.isOpen()) { + OseeLog.log(PluginCoreActivator.class, Level.SEVERE, oseeDataPathName + " project is closed; re-opening"); + openProject(); + } + } + } + + public static boolean isProjectOpen() { + if (project != null) { + return project.isOpen(); + } + return true; + } + public static IPath getPath() { return oseeDataPath; } @@ -59,6 +75,7 @@ public class OseeData { } public static IFile getIFile(String fileName) { + ensureProjectOpen(); return project.getFile(fileName); } @@ -67,6 +84,7 @@ public class OseeData { } public static IFile getIFile(String fileName, InputStream in, boolean overwrite) throws OseeCoreException { + ensureProjectOpen(); IFile iFile = project.getFile(fileName); if (!iFile.exists() || overwrite) { AIFile.writeToFile(iFile, in); @@ -80,35 +98,42 @@ public class OseeData { } private static boolean createProject() { + ensureProjectOpen(); IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot(); project = workspaceRoot.getProject(oseeDataPathName); if (!project.exists()) { try { project.create(null); } catch (CoreException ex) { - ex.printStackTrace(); + OseeLog.log(PluginCoreActivator.class, Level.SEVERE, ex); return false; } + openProject(); } + return true; + } + + private static void openProject() { try { project.open(null); } catch (CoreException e) { - e.printStackTrace(); - return false; + OseeLog.log(PluginCoreActivator.class, Level.SEVERE, e); } - return true; } /** * @return Returns the project. */ public static IProject getProject() { + ensureProjectOpen(); return project; } public static IFolder getFolder(String name) throws OseeCoreException { try { + ensureProjectOpen(); IFolder folder = project.getFolder(name); + ensureProjectOpen(); if (!folder.exists()) { folder.create(true, true, null); 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 c18f677a828..b1eb38e25d5 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 @@ -13,6 +13,7 @@ package org.eclipse.osee.framework.skynet.core; 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.skynet.core.artifact.ArtifactCacheQueryTest; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPurgeTest; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTestSuite; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeInheritanceTest; @@ -28,7 +29,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.PurgeTransactionTest; import org.eclipse.osee.framework.skynet.core.artifact.RelationDeletionTest; import org.eclipse.osee.framework.skynet.core.artifact.RelationOrderingTest; import org.eclipse.osee.framework.skynet.core.artifact.ReplaceWithAttributeTest; -import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManagerTest; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactLoaderTest; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQueryTestDemo; import org.eclipse.osee.framework.skynet.core.event.filter.ArtifactEventFiltersTest; @@ -89,7 +89,7 @@ import org.junit.runners.Suite; ConflictTest.class, ChangeManagerTest.class, RelationDeletionTest.class, - StaticIdManagerTest.class, + ArtifactCacheQueryTest.class, BranchStateTest.class, DuplicateHridTest.class, RelationOrderingTest.class, diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCacheQueryTest.java index 0d97a28b9ac..7903c51c712 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCacheQueryTest.java @@ -14,12 +14,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; - import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; @@ -34,9 +32,11 @@ import org.junit.Before; import org.junit.BeforeClass; /** + * Test unit for {@link ArtifactCacheQuery} + * * @author Donald G. Dunne */ -public class StaticIdManagerTest { +public class ArtifactCacheQueryTest { private static final String STATIC_ID_AAA = "aaa"; private static final String STATIC_ID_BBB = "bbb"; @@ -63,8 +63,8 @@ public class StaticIdManagerTest { for (String staticIdValue : ALL_STATIC_IDS) { Collection<Artifact> artifacts = - StaticIdManager.getArtifactsFromArtifactQuery(CoreArtifactTypes.GeneralData, staticIdValue, - BranchManager.getCommonBranch()); + ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.GeneralData, + CoreAttributeTypes.StaticId, staticIdValue, BranchManager.getCommonBranch()); for (Artifact artifact : artifacts) { System.err.println("Search returned non-deleted " + artifact.getGuid()); } @@ -77,60 +77,64 @@ public class StaticIdManagerTest { assertTrue("Should be run on demo datbase.", TestUtil.isDemoDb()); } + /** + * Test method for (@link ArtifactCacheQuery.getOrCreateSingletonArtifactByText, ArtifactCache.getListByTextId} + */ @org.junit.Test public void testStaticIdsGettingCached() throws OseeCoreException { String staticId = "org." + GUID.create(); - Collection<Artifact> artifacts = ArtifactCache.getArtifactsByStaticId(staticId); - assertTrue("Should be 0; Returned " + artifacts.size(), artifacts.isEmpty()); - Artifact art = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, BranchManager.getCommonBranch()); - art.addAttribute(CoreAttributeTypes.StaticId, staticId); - art.persist(); + Artifact artifact = + ArtifactCacheQuery.getOrCreateSingletonArtifactByText(CoreArtifactTypes.GeneralData, + CoreAttributeTypes.StaticId, staticId, BranchManager.getCommonBranch()); + assertNotNull(artifact); + artifact.addAttribute(CoreAttributeTypes.StaticId, staticId); + artifact.persist(); - artifacts = ArtifactCache.getArtifactsByStaticId(staticId); + Collection<Artifact> artifacts = ArtifactCache.getListByTextId(staticId, BranchManager.getCommonBranch()); assertTrue("Should be 1; Returned " + artifacts.size(), artifacts.size() == 1); - art.deleteAndPersist(); - artifacts = ArtifactCache.getArtifactsByStaticId(staticId); + artifact.deleteAndPersist(); + artifacts = ArtifactCache.getListByTextId(staticId, BranchManager.getCommonBranch()); assertTrue("Should be 0; Returned " + artifacts.size(), artifacts.isEmpty()); } /** - * Test method for - * {@link org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager#getSingletonArtifact(java.lang.String, java.lang.String, org.eclipse.osee.framework.skynet.core.artifact.Branch, boolean)} - * . + * Test method for {@link ArtifactCacheQuery.getSingletonArtifactByText, + * ArtifactCacheQuery.getOrCreateSingletonArtifactByText} */ @org.junit.Test public void testGetSingletonArtifact() throws OseeCoreException { Artifact artifact = - StaticIdManager.getSingletonArtifact(CoreArtifactTypes.GeneralData, STATIC_ID_AAA, - BranchManager.getCommonBranch(), true); + ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralData, CoreAttributeTypes.StaticId, + STATIC_ID_AAA, BranchManager.getCommonBranch(), true); assertNull(artifact); artifact = - StaticIdManager.getOrCreateSingletonArtifact(CoreArtifactTypes.GeneralData, STATIC_ID_AAA, - BranchManager.getCommonBranch()); + ArtifactCacheQuery.getOrCreateSingletonArtifactByText(CoreArtifactTypes.GeneralData, + CoreAttributeTypes.StaticId, STATIC_ID_AAA, BranchManager.getCommonBranch()); assertNotNull(artifact); deleteArtifacts(Arrays.asList(artifact), STATIC_ID_AAA); } /** - * Test method for - * {@link org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager#setSingletonAttributeValue(org.eclipse.osee.framework.skynet.core.artifact.Artifact, java.lang.String)} + * Test unif or {@link ArtifactCacheQuery.getSingletonArtifactByText, Artifact.setSingletonAttributeValue} */ @org.junit.Test public void testSetSingletonAttributeValue() throws OseeCoreException { // create artifact with two of same static id values Artifact artifact = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, BranchManager.getCommonBranch()); + artifact.persist(); artifact.addAttribute(CoreAttributeTypes.StaticId, STATIC_ID_BBB); artifact.addAttribute(CoreAttributeTypes.StaticId, STATIC_ID_BBB); - artifact.persist(); + ArtifactCache.cacheByTextId(STATIC_ID_BBB, artifact); + ArtifactCache.cacheByTextId(STATIC_ID_BBB, artifact); // call to search for artifact with STATIC_ID_BBB Artifact artifactWithDoubleBbb = - StaticIdManager.getSingletonArtifact(CoreArtifactTypes.GeneralData, STATIC_ID_BBB, - BranchManager.getCommonBranch(), false); + ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralData, CoreAttributeTypes.StaticId, + STATIC_ID_BBB, BranchManager.getCommonBranch(), false); assertNotNull(artifactWithDoubleBbb); // should be two static id attributes @@ -141,7 +145,7 @@ public class StaticIdManagerTest { assertTrue("Expected 2 attributes; Returned " + count, count == 2); // call to set singleton which should resolve duplicates - StaticIdManager.setSingletonAttributeValue(artifactWithDoubleBbb, STATIC_ID_BBB); + artifactWithDoubleBbb.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_BBB); // should now be only one static id attributes count = artifactWithDoubleBbb.getAttributeCount(CoreAttributeTypes.StaticId); @@ -151,44 +155,13 @@ public class StaticIdManagerTest { } /** - * Test method for - * {@link org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager#getArtifactsFromArtifactQuery(java.lang.String, java.lang.String, org.eclipse.osee.framework.skynet.core.artifact.Branch)} - * . - */ - @org.junit.Test - public void testGetArtifacts() throws OseeCoreException { - SkynetTransaction transaction = - new SkynetTransaction(BranchManager.getCommonBranch(), "Static Id Manager: create test artifacts"); - // Create three artifacts with ccc staticId - - for (int index = 0; index < 3; index++) { - Artifact artifact = - ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, BranchManager.getCommonBranch()); - StaticIdManager.setSingletonAttributeValue(artifact, STATIC_ID_CCC); - artifact.persist(transaction); - assertNotNull(artifact); - } - transaction.execute(); - - // search for static attributes - Collection<Artifact> artifacts = - StaticIdManager.getArtifactsFromArtifactQuery(CoreArtifactTypes.GeneralData, STATIC_ID_CCC, - BranchManager.getCommonBranch()); - assertTrue("Expected 3 artifacts; Returned " + artifacts.size(), artifacts.size() == 3); - - deleteArtifacts(artifacts, STATIC_ID_CCC); - } - - /** - * Test method for - * {@link org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager#getSingletonArtifactOrException(java.lang.String, java.lang.String, org.eclipse.osee.framework.skynet.core.artifact.Branch)} - * . + * Test method for {@link ArtifactCacheQuery#getSingletonArtifactCacheByTextOrException} . */ @org.junit.Test public void testGetSingletonArtifactOrException() throws OseeCoreException { try { - StaticIdManager.getSingletonArtifactOrException(CoreArtifactTypes.GeneralData, STATIC_ID_DDD, - BranchManager.getCommonBranch()); + ArtifactCacheQuery.getSingletonArtifactByTextOrException(CoreArtifactTypes.GeneralData, + CoreAttributeTypes.StaticId, STATIC_ID_DDD, BranchManager.getCommonBranch()); fail("ArtifactDoesNotExist should have been thrown."); } catch (Exception ex) { assertTrue("Was not ArtifactDoesNotExist was: " + ex.getClass().getSimpleName(), @@ -201,7 +174,8 @@ public class StaticIdManagerTest { for (int index = 0; index < 2; index++) { Artifact artifact = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, BranchManager.getCommonBranch()); - StaticIdManager.setSingletonAttributeValue(artifact, STATIC_ID_DDD); + artifact.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_DDD); + ArtifactCache.cacheByTextId(STATIC_ID_DDD, artifact); artifact.persist(transaction); assertNotNull(artifact); artifacts.add(artifact); @@ -209,8 +183,8 @@ public class StaticIdManagerTest { transaction.execute(); try { - StaticIdManager.getSingletonArtifactOrException(CoreArtifactTypes.GeneralData, STATIC_ID_DDD, - BranchManager.getCommonBranch()); + ArtifactCacheQuery.getSingletonArtifactByTextOrException(CoreArtifactTypes.GeneralData, + CoreAttributeTypes.StaticId, STATIC_ID_DDD, BranchManager.getCommonBranch()); fail("MultipleArtifactsExist should have been thrown"); } catch (Exception ex) { assertTrue("Was not MultipleArtifactsExist was: " + ex.getClass().getSimpleName(), @@ -220,6 +194,9 @@ public class StaticIdManagerTest { deleteArtifacts(artifacts, STATIC_ID_DDD); } + /** + * Test unit for {@link ArtifactCache.getListByTextId} that deleted artifacts not returned + */ private void deleteArtifacts(Collection<Artifact> toDelete, String staticId) throws OseeCoreException { if (!toDelete.isEmpty()) { if (toDelete.size() == 1) { @@ -236,15 +213,14 @@ public class StaticIdManagerTest { transaction.execute(); } - Collection<Artifact> artifacts = ArtifactCache.getArtifactsByStaticId(staticId); + Collection<Artifact> artifacts = ArtifactCache.getListByTextId(staticId, BranchManager.getCommonBranch()); assertTrue("Should be 0; Returned " + artifacts.size(), artifacts.isEmpty()); } } /** - * Test method for - * {@link org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager#getSingletonArtifact(java.lang.String, java.lang.String, org.eclipse.osee.framework.skynet.core.artifact.Branch)} - * . + * Test method for {@link ArtifactCacheQuery.getOrCreateSingletonArtifactByText, + * ArtifactCacheQuery.getSingletonArtifactByText} . */ @org.junit.Test public void testGetSingletonArtifactStringStringBranch() throws OseeCoreException { @@ -254,8 +230,8 @@ public class StaticIdManagerTest { SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "create single artifact with eee staticId"); Artifact artifact = - StaticIdManager.getOrCreateSingletonArtifact(CoreArtifactTypes.GeneralData, STATIC_ID_EEE, - BranchManager.getCommonBranch()); + ArtifactCacheQuery.getOrCreateSingletonArtifactByText(CoreArtifactTypes.GeneralData, + CoreAttributeTypes.StaticId, STATIC_ID_EEE, BranchManager.getCommonBranch()); artifact.persist(transaction); assertNotNull(artifact); transaction.execute(); @@ -264,14 +240,14 @@ public class StaticIdManagerTest { // test that singleton comes back artifact = - StaticIdManager.getSingletonArtifact(CoreArtifactTypes.GeneralData, STATIC_ID_EEE, - BranchManager.getCommonBranch(), false); + ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralData, CoreAttributeTypes.StaticId, + STATIC_ID_EEE, BranchManager.getCommonBranch(), false); assertNotNull(artifact); // create another artifact with eee staticId transaction = new SkynetTransaction(BranchManager.getCommonBranch(), "create another artifact with eee staticId"); artifact = ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralData, BranchManager.getCommonBranch()); - StaticIdManager.setSingletonAttributeValue(artifact, STATIC_ID_EEE); + artifact.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_EEE); artifact.persist(transaction); assertNotNull(artifact); transaction.execute(); @@ -279,15 +255,15 @@ public class StaticIdManagerTest { // test that there are now two artifacts with eee Collection<Artifact> artifacts = - StaticIdManager.getArtifactsFromArtifactQuery(CoreArtifactTypes.GeneralData, STATIC_ID_EEE, - BranchManager.getCommonBranch()); + ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.GeneralData, CoreAttributeTypes.StaticId, + STATIC_ID_EEE, BranchManager.getCommonBranch()); assertTrue("Expected 2 artifacts; Returned " + artifacts.size(), artifacts.size() == 2); // test that call to get singleton does NOT exception try { artifact = - StaticIdManager.getSingletonArtifact(CoreArtifactTypes.GeneralData, STATIC_ID_EEE, - BranchManager.getCommonBranch(), false); + ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralData, CoreAttributeTypes.StaticId, + STATIC_ID_EEE, BranchManager.getCommonBranch(), false); assertNotNull(artifact); } catch (Exception ex) { fail("Exception should not have occurred " + ex.getLocalizedMessage()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java index e67d518b9e7..b08430250dc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_getLastModified.java @@ -12,12 +12,11 @@ package org.eclipse.osee.framework.skynet.core.artifact; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; - import java.util.Collection; import java.util.Date; - import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; @@ -58,7 +57,7 @@ public class Artifact_getLastModified { previousModifyDate = artifact.getLastModified(); // Test post-modified - StaticIdManager.setSingletonAttributeValue(artifact, "this"); + artifact.setSingletonAttributeValue(CoreAttributeTypes.StaticId, "this"); Thread.sleep(1100); // just enough time to guarantee the date will be at least a second later artifact.persist(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java index 72fd3cc7e62..4cf30fff07a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/RelationOrderingTest.java @@ -13,6 +13,7 @@ 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.HashSet; import java.util.List; import java.util.Set; import org.eclipse.osee.framework.core.data.IArtifactType; @@ -24,6 +25,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.junit.After; import org.junit.AfterClass; @@ -48,9 +50,9 @@ public class RelationOrderingTest { @BeforeClass @AfterClass public static void setupTeardown() throws Exception { - Set<Artifact> artsToDel = - StaticIdManager.getArtifactsFromArtifactQuery(CoreArtifactTypes.Folder, STATIC_ID_TO_DELETE, - BranchManager.getCommonBranch()); + Set<Artifact> artsToDel = new HashSet<Artifact>(); + artsToDel.addAll(ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.Folder, + CoreAttributeTypes.StaticId, STATIC_ID_TO_DELETE, BranchManager.getCommonBranch())); if (artsToDel.size() > 0) { new PurgeArtifacts(artsToDel).execute(); Thread.sleep(5000); @@ -187,7 +189,7 @@ public class RelationOrderingTest { ArtifactTypeManager.addArtifact(CoreArtifactTypes.Folder, BranchManager.getCommonBranch(), "Main Folder - " + guid); mainFolder.persist(transaction); - StaticIdManager.setSingletonAttributeValue(mainFolder, STATIC_ID_TO_DELETE); + mainFolder.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_TO_DELETE); OseeSystemArtifacts.getDefaultHierarchyRootArtifact(BranchManager.getCommonBranch()).addChild(mainFolder); List<Artifact> children = new ArrayList<Artifact>(); for (int x = 0; x < 3; x++) { @@ -195,7 +197,7 @@ public class RelationOrderingTest { ArtifactTypeManager.addArtifact(CoreArtifactTypes.Folder, BranchManager.getCommonBranch(), "New Child " + x + " - " + guid); children.add(childArt); - StaticIdManager.setSingletonAttributeValue(childArt, STATIC_ID_TO_DELETE); + childArt.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_TO_DELETE); mainFolder.addChild(childArt); childArt.persist(transaction); } @@ -206,7 +208,7 @@ public class RelationOrderingTest { ArtifactTypeManager.addArtifact(CoreArtifactTypes.Folder, BranchManager.getCommonBranch(), "New Artifact " + guid); mainFolder.addChild(newArtifact); - StaticIdManager.setSingletonAttributeValue(newArtifact, STATIC_ID_TO_DELETE); + newArtifact.setSingletonAttributeValue(CoreAttributeTypes.StaticId, STATIC_ID_TO_DELETE); newArtifact.persist(); for (Artifact child : children) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java index 2f228c4c8b6..380ba3f3f85 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEventTest.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; - import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -37,7 +36,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.ChangeArtifactType; -import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.event.FrameworkEventUtil; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; @@ -242,7 +240,7 @@ public class ArtifactEventTest { private void testArtifactRelationEvents__modifyArtifact(Artifact newArt) throws Exception { clearEventCollections(); - StaticIdManager.setSingletonAttributeValue(newArt, "this"); + newArt.setSingletonAttributeValue(CoreAttributeTypes.StaticId, "this"); newArt.persist(); Assert.assertEquals(1, resultEventArtifacts.size()); @@ -828,7 +826,7 @@ public class ArtifactEventTest { Assert.assertEquals(1, OseeEventManager.getNumberOfListeners()); // reload Artifact - StaticIdManager.setSingletonAttributeValue(newArt, "this"); + newArt.setSingletonAttributeValue(CoreAttributeTypes.StaticId, "this"); Assert.assertTrue(newArt.isDirty()); newArt.reloadAttributesAndRelations(); Assert.assertFalse(newArt.isDirty()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java index b9b7e4a3d0d..06ad05b9814 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java @@ -751,6 +751,32 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB } /** + * Will add the single string value if it does not already exist. Will also cleanup if more than one exists with same + * value. Will not touch any other values. + */ + public void setSingletonAttributeValue(IAttributeType attributeType, String value) throws OseeCoreException { + List<Attribute<String>> attributes = getAttributes(CoreAttributeTypes.StaticId, value); + if (attributes.isEmpty()) { + addAttribute(attributeType, value); + } else if (attributes.size() > 1) { + // keep one of the attributes + for (int x = 1; x < attributes.size(); x++) { + Attribute<String> attr = attributes.get(x); + attr.delete(); + } + } + } + + /** + * Will remove one or more of the single string value if artifact has it. Will not touch any other values. + */ + public void deleteSingletonAttributeValue(IAttributeType attributeType, String value) throws OseeCoreException { + for (Attribute<?> attribute : getAttributes(attributeType, value)) { + attribute.delete(); + } + } + + /** * All existing attributes matching a new value will be left untouched. Then for any remaining values, other existing * attributes will be changed to match or if need be new attributes will be added to stored these values. Finally any * excess attributes will be deleted. diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java index 38f88883b09..8b001407487 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCache.java @@ -17,9 +17,9 @@ import java.util.List; import java.util.Set; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact; import org.eclipse.osee.framework.core.model.event.IBasicGuidArtifact; @@ -91,14 +91,6 @@ public final class ArtifactCache { ACTIVE_CACHE.updateReferenceType(artId, branchId); } - static void cachePostAttributeLoad(Artifact artifact) throws OseeCoreException { - if (!artifact.isHistorical()) { - for (String staticId : artifact.getAttributesToStringList(CoreAttributeTypes.StaticId)) { - cacheByStaticId(staticId, artifact); - } - } - } - /** * @returns the previous value associated with keys, or null if there was no mapping for key. (A null return can also * indicate that the map previously associated null with key, if the implementation supports null values.) @@ -110,27 +102,6 @@ public final class ArtifactCache { return ACTIVE_CACHE.cacheByText(key, artifact); } - public static void cacheByStaticId(String staticId, Artifact artifact) throws OseeCoreException { - if (artifact.isHistorical()) { - throw new OseeArgumentException("historical artifact cannot be cached by staticId [%s]", staticId); - } - ACTIVE_CACHE.cacheByStaticId(staticId, artifact); - } - - public static void cacheByStaticId(Artifact artifact) throws OseeCoreException { - for (String staticId : artifact.getAttributesToStringList(CoreAttributeTypes.StaticId)) { - cacheByStaticId(staticId, artifact); - } - } - - public static Collection<Artifact> getArtifactsByStaticId(String staticId) { - return ACTIVE_CACHE.getByStaticId(staticId); - } - - public static Collection<Artifact> getArtifactsByStaticId(String staticId, IOseeBranch branch) { - return ACTIVE_CACHE.getByStaticId(staticId, branch); - } - public static List<Artifact> getArtifactsByType(IArtifactType artifactType) { return ACTIVE_CACHE.getByType(artifactType); } @@ -220,10 +191,31 @@ public final class ArtifactCache { } /** - * @returns the active artifact based on the previously provided text key and branch + * Return single active artifact stored by text and branch or null if none. + * + * @throws OseeStateException if more than one artifact stored. */ public static Artifact getByTextId(String key, IOseeBranch branch) throws OseeCoreException { - return ACTIVE_CACHE.getByText(key, BranchManager.getBranch(branch)); + Artifact artifact = ACTIVE_CACHE.getByText(key, BranchManager.getBranch(branch)); + // decache if deleted + if (artifact != null && artifact.isDeleted()) { + ACTIVE_CACHE.deCacheByText(key, branch, artifact); + } + return artifact; + } + + public static Collection<Artifact> getListByTextId(String key, IOseeBranch branch) throws OseeCoreException { + List<Artifact> artifacts = new ArrayList<Artifact>(); + Collection<Artifact> cached = ACTIVE_CACHE.getListByText(key, BranchManager.getBranch(branch)); + // decache any deleted artifacts + for (Artifact artifact : cached) { + if (artifact.isDeleted()) { + ACTIVE_CACHE.deCacheByText(key, branch, artifact); + } else { + artifacts.add(artifact); + } + } + return artifacts; } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCacheQuery.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCacheQuery.java new file mode 100644 index 00000000000..a0d2eb6da40 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactCacheQuery.java @@ -0,0 +1,109 @@ +/* + * Created on May 17, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.framework.skynet.core.artifact; + +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; +import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; +import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.skynet.core.internal.Activator; + +/** + * @author Donald G. Dunne + */ +public class ArtifactCacheQuery { + + /** + * Return non-deleted artifacts stored in ArtifactCache. If queryIfNotFound, query artifacts and cacheByText results + * before returning. + */ + public static Set<Artifact> getArtifactsFromArtifactByText(IArtifactType artifactType, IAttributeType attributeType, String text, IOseeBranch branch, boolean queryIfNotFound) throws OseeCoreException { + Set<Artifact> artifacts = new HashSet<Artifact>(); + // Retrieve cached artifacts first + for (Artifact artifact : ArtifactCache.getListByTextId(text, branch)) { + if (artifact.isOfType(artifactType) && !artifact.isDeleted()) { + artifacts.add(artifact); + } + } + if (artifacts.size() > 0) { + OseeLog.log(Activator.class, Level.FINE, "CacheByText Load: [" + text + "][" + artifactType + "]"); + } + if (queryIfNotFound && artifacts.isEmpty()) { + artifacts.clear(); + for (Artifact artifact : ArtifactQuery.getArtifactListFromTypeAndAttribute(artifactType, attributeType, text, + branch)) { + artifacts.add(artifact); + ArtifactCache.cacheByTextId(text, artifact); + } + } + return artifacts; + } + + /** + * Get artifact, query if not already found and cacheByText. + */ + public static Artifact getSingletonArtifactByTextOrException(IArtifactType artifactType, IAttributeType attributeType, String text, Branch branch) throws OseeCoreException { + Set<Artifact> artifacts = getArtifactsFromArtifactByText(artifactType, attributeType, text, branch, true); + // Exception on problems + if (artifacts.isEmpty()) { + throw new ArtifactDoesNotExist("No artifact with [%s] [%s] found.", attributeType, text); + } else if (artifacts.size() > 1) { + throw new MultipleArtifactsExist("Expected 1 artifact with [%s] [%s] not %d", attributeType, text, + artifacts.size()); + } + return artifacts.iterator().next(); + } + + /** + * Return singleton artifact from ArtifactCache. If queryIfNotFound, perform query and cacheByText result. + */ + public static Artifact getSingletonArtifactByText(IArtifactType artifactType, IAttributeType attributeType, String text, IOseeBranch branch, boolean queryIfNotFound) throws OseeCoreException { + if (queryIfNotFound) { + return getOrCreateSingletonArtifactHelper(artifactType, attributeType, text, branch, false); + } else { + Set<Artifact> artifacts = getArtifactsFromArtifactByText(artifactType, attributeType, text, branch, false); + if (artifacts.size() > 0) { + return artifacts.iterator().next(); + } + return null; + } + } + + /** + * Return first artifact with attribute (multiples may exist) or create one if non exist + */ + public static Artifact getOrCreateSingletonArtifactByText(IArtifactType artifactType, IAttributeType attributeType, String text, IOseeBranch branch) throws OseeCoreException { + return getOrCreateSingletonArtifactHelper(artifactType, attributeType, text, branch, true); + } + + /** + * Searches for singleton artifact in cache, if not found, queries for existence. + * + * @param create will create artifact and add attribute value not found + */ + private static Artifact getOrCreateSingletonArtifactHelper(IArtifactType artifactType, IAttributeType attributeType, String text, IOseeBranch branch, boolean create) throws OseeCoreException { + Set<Artifact> artifacts = getArtifactsFromArtifactByText(artifactType, attributeType, text, branch, true); + if (artifacts.isEmpty() && create) { + Artifact artifact = ArtifactTypeManager.addArtifact(artifactType, branch); + artifact.setSingletonAttributeValue(attributeType, text); + ArtifactCache.cacheByTextId(text, artifact); + return artifact; + } + if (artifacts.size() > 0) { + return artifacts.iterator().next(); + } + return null; + } + +} diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java index 7b0b3d96657..70f8d84b7de 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java @@ -121,12 +121,6 @@ public final class ArtifactLoader { if (confirmer == null || confirmer.canProceed(loadedItems.size())) { loadArtifactsData(queryId, loadedItems, loadLevel, reload, historical, allowDeleted); - - if (!historical) { - for (Artifact artifact : loadedItems) { - ArtifactCache.cacheByStaticId(artifact); - } - } } } finally { clearQuery(queryId); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java index d149105f955..b76a34fc900 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java @@ -142,7 +142,6 @@ public class AttributeLoader { } setLastAttributePersistTransaction(artifact, transactionNumbers); artifact.meetMinimumAttributeCounts(false); - ArtifactCache.cachePostAttributeLoad(artifact); } } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManager.java deleted file mode 100644 index 2ffe059052f..00000000000 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/StaticIdManager.java +++ /dev/null @@ -1,148 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ - -package org.eclipse.osee.framework.skynet.core.artifact; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IOseeBranch; -import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; -import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; -import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist; -import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.skynet.core.internal.Activator; - -/** - * @author Donald G. Dunne - */ -public class StaticIdManager { - /** - * Will add the single static id value if it does not already exist. Will also cleanup if more than one exists with - * same staticId. - */ - public static void setSingletonAttributeValue(Artifact artifact, String staticId) throws OseeCoreException { - List<Attribute<String>> attributes = artifact.getAttributes(CoreAttributeTypes.StaticId, staticId); - if (attributes.isEmpty()) { - artifact.addAttribute(CoreAttributeTypes.StaticId, staticId); - } else if (attributes.size() > 1) { - // keep one of the attributes - for (int x = 1; x < attributes.size(); x++) { - Attribute<String> attr = attributes.get(x); - attr.delete(); - } - } - ArtifactCache.cacheByStaticId(staticId, artifact); - } - - public static void deletedStaticIdAttribute(Artifact artifact, String staticId) throws OseeCoreException { - List<Attribute<String>> attributes = artifact.getAttributes(CoreAttributeTypes.StaticId, staticId); - for (Attribute<String> attr : attributes) { - attr.delete(); - } - ArtifactCache.cacheByStaticId(staticId, artifact); - } - - public static boolean hasValue(Artifact artifact, String staticId) throws OseeCoreException { - return artifact.getAttributesToStringList(CoreAttributeTypes.StaticId).contains(staticId); - } - - /** - * Return non-deleted artifacts with staticId. This does a new ArtifactQuery each time it's called. - */ - public static Set<Artifact> getArtifactsFromArtifactQuery(IArtifactType artifactType, String staticId, IOseeBranch branch) throws OseeCoreException { - Set<Artifact> artifacts = new HashSet<Artifact>(); - // Retrieve database artifacts if cache has none - artifacts.addAll(ArtifactQuery.getArtifactListFromTypeAndAttribute(artifactType, CoreAttributeTypes.StaticId, - staticId, branch)); - return artifacts; - } - - /** - * Return non-deleted artifacts stored in ArtifactCache. - * - * @param queryIfNotFound if true and artifacts with staticId art not in ArtifactCache, query to find - */ - public static Set<Artifact> getArtifactsFromArtifactCache(IArtifactType artifactType, String staticId, IOseeBranch branch, boolean queryIfNotFound) throws OseeCoreException { - Set<Artifact> artifacts = new HashSet<Artifact>(); - // Retrieve cached artifacts first - for (Artifact artifact : ArtifactCache.getArtifactsByStaticId(staticId, branch)) { - if (artifact.isOfType(artifactType) && !artifact.isDeleted()) { - artifacts.add(artifact); - } - } - if (artifacts.size() > 0) { - OseeLog.log(Activator.class, Level.FINE, "StaticId Load: [" + staticId + "][" + artifactType + "]"); - } - if (queryIfNotFound && artifacts.isEmpty()) { - artifacts = getArtifactsFromArtifactQuery(artifactType, staticId, branch); - } - return artifacts; - } - - public static Artifact getSingletonArtifactOrException(IArtifactType artifactType, String staticId, Branch branch) throws OseeCoreException { - Set<Artifact> artifacts = getArtifactsFromArtifactCache(artifactType, staticId, branch, true); - // Exception on problems - if (artifacts.isEmpty()) { - throw new ArtifactDoesNotExist("No artifact with static id [%s] found.", staticId); - } else if (artifacts.size() > 1) { - throw new MultipleArtifactsExist("Expected 1 artifact with static id [%s] not %d", staticId, artifacts.size()); - } - return artifacts.iterator().next(); - } - - /** - * Return singleton artifact from ArtifactCache. - * - * @param queryIfNotFound true will perform ArtifactQuery if not found - */ - public static Artifact getSingletonArtifact(IArtifactType artifactType, String staticId, IOseeBranch branch, boolean queryIfNotFound) throws OseeCoreException { - if (queryIfNotFound) { - return getOrCreateSingletonArtifactHelper(artifactType, staticId, branch, false); - } else { - Set<Artifact> artifacts = getArtifactsFromArtifactCache(artifactType, staticId, branch, false); - if (artifacts.size() > 0) { - return artifacts.iterator().next(); - } - return null; - } - } - - /** - * Return first artifact with staticId (multiples may exist) or create one if non exist - */ - public static Artifact getOrCreateSingletonArtifact(IArtifactType artifactType, String staticId, IOseeBranch branch) throws OseeCoreException { - return getOrCreateSingletonArtifactHelper(artifactType, staticId, branch, true); - } - - /** - * Searches for singleton artifact in cache, if not found, queries for existence. - * - * @param create will create artifact and add static if not found - */ - private static Artifact getOrCreateSingletonArtifactHelper(IArtifactType artifactType, String staticId, IOseeBranch branch, boolean create) throws OseeCoreException { - Set<Artifact> artifacts = getArtifactsFromArtifactCache(artifactType, staticId, branch, true); - if (artifacts.isEmpty() && create) { - Artifact artifact = ArtifactTypeManager.addArtifact(artifactType, branch); - setSingletonAttributeValue(artifact, staticId); - return artifact; - } - if (artifacts.size() > 0) { - return artifacts.iterator().next(); - } - return null; - } -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java index 64ecdaf86c6..9e04de9c0e9 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/cache/ActiveArtifactCache.java @@ -12,14 +12,16 @@ package org.eclipse.osee.framework.skynet.core.artifact.cache; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap; -import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactKey; @@ -27,26 +29,15 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactKey; * @author Roberto E. Escobar */ public class ActiveArtifactCache extends AbstractArtifactCache { - private static final double TEXT_PERCENT_INITIAL_CAPACITY = 0.20; - private static final double STATIC_ID_PERCENT_INITIAL_CAPACITY = 0.20; private final CompositeKeyHashMap<IArtifactType, ArtifactKey, Object> byArtifactTypeCache; - private final CompositeKeyHashMap<String, IOseeBranch, Object> keyedArtifactCache; - private final HashCollection<String, Object> staticIdArtifactCache; + private final CompositeKeyHashMap<String, IOseeBranch, Set<Object>> keyedArtifactCache; public ActiveArtifactCache(int initialCapacity) { super(initialCapacity); byArtifactTypeCache = new CompositeKeyHashMap<IArtifactType, ArtifactKey, Object>(initialCapacity, true); - int textCacheSize = getFromBase(initialCapacity, TEXT_PERCENT_INITIAL_CAPACITY); - keyedArtifactCache = new CompositeKeyHashMap<String, IOseeBranch, Object>(textCacheSize, true); - - int staticIdCacheSize = getFromBase(initialCapacity, STATIC_ID_PERCENT_INITIAL_CAPACITY); - staticIdArtifactCache = new HashCollection<String, Object>(true, HashSet.class, staticIdCacheSize); - } - - private int getFromBase(int base, double percentage) { - return (int) (base * percentage); + keyedArtifactCache = new CompositeKeyHashMap<String, IOseeBranch, Set<Object>>(200, true); } @Override @@ -60,47 +51,8 @@ public class ActiveArtifactCache extends AbstractArtifactCache { public void deCache(Artifact artifact) { super.deCache(artifact); byArtifactTypeCache.remove(artifact.getArtifactType(), new ArtifactKey(artifact)); - // TODO ? - // deCacheFromTextCache(artifact); - // deCacheFromStaticIdCache(artifact); } - // private void deCacheFromTextCache(Artifact artifact) { - // List<Pair<String, IOseeBranch>> toRemove = new ArrayList<Pair<String, IOseeBranch>>(); - // for (Entry<Pair<String, IOseeBranch>, Object> entry : keyedArtifactCache.entrySet()) { - // Object object = entry.getValue(); - // Artifact cachedArt = asArtifact(object); - // if (cachedArt == null || cachedArt.equals(artifact)) { - // toRemove.add(entry.getKey()); - // } - // } - // - // for (Pair<String, IOseeBranch> key : toRemove) { - // keyedArtifactCache.remove(key.getFirst(), key.getSecond()); - // } - // } - // - // private void deCacheFromStaticIdCache(Artifact artifact) { - // HashCollection<String, Object> keysToRemove = new HashCollection<String, Object>(); - // for (String name : staticIdArtifactCache.keySet()) { - // Collection<Object> items = staticIdArtifactCache.getValues(name); - // if (items != null) { - // for (Object object : items) { - // Artifact cachedArt = asArtifact(object); - // if (cachedArt == null || cachedArt.equals(artifact)) { - // keysToRemove.put(name, object); - // } - // } - // } - // } - // - // for (String name : keysToRemove.keySet()) { - // for (Object object : keysToRemove.getValues(name)) { - // staticIdArtifactCache.removeValue(name, object); - // } - // } - // } - @Override protected Integer getKey2(Artifact artifact) { return artifact.getBranch().getId(); @@ -132,36 +84,36 @@ public class ActiveArtifactCache extends AbstractArtifactCache { return items; } - public Artifact getByText(String text, Branch branch) { - return asArtifact(keyedArtifactCache.get(text, branch)); + public void deCacheByText(String text, IOseeBranch branch, Artifact artifact) { + super.deCache(artifact); + Set<Object> objects = keyedArtifactCache.get(text, branch); + objects.remove(artifact); } - public Collection<Artifact> getByStaticId(String staticId) { - Set<Artifact> artifacts = new HashSet<Artifact>(); - Collection<Object> cachedArts = staticIdArtifactCache.getValues(staticId); - if (cachedArts != null) { - for (Object obj : cachedArts) { - Artifact artifact = asArtifact(obj); - if (artifact != null && !artifact.isDeleted()) { - artifacts.add(artifact); - } + /** + * Return single artifact stored by text and branch or null if none. + * + * @throws OseeStateException if more than one artifact stored. + */ + public Artifact getByText(String text, IOseeBranch branch) throws OseeCoreException { + Set<Object> objects = keyedArtifactCache.get(text, branch); + if (objects != null) { + if (objects.size() > 1) { + throw new OseeStateException(String.format("Expected only one value for [%s]; found [%d]", text, + objects.size())); + } else if (objects.size() == 1) { + return asArtifact(objects.iterator().next()); } } - return artifacts; + return null; } - public Collection<Artifact> getByStaticId(String staticId, IOseeBranch branch) { - Set<Artifact> artifacts = new HashSet<Artifact>(); - Collection<Object> cachedArts = staticIdArtifactCache.getValues(staticId); - if (cachedArts != null) { - for (Object obj : cachedArts) { - Artifact artifact = asArtifact(obj); - if (artifact != null && !artifact.isDeleted() && artifact.getBranch().equals(branch)) { - artifacts.add(artifact); - } - } + public Collection<Artifact> getListByText(String text, IOseeBranch branch) { + Set<Object> objects = keyedArtifactCache.get(text, branch); + if (objects == null) { + return Collections.emptyList(); } - return artifacts; + return org.eclipse.osee.framework.jdk.core.util.Collections.castAll(objects); } /** @@ -169,17 +121,17 @@ public class ActiveArtifactCache extends AbstractArtifactCache { * indicate that the map previously associated null with key, if the implementation supports null values.) */ public Artifact cacheByText(String key, Artifact artifact) { - Object object = cache(artifact); - return asArtifact(keyedArtifactCache.put(key, artifact.getBranch(), object)); - } - - /** - * @returns the previous value associated with keys, or null if there was no mapping for key. (A null return can also - * indicate that the map previously associated null with key, if the implementation supports null values.) - */ - public Artifact cacheByStaticId(String staticId, Artifact artifact) { - Object object = cache(artifact); - return asArtifact(staticIdArtifactCache.put(staticId, object)); + cache(artifact); + Set<Object> objects = keyedArtifactCache.get(key, artifact.getBranch()); + if (objects == null) { + objects = new HashSet<Object>(); + keyedArtifactCache.put(key, artifact.getBranch(), objects); + } + if (objects.contains(artifact)) { + return artifact; + } + objects.add(artifact); + return null; } @Override @@ -188,7 +140,6 @@ public class ActiveArtifactCache extends AbstractArtifactCache { builder.append(super.toString()); builder.append(String.format("ByType: [%s]\n", byArtifactTypeCache.size())); builder.append(String.format("ByText: [%s]\n", keyedArtifactCache.size())); - builder.append(String.format("ByStaticId: [%s]\n", staticIdArtifactCache.size())); return builder.toString(); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java index 0e0372af425..66b5a60de6a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.attribute; -import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.model.TransactionRecord; @@ -18,7 +17,6 @@ import org.eclipse.osee.framework.core.util.HttpProcessor; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.OseeSql; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.attribute.utils.AttributeURL; import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent; @@ -60,11 +58,6 @@ public class AttributeTransactionData extends BaseTransactionData { @Override protected void internalUpdate(TransactionRecord transactionId) throws OseeCoreException { attribute.internalSetGammaId(getGammaId()); - - if (attribute.isOfType(CoreAttributeTypes.StaticId)) { - ArtifactCache.cacheByStaticId((String) attribute.getValue(), attribute.getArtifact()); - } - attribute.getArtifact().setTransactionId(transactionId.getId()); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifact.java index 3e3f3e114a1..9a5fb872605 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifact.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifact.java @@ -16,8 +16,8 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCacheQuery; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; -import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; /** * Supports the loading, modifying and saving of General Document artifacts of extension csv @@ -67,12 +67,14 @@ public class CsvArtifact { artifact.setName(artifactName); artifact.setSoleAttributeValue(CoreAttributeTypes.Extension, "csv"); artifact.setSoleAttributeFromString(CoreAttributeTypes.NativeContent, csvData); - StaticIdManager.setSingletonAttributeValue(artifact, staticId); + artifact.setSingletonAttributeValue(CoreAttributeTypes.StaticId, staticId); return new CsvArtifact(artifact); } public static CsvArtifact getCsvArtifact(String staticId, IOseeBranch branch, boolean create) throws OseeCoreException { - Artifact art = StaticIdManager.getSingletonArtifact(CoreArtifactTypes.GeneralDocument, staticId, branch, true); + Artifact art = + ArtifactCacheQuery.getSingletonArtifactByText(CoreArtifactTypes.GeneralDocument, CoreAttributeTypes.StaticId, + staticId, branch, true); if (art != null) { return new CsvArtifact(art); } 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 f56163fb68b..fa882a2efd1 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 @@ -11,8 +11,10 @@ package org.eclipse.osee.framework.ui.skynet.test; import static org.junit.Assert.assertTrue; +import junit.framework.Assert; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; +import org.eclipse.osee.framework.plugin.core.util.OseeData; 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; @@ -74,10 +76,12 @@ public class FrameworkUi_Demo_Suite { ClientSessionManager.getSession().getAuthenticationProtocol().equals("demo")); OseeProperties.setIsInTest(true); System.out.println("\n\nBegin " + FrameworkUi_Demo_Suite.class.getSimpleName()); + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); } @AfterClass public static void tearDown() throws Exception { + Assert.assertTrue("osee.data project should be open", OseeData.isProjectOpen()); 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 86418dd4de2..6514bb98fa3 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 @@ -22,14 +22,15 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.IHealthStatus; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCacheQuery; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; @@ -116,8 +117,8 @@ public abstract class ImageManagerTest { @org.junit.Test public void testGetImageByArtifact() throws Exception { Artifact folder = - StaticIdManager.getOrCreateSingletonArtifact(CoreArtifactTypes.Folder, "user.groups", - BranchManager.getCommonBranch()); + ArtifactCacheQuery.getOrCreateSingletonArtifactByText(CoreArtifactTypes.Folder, CoreAttributeTypes.StaticId, + "user.groups", BranchManager.getCommonBranch()); assertTrue("Image returned not a folder image.", ArtifactImageManager.getImage(folder).equals(ImageManager.getImage(PluginUiImage.FOLDER))); } @@ -126,8 +127,8 @@ public abstract class ImageManagerTest { public void testSetArtifactTypeImageInDb() throws Exception { Artifact folder = - StaticIdManager.getOrCreateSingletonArtifact(CoreArtifactTypes.Folder, "user.groups", - BranchManager.getCommonBranch()); + ArtifactCacheQuery.getOrCreateSingletonArtifactByText(CoreArtifactTypes.Folder, CoreAttributeTypes.StaticId, + "user.groups", BranchManager.getCommonBranch()); // Check folder image assertTrue("Image returned not a \"Folder\" image.", diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost] [German].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost] [German].launch index 4881e79a30f..66cb6e0a1a4 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost] [German].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost] [German].launch @@ -19,11 +19,12 @@ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=INFO -Dosee.arbitration.server=http://localhost:8089 -Dosee.authentication.protocol=demo -Duser.language=de -Duser.country=DE"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.http.registry@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.common@2:true,org.eclipse.platform@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.ui.forms@default:default,org.eclipse.cvs@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.team.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.commons.el@default:default,org.eclipse.ui.editors@default:default,org.mozilla.rhino@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.zest.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.osgi.services@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.core.databinding@default:default,org.eclipse.ui.net@default:default,com.lowagie.itext@default:default,com.jcraft.jsch@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.workbench@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.jdt.core@default:default,org.eclipse.sdk@default:default,org.eclipse.core.net@default:default,org.eclipse.zest.layouts@default:default,org.apache.commons.lang*2.4.0.v20081016-1030@default:default,org.eclipse.osgi.util@default:default,org.apache.lucene.analysis@default:default,org.eclipse.compare@default:default,org.eclipse.team.core@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.boot@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.debug.ui@default:default,org.eclipse.update.ui@default:default,org.eclipse.ui.ide.application@default:default,org.apache.commons.httpclient*3.0.1.v20080605-1930@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.apache.jasper@default:default,org.eclipse.team.svn@default:default,org.apache.commons.logging*1.0.4.v200904062259@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.ui.console@default:default,org.eclipse.core.commands@default:default,org.junit4@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi@-1:true,org.apache.commons.lang*2.1.0.v200803061811@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.debug.core@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.text@default:default,org.eclipse.draw2d@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.help.ui@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.search@default:default,com.ibm.icu@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.help.appserver@default:default,org.eclipse.ant.ui@default:default,org.eclipse.equinox.util@default:default,org.eclipse.core.resources@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.rcp@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.views@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.equinox.ds@1:true,org.eclipse.core.net.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.intro@default:default,org.eclipse.jface@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.team.cvs.ssh@default:default,org.apache.lucene@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.pde.ui@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.platform.doc.user@default:default,org.apache.commons.httpclient*3.1.0.v20080605-1935@default:default,org.eclipse.ui.cheatsheets@default:default,org.junit@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.jdt.doc.isv@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.update.core@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt@default:default,javax.mail.glassfish@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.ant@default:default,org.eclipse.help@default:default,org.eclipse.help.webapp@default:default,javax.servlet.jsp@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.browser@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf@default:default,org.eclipse.core.variables@default:default,org.eclipse.gef@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.jdt.doc.user@default:default,org.eclipse.pde.build@default:default,org.eclipse.swt@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.ui@default:default,org.eclipse.birt.core@default:default,org.eclipse.pde@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.common@default:default,org.eclipse.pde.core@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.ats.test@default:false,org.postgresql.driver@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.define.help.ui@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.updater@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.ui.security@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,net.jini@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.osee.framework.ui.encrypter@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.define@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.browser@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.update.configurator@3:true,org.eclipse.zest.core@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.console@default:default,org.apache.commons.lang@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.editors@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.update.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.jface.text@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.net@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.emf.common@default:default,org.eclipse.sdk@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.ui.win32@default:false,org.eclipse.swt.win32.win32.x86@default:false,org.polarion.eclipse.team.svn.connector@default:default,org.apache.jasper@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.boot@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.help.appserver@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.forms@default:default,org.eclipse.help.ui@default:default,org.eclipse.jface@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.pde.build@default:default,org.apache.lucene@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.http.jetty@default:default,org.junit4@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ui.net@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.search@default:default,org.apache.ant@default:default,org.eclipse.core.databinding@default:default,org.eclipse.team.cvs.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.team.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views@default:default,org.eclipse.gef@default:default,javax.mail.glassfish@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.team.cvs.ssh2@default:default,org.apache.commons.codec@default:default,org.eclipse.team.core@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.birt.core@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.pde@default:default,org.eclipse.core.variables@default:default,org.eclipse.ant.ui@default:default,org.eclipse.jdt.debug.ui@default:default,com.ibm.icu@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.birt.chart.engine@default:default,org.eclipse.ecf.ssl@default:false,javax.servlet@default:default,org.eclipse.osgi.util@default:default,com.jcraft.jsch@default:default,org.eclipse.update.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.platform@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.text@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.cvs@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.pde.core@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.help@default:default,org.eclipse.rcp@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.swt@default:default,javax.servlet.jsp@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.osgi.services@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.pde.doc.user@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.expressions@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ats@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,net.jini@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value=""/> <booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> <booleanAttribute key="useProduct" value="true"/> diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost].launch index 4d27a0bd38c..15d2c92343e 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE Demo product [localhost].launch @@ -12,7 +12,7 @@ <booleanAttribute key="default" value="false"/> <booleanAttribute key="includeFragments" value="false"/> <booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/runtime-workspace1"/> +<stringAttribute key="location" value="${workspace_loc}/runtime-workspace"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-debug"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> @@ -20,8 +20,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/> <booleanAttribute key="restart" value="false"/> -<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.postgresql.driver@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.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.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.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.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.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.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.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.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.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.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.ui.product@default:default,org.eclipse.osee.framework.access@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.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.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"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.codegen.ecore@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.update.configurator@3:true,org.eclipse.zest.core@default:default,com.lowagie.text@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.console@default:default,org.apache.commons.lang@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.ui.editors@default:default,org.eclipse.xtend@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.update.ui@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.team.svn@default:default,org.apache.xml.resolver@default:default,org.eclipse.jface.text@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.sdk@default:default,org.eclipse.pde.junit.runtime@default:default,org.apache.xerces@default:default,org.eclipse.ui.win32@default:false,org.eclipse.swt.win32.win32.x86@default:false,org.polarion.eclipse.team.svn.connector@default:default,org.apache.jasper@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.boot@default:default,org.apache.log4j@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.help.appserver@default:default,org.apache.xml.serializer@default:default,org.eclipse.emf.compare@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.forms@default:default,org.eclipse.help.ui@default:default,org.eclipse.jface@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.pde.build@default:default,org.apache.lucene@default:default,org.postgresql.driver@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.equinox.http.jetty@default:default,org.junit4@default:default,org.eclipse.equinox.frameworkadmin@default:default,com.google.inject@default:default,org.eclipse.jsch.core@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.net@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.xtext.util@default:default,org.mozilla.javascript@default:default,org.eclipse.emf.ecore@default:default,org.antlr.gen@default:default,org.eclipse.search@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.ant@default:default,org.eclipse.core.databinding@default:default,org.eclipse.team.cvs.ui@default:default,org.apache.lucene.analysis@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.runtime.compatibility@default:default,javax.xml@default:default,org.eclipse.team.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views@default:default,org.eclipse.gef@default:default,javax.mail.glassfish@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.pde.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.pde.ui.templates@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.commons.codec@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.team.core@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.h2@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.birt.core@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding.beans@default:default,org.antlr.runtime@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.pde@default:default,org.eclipse.core.variables@default:default,org.eclipse.ant.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.xpand@default:default,com.ibm.icu@default:default,org.eclipse.ecf@default:default,org.eclipse.core.externaltools@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.ds@1:true,org.aopalliance@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.pde.launching@default:default,org.eclipse.xtext@default:default,com.google.collect@default:default,javax.servlet@default:default,org.apache.commons.cli@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.osgi.util@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.update.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.platform@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.core.jobs@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.compare.core@default:default,org.eclipse.text@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.cvs@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.pde.core@default:default,org.eclipse.platform.doc.user@default:default,javax.activation@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.help@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.swt@default:default,javax.servlet.jsp@default:default,org.hamcrest.core@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.osgi.services@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.common@2:true,org.eclipse.pde.doc.user@default:default,org.sat4j.core@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.expressions@default:default,org.mortbay.jetty.server@default:default,org.eclipse.xtext.builder@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.ats.core@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.ats@default:default,jms.libraries@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.define@default:default,org.eclipse.nebula.widgets.xviewer.tests@default:false,org.eclipse.osee.framework.core.dsl.edit@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.dsl.ui@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,net.jini@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value=""/> <booleanAttribute key="tracing" value="false"/> |