Move Database Schema Creation to app server

Create datastore bundle
Misc. osgi service fixes

7 files changed, 40 insertions, 40 deletions

diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoArtifactImageProvider.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoArtifactImageProvider.java
new file mode 100644
index 00000000000..464f8494e83
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoArtifactImageProvider.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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.ats.config.demo.artifact;
+
+import org.eclipse.osee.ats.config.demo.util.DemoImage;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
+import org.eclipse.osee.framework.ui.skynet.ArtifactImageProvider;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class DemoArtifactImageProvider extends ArtifactImageProvider {
+
+   @Override
+   public void init() throws OseeCoreException {
+      ArtifactImageManager.registerBaseImage("Demo Code Team Workflow", DemoImage.DEMO_WORKFLOW, this);
+      ArtifactImageManager.registerBaseImage("Demo Req Team Workflow", DemoImage.DEMO_WORKFLOW, this);
+      ArtifactImageManager.registerBaseImage("Demo Test Team Workflow", DemoImage.DEMO_WORKFLOW, this);
+   }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoArtifactTypes.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoArtifactTypes.java
deleted file mode 100644
index f09d9c7a475..00000000000
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoArtifactTypes.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.ats.config.demo.artifact;
-
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
-
-/**
- * @author Ryan D. Brooks
- */
-public class DemoArtifactTypes extends NamedIdentity implements IArtifactType {
-   public static final DemoArtifactTypes DemoCodeTeamWorkflow =
-         new DemoArtifactTypes("ABRNqDKnpGEKAyUm49gA", "Demo Code Team Workflow");
-   public static final DemoArtifactTypes DemoReqTeamWorkflow =
-         new DemoArtifactTypes("ABRO5pC6kCmP35t06RwA", "Demo Req Team Workflow");
-   public static final DemoArtifactTypes DemoTestTeamWorkflow =
-         new DemoArtifactTypes("ABRPeQO1qlCd4J7Bv5AA", "Demo Test Team Workflow");
-
-   private DemoArtifactTypes(String guid, String name) {
-      super(guid, name);
-   }
-}
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoCodeTeamWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoCodeTeamWorkflowArtifact.java
index 20ad2667fe6..a6be4c20a7b 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoCodeTeamWorkflowArtifact.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoCodeTeamWorkflowArtifact.java
@@ -15,21 +15,21 @@ import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.core.model.Branch;

 import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;

-import org.eclipse.osee.support.test.util.TestUtil;

+import org.eclipse.osee.support.test.util.DemoArtifactTypes;

 

 /**

  * @author Donald G. Dunne

  */

 public class DemoCodeTeamWorkflowArtifact extends TeamWorkFlowArtifact {

 

-   public static String ARTIFACT_NAME = TestUtil.DEMO_CODE_TEAM_WORKFLOW_ARTIFACT;

+   public static String ARTIFACT_NAME = DemoArtifactTypes.DemoCodeTeamWorkflow.getName();

 

    /**

     * @param parentFactory

     * @param guid

     * @param humanReadableId

     * @param branch

- * @throws OseeDataStoreException 

+    * @throws OseeDataStoreException

     */

    public DemoCodeTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException {

       super(parentFactory, guid, humanReadableId, branch, artifactType);

diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoReqTeamWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoReqTeamWorkflowArtifact.java
index 770426c7179..1f293e0efe8 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoReqTeamWorkflowArtifact.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoReqTeamWorkflowArtifact.java
@@ -15,21 +15,21 @@ import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.core.model.Branch;

 import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;

-import org.eclipse.osee.support.test.util.TestUtil;

+import org.eclipse.osee.support.test.util.DemoArtifactTypes;

 

 /**

  * @author Donald G. Dunne

  */

 public class DemoReqTeamWorkflowArtifact extends TeamWorkFlowArtifact {

 

-   public static String ARTIFACT_NAME = TestUtil.DEMO_REQ_TEAM_WORKFLOW_ARTIFACT;

+   public static String ARTIFACT_NAME = DemoArtifactTypes.DemoReqTeamWorkflow.getName();

 

    /**

     * @param parentFactory

     * @param guid

     * @param humanReadableId

     * @param branch

- * @throws OseeDataStoreException 

+ * @throws OseeDataStoreException

     */

    public DemoReqTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException {

       super(parentFactory, guid, humanReadableId, branch, artifactType);

diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java
index cf3de917f90..5466c133f89 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java
@@ -21,6 +21,7 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.util.AtsArtifactTypes;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.support.test.util.DemoArtifactTypes;
 import org.eclipse.osee.support.test.util.TestUtil;
 
 /**
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTestTeamWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTestTeamWorkflowArtifact.java
index 9296f25e99b..7436cec9aea 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTestTeamWorkflowArtifact.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTestTeamWorkflowArtifact.java
@@ -15,21 +15,21 @@ import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.core.model.Branch;

 import org.eclipse.osee.framework.core.model.type.ArtifactType;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;

-import org.eclipse.osee.support.test.util.TestUtil;

+import org.eclipse.osee.support.test.util.DemoArtifactTypes;

 

 /**

  * @author Donald G. Dunne

  */

 public class DemoTestTeamWorkflowArtifact extends TeamWorkFlowArtifact {

 

-   public static String ARTIFACT_NAME = TestUtil.DEMO_TEST_TEAM_WORKFLOW_ARTIFACT;

+   public static String ARTIFACT_NAME = DemoArtifactTypes.DemoTestTeamWorkflow.getName();

 

    /**

     * @param parentFactory

     * @param guid

     * @param humanReadableId

     * @param branch

- * @throws OseeDataStoreException 

+    * @throws OseeDataStoreException

     */

    public DemoTestTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException {

       super(parentFactory, guid, humanReadableId, branch, artifactType);

diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java
index f0f77e6ee38..e91b47cfb41 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java
@@ -15,7 +15,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
-import org.eclipse.osee.ats.config.demo.config.PopulateDemoActions;
+import org.eclipse.osee.ats.config.demo.PopulateDemoActions;
 import org.eclipse.osee.ats.config.demo.internal.OseeAtsConfigDemoActivator;
 import org.eclipse.osee.ats.config.demo.util.DemoTeams;
 import org.eclipse.osee.ats.config.demo.util.DemoTeams.Team;