Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbroberts2020-07-14 16:44:09 -0400
committerbroberts2020-07-14 16:44:09 -0400
commite3975857f21b1ef812c9853df1bcd326acf94a06 (patch)
tree47c7c2dc3aff973bfaa0ac526f796182c1171335
parent358dbb32d32ec18c17c58e90e0a48e69e2fbd91c (diff)
downloadorg.eclipse.osee-e3975857f21b1ef812c9853df1bcd326acf94a06.tar.gz
org.eclipse.osee-e3975857f21b1ef812c9853df1bcd326acf94a06.tar.xz
org.eclipse.osee-e3975857f21b1ef812c9853df1bcd326acf94a06.zip
refactor: org.json stuff
Change-Id: Ida53eb8b3f3d8243f5a46ef7641117018f17f743 Signed-off-by: broberts <baily.e.roberts@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java57
-rw-r--r--plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/UserResourceTest.java4
-rw-r--r--plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UserResource.java86
-rw-r--r--plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.define.ide/src/org/eclipse/osee/define/ide/blam/operation/PublishWithSpecifiedTemplate.java9
-rw-r--r--plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/xtend-gen/org/eclipse/osee/framework/core/dsl/generator/.gitignore3
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/JsonUtil.java8
-rw-r--r--plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html324
-rw-r--r--plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/images/TestWorkflow.pngbin26006 -> 0 bytes
-rw-r--r--plugins/org.eclipse.osee.framework.dev.help.ui/toc.xml16
-rw-r--r--plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Features/Views-and-Editors.html8
-rw-r--r--plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html81
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java52
-rw-r--r--plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/JaxRsApiImpl.java11
-rw-r--r--plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/osgi/JdbcServiceConfigParser.java5
-rw-r--r--plugins/org.eclipse.osee.parent/CUsersb3091894.m2settings.xml0
-rw-r--r--plugins/org.eclipse.osee.parent/keystore.jksbin0 -> 2100 bytes
-rw-r--r--plugins/org.eclipse.osee.server.p2/keystore.jksbin0 -> 3884 bytes
22 files changed, 425 insertions, 252 deletions
diff --git a/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF
index d6168d36f32..a0092fa078d 100644
--- a/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.account.rest.model/META-INF/MANIFEST.MF
@@ -7,7 +7,10 @@ Bundle-Version: 0.26.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.osee.account.rest.model
-Import-Package: org.eclipse.osee.framework.core.data,
+Import-Package: com.fasterxml.jackson.databind,
+ com.fasterxml.jackson.core,
+ org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
+ org.eclipse.osee.jaxrs.client,
org.json
diff --git a/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java b/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java
index c67bef701b9..08ec98a5603 100644
--- a/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java
+++ b/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java
@@ -1,23 +1,26 @@
/*********************************************************************
- * Copyright (c) 2015 Boeing
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Boeing - initial API and implementation
- **********************************************************************/
+* Copyright (c) 2015 Boeing
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+* Contributors:
+* Boeing - initial API and implementation
+**********************************************************************/
package org.eclipse.osee.account.rest.model;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import org.eclipse.osee.jaxrs.client.JaxRsApiImpl;
import org.json.JSONArray;
-import org.json.JSONException;
import org.json.JSONObject;
/**
@@ -39,33 +42,45 @@ public class AccountWebPreferences {
private void initPreferences(String string, String team) {
try {
+ // int i = 3 / 0;
+ JaxRsApiImpl impl = new JaxRsApiImpl();
+ impl.start();
+ String json = impl.toJson(string);
+ HashMap jsonMap = new HashMap();
+ ObjectMapper OM = impl.getObjectMapper();
+
+ JsonNode node = OM.readTree(string);
+
JSONObject jObject = new JSONObject(string);
JSONObject linkJsonObject = jObject.getJSONObject("links");
@SuppressWarnings("unchecked")
Iterator<String> keys = linkJsonObject.keys();
while (keys.hasNext()) {
String next = keys.next();
- JSONObject linkJObject = linkJsonObject.getJSONObject(next);
+ JsonNode linkJObject = OM.readTree(next);
+ JSONObject linkJObject2 = linkJsonObject.getJSONObject(next);
Link link = new Link();
if (linkJObject.has("name")) {
- link.setName(linkJObject.getString("name"));
+ link.setName(linkJObject.get("name").toString());
+
}
if (linkJObject.has("url")) {
- link.setUrl(linkJObject.getString("url"));
+ link.setUrl(linkJObject.get("url").toString());
}
if (linkJObject.has("tags")) {
- JSONArray array = linkJObject.getJSONArray("tags");
- for (int x = 0; x < array.length(); x++) {
- link.getTags().add(array.getString(x));
+ List<String> array = linkJObject.findValuesAsText("tags");
+ JSONArray array2 = linkJObject2.getJSONArray("tags");
+ for (int x = 0; x < array.size(); x++) {
+ link.getTags().add(array.get(x));
}
}
link.setTeam(team);
- link.setId(linkJObject.getString("id"));
+ link.setId(linkJObject.get("id").toString());
linksMap.put(next, link);
}
- } catch (JSONException ex) {
- //
+ } catch (Exception ex) {
+ System.out.println("Exception:" + ex);
}
}
diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/UserResourceTest.java b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/UserResourceTest.java
index e422a053c76..e4bdc05c0b4 100644
--- a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/UserResourceTest.java
+++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/UserResourceTest.java
@@ -29,7 +29,11 @@ public class UserResourceTest extends AbstractRestTest {
@Test
public void testGet() throws Exception {
String json = getJson("/ats/user");
+ System.out.println("test get: " + json);
JsonNode users = JsonUtil.readTree(json);
+ System.out.println("users: " + users);
+
+ System.out.println("user size: " + users.size());
Assert.assertTrue(users.size() >= 9);
Assert.assertEquals(3333,
JsonUtil.getArrayElement(users, "name", DemoUsers.Joe_Smith.getName()).get("id").asInt());
diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
index e087af04513..c803670f4f2 100644
--- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF
@@ -51,6 +51,7 @@ Import-Package: com.fasterxml.jackson.core,
org.eclipse.osee.framework.jdk.core.util.io.xml,
org.eclipse.osee.framework.logging,
org.eclipse.osee.jaxrs,
+ org.eclipse.osee.jaxrs.client,
org.eclipse.osee.jaxrs.mvc,
org.eclipse.osee.jdbc,
org.eclipse.osee.logger,
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UserResource.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UserResource.java
index ce712a05c14..7199c167194 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UserResource.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UserResource.java
@@ -13,6 +13,8 @@
package org.eclipse.osee.ats.rest.internal.config;
+import java.util.HashMap;
+import java.util.LinkedList;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -23,8 +25,7 @@ import org.eclipse.osee.ats.api.user.IAtsUserService;
import org.eclipse.osee.framework.core.JaxRsApi;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.eclipse.osee.jaxrs.client.JaxRsApiImpl;
/**
* @author Donald G. Dunne
@@ -51,20 +52,77 @@ public final class UserResource {
if (Strings.isValid(activeStr)) {
active = Active.valueOf(activeStr);
}
- String array = "";
- String s = jaxRsApi.toJson("");
- JSONArray arr = new JSONArray();
+
+ String array = "[";
+ //String s = jaxRsApi.toJson("");
+ // JSONArray arr = new JSONArray();
+ JaxRsApiImpl impl = new JaxRsApiImpl();
+ impl.start();
+ String implJson = "";
+ HashMap jsonArray = new HashMap();
+ // Hashtable ha[] = new Hashtable[23];
+ //List<Hashtable> jsonList = new LinkedList<Hashtable>();
+ LinkedList jsonList = new LinkedList();
+ System.out.println("GET MAPPER: " + impl.getObjectMapper());
+ // System.out.println("READ TREE: " + impl.readTree("\"id\" : 897").toString());
+ int i = 0;
+ // jsonArray.clear();
+ //jsonList.clear();
for (AtsUser user : userService.getUsers(active)) {
- JSONObject obj = new JSONObject();
- obj.put("id", user.getUserId());
- obj.put("name", user.getName());
- obj.put("email", user.getEmail());
- obj.put("active", user.isActive());
- obj.put("accountId", user.getStoreObject().getId());
- array = jaxRsApi.toJson(obj);
+ // JSONObject obj = new JSONObject();
+ System.out.println("beginning of for: " + jsonList);
+ System.out.println("beginning of for jsonarray: " + jsonArray);
+
+ // obj.put("id", user.getUserId());
+ // obj.put("name", user.getName());
+ // obj.put("email", user.getEmail());
+ // obj.put("active", user.isActive());
+ // obj.put("accountId", user.getStoreObject().getId());
+ jsonArray.put("id", user.getUserId());
+ jsonArray.put("name", user.getName());
+ System.out.println("middle of for: " + jsonList);
+ System.out.println("middle of for jsonarray: " + jsonArray);
+
+ jsonArray.put("email", user.getEmail());
+ jsonArray.put("active", user.isActive());
+ jsonArray.put("accountId", user.getStoreObject().getId());
+ String jsonString = impl.toJson(jsonArray);
+ System.out.println("JSOOOOOOOOONNNNNNNN: " + jsonString);
+ // array += "{";
+ // array += "id:" + user.getUserId() + ",";
+ // array += "name:" + user.getName() + ",";
+ // array += "email:" + user.getEmail() + ",";
+ // array += "active:" + user.isActive() + ",";
+ // array += "accountId:" + user.getStoreObject().getId();
+ // array += "}";
+ // implJson += impl.toJson("id:" + user.getUserId() + ",");
+ // implJson += impl.toJson("name:" + user.getName() + ",");
+ // implJson += impl.toJson("email:" + user.getEmail() + ",");
+ // implJson += impl.toJson("active:" + user.isActive() + ",");
+ // implJson += impl.toJson("accountId:" + user.getStoreObject().getId());
// arr.put(obj);
+ // impl.toJson
+ System.out.println("user: " + jsonArray);
+ // jsonList.add(i, jsonArray);
+
+ System.out.println("jsonlist before: " + jsonList);
+ // ha[i] = jsonArray;
+ // jsonList.add(0, jsonArray);
+ jsonList.add(jsonString);
+ System.out.println("jsonlist after: " + jsonList);
+ i++;
}
- System.out.println("OBBBBBBBBJJJJ " + array);
- return array;
+ array += "]";
+ // json = json.replaceAll("name", "\"name\"");
+ // json = json.replaceAll("id", "\"id\"");
+
+ System.out.println("json json" + jsonArray.toString());
+ System.out.println("OBBBBBBBBJJJJ to string " + jsonList.toString());
+ implJson = impl.toJson(jsonList);
+ // System.out.println("OBBBBBBBBJJJJ to string 2 " + ha[2]);
+
+ System.out.println("OBBBBBBBBJJJJ " + jsonList.toString());
+
+ return jsonList.toString();
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF
index f4c0bb161b7..48dc73aad60 100644
--- a/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.define.ide/META-INF/MANIFEST.MF
@@ -72,6 +72,7 @@ Import-Package: com.google.common.collect,
org.eclipse.osee.framework.ui.skynet.widgets,
org.eclipse.osee.framework.ui.skynet.widgets.util,
org.eclipse.osee.framework.ui.swt,
+ org.eclipse.osee.jaxrs.client,
org.eclipse.osee.orcs.rest.client,
org.eclipse.osee.ote.define.artifacts,
org.eclipse.ui.forms.widgets,
diff --git a/plugins/org.eclipse.osee.define.ide/src/org/eclipse/osee/define/ide/blam/operation/PublishWithSpecifiedTemplate.java b/plugins/org.eclipse.osee.define.ide/src/org/eclipse/osee/define/ide/blam/operation/PublishWithSpecifiedTemplate.java
index a70119e36ed..68f2c230763 100644
--- a/plugins/org.eclipse.osee.define.ide/src/org/eclipse/osee/define/ide/blam/operation/PublishWithSpecifiedTemplate.java
+++ b/plugins/org.eclipse.osee.define.ide/src/org/eclipse/osee/define/ide/blam/operation/PublishWithSpecifiedTemplate.java
@@ -74,6 +74,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.XListDropViewer;
import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener;
import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
import org.eclipse.osee.framework.ui.skynet.widgets.util.SwtXWidgetRenderer;
+import org.eclipse.osee.jaxrs.client.JaxRsApiImpl;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
@@ -240,6 +241,12 @@ public class PublishWithSpecifiedTemplate extends AbstractBlam {
ArrayList<Artifact> artifacts = new ArrayList<>();
try {
String result = ServiceUtil.getOseeClient().runOrcsScript(orcsQuery);
+ System.out.println("result in publish: " + result);
+ JaxRsApiImpl impl = new JaxRsApiImpl();
+ impl.start();
+ HashMap jsonArray = new HashMap();
+ String toJson = impl.toJson(result);
+ // jsonArray.put(key, value);
JSONObject jsonObject = new JSONObject(result);
JSONArray results = jsonObject.getJSONArray("results");
if (results.length() >= 1 && branch != null) {
@@ -255,7 +262,7 @@ public class PublishWithSpecifiedTemplate extends AbstractBlam {
} catch (JSONException ex) {
OseeCoreException.wrapAndThrow(ex);
}
- return artifacts;
+ return null;
}
private void parseQueryForBranchName(String orcsQuery) {
diff --git a/plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target b/plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target
index cd1db142224..2644df55ce1 100644
--- a/plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target
+++ b/plugins/org.eclipse.osee.dep.target/org.eclipse.osee.dep.target.target
@@ -4,7 +4,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.osee.dep.feature.feature.group"/>
<unit id="org.eclipse.osee.dep.feature.source.feature.group"/>
-<repository location="file:${OSEE_REPO}/plugins/org.eclipse.osee.dep.p2/target/repository/"/>
+<repository location="file:C:/UserData/jdbc/org.eclipse.osee/plugins/org.eclipse.osee.dep.p2/target/repository/"/>
</location>
</locations>
</target>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/xtend-gen/org/eclipse/osee/framework/core/dsl/generator/.gitignore b/plugins/org.eclipse.osee.framework.core.dsl/xtend-gen/org/eclipse/osee/framework/core/dsl/generator/.gitignore
new file mode 100644
index 00000000000..25bc8d2e734
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core.dsl/xtend-gen/org/eclipse/osee/framework/core/dsl/generator/.gitignore
@@ -0,0 +1,3 @@
+/.OseeDslGenerator.java._trace
+/.OseeDslGenerator.xtendbin
+/OseeDslGenerator.java
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/JsonUtil.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/JsonUtil.java
index b6c094eb1e8..8d0932542b9 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/JsonUtil.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/JsonUtil.java
@@ -84,6 +84,11 @@ public class JsonUtil {
public static JsonNode readTree(ObjectMapper mapper, String json) {
try {
+ System.out.println("read mapper: " + mapper);
+
+ System.out.println("read mapper to string: " + mapper.toString());
+ System.out.println("read json: " + json);
+
return mapper.readTree(json);
} catch (IOException ex) {
throw OseeCoreException.wrap(ex);
@@ -98,7 +103,8 @@ public class JsonUtil {
try {
System.out.println("mapper " + mapper);
System.out.println("object " + object);
-
+ mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+ System.out.println("WRITE AS VALUE" + mapper.writeValueAsString(object));
return mapper.writeValueAsString(object);
} catch (JsonProcessingException ex) {
throw OseeCoreException.wrap(ex);
diff --git a/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html b/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html
index f34a2f06681..03dde3db2a2 100644
--- a/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html
+++ b/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html
@@ -372,163 +372,173 @@ ${type_declaration}
<br/>
</p>
<h2 id="Custom_Data_Model">Custom Data Model</h2>
- <p>The data model in OSEE is extensible and user configurable. Users can define new artifact, attribute, and relation types and their constraints such as multiplicity and applicability. Type inheritance allows similar types to be defined and modified without tedious redundancy because similar types inherit what is common from their super type. </p>
- <p>The OSEE data model is defined using a tabular format involving 5 tables. See the following
- <a href="http://git.eclipse.org/c/osee/org.eclipse.osee.git/tree/plugins/org.eclipse.osee.framework.skynet.core/support" target="osee_external">link</a> for an example.
+ <p>The data model in OSEE is extensible and runtime user configurable without modification to code or the database schema. Users can define new artifact, attribute, and relation types and their constraints such as multiplicity and applicability. Type inheritance allows similar types to be defined and modified without tedious redundancy because the types inherit what is common from their super type. </p>
+ <p>The OSEE data model is defined using a XText grammar designed by the OSEE Team. This allows for editing of the types (object model) configuration much the way you would edit source code. This includes command completion and error notation when an incorrect syntax or keyword is used. </p>
+ <p>
+ <b>Example of the OSEE Types Editor</b>
</p>
- <p>The full data model can be defined using a single spreadsheet or be divided among multiple spreadsheets that can reference types defined in any spreadsheet. </p>
- <h3 id="Artifact_Type_Table">Artifact Type Table</h3>
- <table class="wikitable" border="1">
- <tr>
- <th>Column Name </th>
- <th>Description</th>
- </tr>
- <tr>
- <td>Artifact Type Name </td>
- <td>any valid UTF-8 characters with a max length of 75 bytes</td>
- </tr>
- <tr>
- <td>Super Type Name </td>
- <td>The super artifact type from which this type will inherit associated attributes and relations. Another concrete artifact type or an abstract one that exists only in data model definition.</td>
- </tr>
- </table>
- <h3 id="Artifact_Factory">Artifact Factory</h3>
- <p>When defining new artifact types, by default, the Java class used to create the artifact at runtime is <code>org.eclipse.osee.framework.skynet.core.artifact.Artifact</code>. When a specialized subtype of Artifact is desired, the extension point <code>org.eclipse.osee.framework.skynet.core.ArtifactFactory</code> can be used to contribute an artifact factory that extends the class <code>org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory</code>. The factory's <code>isResponsibleFor(String artifactTypeName)</code> method determines if a particular factory will be used to construct an artifact of a given artifact type. Thus the artifact factory extension point can be used to case user defined artifact types to be constructed at runtime using a custom Java class that extends Artifact. </p>
- <h3 id="Attribute_Type_Table">Attribute Type Table</h3>
- <table class="wikitable" border="1">
- <tr>
- <th>Column Name </th>
- <th>Description</th>
- </tr>
- <tr>
- <td>Attribute Base Type </td>
- </tr>
- <tr>
- <td>Attribute Data Provider </td>
- <td>The attribute data provider is responsible for storing and retrieving attribute data. Fully qualified java class name of a class that implements <code>org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider</code>. <code>org.eclipse.osee.framework.skynet.core.DefaultAttributeDataProvider</code> may be used when the data to be stored does not exceeded 4000 bytes, otherwise <code>org.eclipse.osee.framework.skynet.core.UriAttributeDataProvider</code> may be used.</td>
- </tr>
- <tr>
- <td>Attribute Type Name </td>
- <td>Any valid UTF-8 characters with a max length of 500 bytes</td>
- </tr>
- <tr>
- <td>File Extension </td>
- <td>Any valid UTF-8 characters with a max length of 50 bytes; only applies when using the <code>org.eclipse.osee.framework.skynet.core.UriAttributeDataProvider</code></td>
- </tr>
- <tr>
- <td>Tagger ID </td>
- <td>If the attrbiute’s content is to be included in the search index for the quick search, use <code>DefaultAttributeTaggerProvider</code>, otherwise leave blank.</td>
- </tr>
- <tr>
- <td>Default Value </td>
- <td>The initial value given an attribute upon initialization, this may be left blank</td>
- </tr>
- <tr>
- <td>Validity Xml </td>
- <td>For the attribute base type <code>org.eclipse.osee.framework.skynet.core.EnumeratedAttribute</code>, specifies the valid enumerations. For example, &lt;Page_Type&gt;&lt;Enum&gt;Portrait&lt;/Enum&gt;&lt;Enum&gt;Landscape&lt;/Enum&gt;&lt;/Page_Type&gt;</td>
- </tr>
- <tr>
- <td>Min Occurrence </td>
- <td>The framework with prevent having lest than this number of this attribute type on a single artifact</td>
- </tr>
- <tr>
- <td>Max Occurrence </td>
- <td>The framework with prevent adding more than this number of this attribute type to a single artifact</td>
- </tr>
- <tr>
- <td>Tip Text </td>
- <td>Text to describe an attribute. Any valid UTF-8 characters with a max length of 4000 bytes</td>
- </tr>
- </table>
- <h3 id="Artifact_Type_.2F_Attribute_Type_Mapping_Table">Artifact Type / Attribute Type Mapping Table</h3>
- <table class="wikitable" border="1">
- <tr>
- <th>Column Name </th>
- <th>Description</th>
- </tr>
- <tr>
- <td>Artifact Type Name </td>
- <td>Exact name of an artifact type defined above (or previously)</td>
- </tr>
- <tr>
- <td>Attribute Type Name </td>
- <td>Exact name of an attribute type defined above (or previously) to be associated with the corresponding artifact type</td>
- </tr>
- </table>
- <h3 id="Relation_Type_Table">Relation Type Table</h3>
- <table class="wikitable" border="1">
- <tr>
- <th>Column Name </th>
- <th>Description</th>
- </tr>
- <tr>
- <td>Relation Type Name </td>
- <td>Any valid UTF-8 characters with a max length of 50 bytes</td>
- </tr>
- <tr>
- <td>Side A Name </td>
- <td>Descriptive name for the A side of the relation. Any valid UTF-8 characters with a max length of 50 bytes</td>
- </tr>
- <tr>
- <td>A to B Phrase </td>
- <td>An optional phrase that describe the relation between the artifacts from the side A perspective. Any valid UTF-8 characters with a max length of 50 bytes</td>
- </tr>
- <tr>
- <td>Side B Name </td>
- <td>Descriptive name for the B side of the relation. Any valid UTF-8 characters with a max length of 50 bytes</td>
- </tr>
- <tr>
- <td>B to A Phrase </td>
- <td>An optional phrase that describe the relation between the artifacts from the side B perspective. Any valid UTF-8 characters with a max length of 50 bytes</td>
- </tr>
- <tr>
- <td>Short Name </td>
- <td>Five or less characters is typical. This abbreviated name is used in the user interface when space is at a premium</td>
- </tr>
- <tr>
- <td>Ordered </td>
- <td><code>Yes</code> to have artifacts on the same side of this relation type use a user defined ordered, otherwise <code>No</code></td>
- </tr>
- </table>
- <h3 id="Artifact_Type_.2F_Relation_Type_Mapping_Table">Artifact Type / Relation Type Mapping Table</h3>
- <table class="wikitable" border="1">
- <tr>
- <th>Column Name </th>
- <th>Description</th>
- </tr>
- <tr>
- <td>Artifact Type </td>
- <td>Exact name of an artifact type defined above (or previously)</td>
- </tr>
- <tr>
- <td>Relation Type </td>
- <td>Exact name of an relation type defined above (or previously)</td>
- </tr>
- <tr>
- <td>Side A Max </td>
- <td>An artifact of type "Artifact Type" can be on side "A", "Side A Max" number of times for relation links of type "Relation Type"</td>
- </tr>
- <tr>
- <td>Side B Max </td>
- <td>An artifact of type "Artifact Type" can be on side "B", "Side B Max" number of times for relation links of type "Relation Type"</td>
- </tr>
- </table>
- <h2 id="Importing_an_OSEE_Data_Model">Importing an OSEE Data Model</h2>
- <p>To import changes to the data model for an existing OSEE database: </p>
+ <p>
+ <a href="http://wiki.eclipse.org/File:OSEE_Types_Sheet_Example.png" title="File:OSEE_Types_Sheet_Example.png" target="osee_external">File:OSEE_Types_Sheet_Example.png</a>
+ </p>
+ <p>
+ <b>Command Completion Example</b>
+ </p>
+ <p>
+ <a href="http://wiki.eclipse.org/File:OSEE_Command_Completion_Example.png" title="File:OSEE_Command_Completion_Example.png" target="osee_external">File:OSEE_Command_Completion_Example.png</a>
+ </p>
+ <p>
+ <b>Error Handling Example</b>
+ </p>
+ <p>
+ <a href="http://wiki.eclipse.org/File:OSEE_Editor_Error_Example.png" title="File:OSEE_Editor_Error_Example.png" target="osee_external">File:OSEE_Editor_Error_Example.png</a>
+ </p>
+ <p>The OSEE types definitions are stored in artifacts and cached during startup. They are edited in OSEE like any other artifact. Simply select the artifact &gt; right-click &gt; open with &gt; OSEE DSL Editor. Convention is to root them off the Common Branch default hierarchy.</p>
+ <p>
+ <a href="http://wiki.eclipse.org/File:OSEE_Types_Sheet_Artifacts.png" title="File:OSEE_Types_Sheet_Artifacts.png" target="osee_external">File:OSEE_Types_Sheet_Artifacts.png</a>
+ </p>
+ <h3 id="Artifact_Definitions">Artifact Definitions</h3>
+ <p>All artifact types extend the type "Artifact". The snippet below of the artifact type definition shows some types required by all OSEE configurations.</p>
+ <pre>
+artifactType "Artifact" { &lt;-- Main Artifact type
+ id 1 &lt;-- Unique long artifact id
+ attribute "Name" &lt;-- List of Attributes that are valid for this Artifact Type
+ attribute "Annotation"
+ attribute "Content URL"
+ attribute "Static Id"
+ attribute "Relation Order"
+}
+
+artifactType "User" extends "Artifact" { &lt;-- User artifact extending Artifact
+ id 5
+ attribute "Active" &lt;-- Adding more attributes to those inherited from Artifact
+ attribute "Phone"
+ attribute "Email"
+ attribute "Street Address"
+ attribute "Dictionary"
+ ...
+}
+</pre>
+ <h3 id="Attribute_Definitions">Attribute Definitions</h3>
+ <p>Attribute types define characteristics (fields) of an artifact. They are strongly typed which supports data validation and editors and applications can know how to handle the values returned. </p>
+ <p>Here's an example of the "Name" attribute that exists on every Artifact.</p>
+ <pre>
+attributeType "Name" extends StringAttribute { &lt;-- extends one of the base Attribute Types
+ id 1152921504606847088 &lt;-- unique long id of attribute type
+ dataProvider DefaultAttributeDataProvider &lt;-- different dataProviders exist to store data differently
+ min 1 &lt;-- minimum number of Attributes per artifact. can be 0..n
+ max 1 &lt;-- maximum number of Attributes allowed. can be 1..n
+ taggerId DefaultAttributeTaggerProvider &lt;-- defines the tagger is used to split the value for searching
+ description "Descriptive Name" &lt;-- description of what this Attribute stores
+ defaultValue "unnamed" &lt;-- default value to be used when min==1
+ mediaType "text/plain" &lt;-- media types for this Attribute
+}
+
+oseeEnumType "enum.req.subsystem" { &lt;-- Valid Enumerated values for the Subsystem attribute
+ id 3458764513820541310
+ entry "Robot_API"
+ entry "Robot_Survivability_Equipment"
+ entry "Robot_Systems_Management"
+ entry "Chassis"
+ ...
+}
+
+attributeType "Subsystem" extends EnumeratedAttribute { &lt;-- Enumerated Attribute definition
+ id 1152921504606847112
+ dataProvider DefaultAttributeDataProvider
+ min 1
+ max 1
+ taggerId DefaultAttributeTaggerProvider
+ enumType "enum.req.subsystem" &lt;-- Enumeration definition from above
+ defaultValue "Unspecified"
+ mediaType "text/plain"
+}
+</pre>
+ <p>
+ <b>Valid Attribute Base-Types are:</b>
+ </p>
+ <ul>
+ <li>org.eclipse.osee.framework.skynet.core.BooleanAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.CompressedContentAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.JavaObjectAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.DateAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.FloatingPointAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.IntegerAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.StringAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.EnumeratedAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.WordTemplateAttribute</li>
+ <li>org.eclipse.osee.framework.skynet.core.WordWholeDocumentAttribute</li>
+ </ul>
+ <h3 id="Relation_Definitions">Relation Definitions</h3>
+ <p>Relations provide bi-directional links between artifacts on a branch. Like Artifact and Attribute types, Relation types are strongly typed. You can identify which artifact types are allowed to be on each side of the relation. You can also specify the multiplicity.</p>
+ <pre>
+relationType "Code-Requirement" { &lt;-- Relation type name
+ id 2305843009213694296 &lt;-- Unique long id
+ sideAName "code" &lt;-- Name of the Artifacts on side A
+ sideAArtifactType "Code Unit" &lt;-- Valid Artifact Type for side A
+ sideBName "requirement" &lt;-- Name of the Artifacts on side B
+ sideBArtifactType "Requirement" &lt;-- Valid Artifact Type for side B
+ defaultOrderType Unordered &lt;-- Default Order Type
+ multiplicity MANY_TO_MANY &lt;-- Multiplicity (any number of code can relate to any number of req)
+}
+
+relationType "Component-Requirement" {
+ id 2305843009213694297
+ sideAName "component"
+ sideAArtifactType "Component"
+ sideBName "requirement"
+ sideBArtifactType "Requirement"
+ defaultOrderType Unordered
+ multiplicity ONE_TO_MANY &lt;-- Multiplicity (one component can relate to multiple requirements)
+}
+
+</pre>
+ <p>As described above, you can use command completion to see the valid values. An example is "multiplicity".</p>
+ <p>
+ <a href="http://wiki.eclipse.org/File:OSEE_Multiplicity_Options_Example.png" title="File:OSEE_Multiplicity_Options_Example.png" target="osee_external">File:OSEE_Multiplicity_Options_Example.png</a>
+ </p>
+ <h3 id="Making_Types_Changes_in_Production">Making Types Changes in Production</h3>
<ol>
- <li>In Package Explorer, Select a file(s) containing the OSEE data model to import. If there are any enum overrides, you must select them either explicitly or by import statement (hierarchically). </li>
- <li>Right click and select <code>Import...</code> </li>
- <li>Under the <code>OSEE</code> category, select <code>OSEE Types</code> </li>
- <li>Ensure that all types files are included in <code>Resolved dependencies</code> and <code>Report Changes</code> is checked. Select Finish. </li>
- <li>Review all tabs to ensure that all changes are expected.
+ <li>Search for OSEE Type Definition artifact types or find the types artifact on the Default Hierarchy of the Common Branch</li>
+ <li>Select &gt; Right-Click &gt; Open With &gt; DSL Editor</li>
+ <li>Edit the types</li>
+ <li>Remove all errors</li>
+ <li>Save the editor</li>
+ <li>Refresh the server types caches, do one of the following
<ol>
- <li><code>Osee Default Enum</code> will always show up on <code>OseeEnum Types</code> tab </li>
- <li>Ensure each column's data is correct. All "true" values are what is being changed. </li>
+ <li>You should be prompted to update caches upon save. Select Yes for a single-server deployment.</li>
+ <li>POST to server urls &lt;SERVER_ADDRESS&gt;/orcs/types/invalidate-caches</li>
+ <li>curl -X POST &lt;SERVER_ADDRESS&gt;/orcs/types/invalidate-caches</li>
+ <li>A server restart will also reload the new types, but is not required</li>
</ol>
</li>
- <li>When ready to persist changes, you must restart the client (Still Necessary??) and only run import once with <code>Persist Changes</code> checked</li>
+ <li>If the code needs a new version of the types sheets (eg: Type sheet grammar has changed), See Types Versioning section below.</li>
</ol>
- <p>To automatically import the data model during database initialization use the extension point <code>org.eclipse.osee.framework.skynet.core.OseeTypes</code> </p>
+ <h3 id="Types_and_Access_Control_Versioning">Types and Access Control Versioning</h3>
+ <p>As of the 24.0 line, the OSEE Types and Access Control Artifacts are "Versioned". This allows the "Production" version of the code to use one version of the types while another release line is being developed or prepared for release.</p>
+ <h4 id="OSEE_Types_Instructions">OSEE Types Instructions</h4>
+ <p>Prior to 0.24.0, types were loaded based on the Artifact Type. After this, types are loaded by using the OrcsTypesData.OSEE_TYPE_VERSION to index into the tuple table and grab the gamma_ids of the types attributes to load. Thus this code variable needs to match up with the tuple entries for the new version of the types sheet(s).</p>
+ <p>
+ <b>To create a new types version</b>
+ </p>
+ <ul>
+ <li>Copy the existing types artifact and paste into OSEE Types folder. Types artifacts should be named for the last release they were used for (eg "Osee Type Config - 0.25.0") to reduce confusion.</li>
+ <li>Make appropriate grammar and types changes in the new types sheets</li>
+ <li>Update the code version number in org.eclipse.osee.framework.core.data.OrcsTypesData.OSEE_TYPE_VERSION to next number</li>
+ <li>Update the tuple table to point to new OSEE Types Sheets gamma ids using OSEE_TYPE_VERSION number from last step at the web page &lt;SERVER_ADDRESS&gt;/orcs/types/config/ui/main.html
+ <ul>
+ <li>NOTE: This MUST be done for each instance of OSEE database even if types didn't update</li>
+ </ul>
+ </li>
+ <li>While both production and developmental types sheets are in play, type changes MUST be made in both types sheets or one version will not see the types changes and produce errors.</li>
+ <li>Types artifacts should be moved to a Retired OSEE Types folder when no longer used by any production releases. This helps reduce confusion for admins.</li>
+ </ul>
+ <h4 id="Access_Control_Instructions">Access Control Instructions</h4>
+ <ul>
+ <li>Copy the "ATS CM Access Control" artifact on common and paste with new name</li>
+ <li>Replace the version at end of name</li>
+ <li>Update AtsArtifactToken.AtsCmAccessControl token with new ids</li>
+ <li>Make whatever access changes using DSL Editor on production to the newly created artifact</li>
+ </ul>
<h2 id="OSEE_Branches">OSEE Branches</h2>
<p>
<a href="http://wiki.eclipse.org/OSEE/Branches" target="osee_external">OSEE Branches</a>
@@ -902,9 +912,9 @@ ${type_declaration}
</li>
<li>org.eclipse.osee.x.parent
<ol>
- <li>org.eclipse.osee.server.parent</li>
+ <li>org.eclipse.osee.x.server.parent</li>
<li>org.eclipse.osee.orcs.parent</li>
- <li>org.eclipse.osee.core.server.parent</li>
+ <li>org.eclipse.osee.x.core.parent</li>
</ol>
</li>
</ol>
@@ -948,7 +958,7 @@ ${type_declaration}
<td>OSEE Client IDE All-In-One Win32 x86 64-bit</td>
</tr>
<tr>
- <td rowspan="4">plugins/org.eclipse.osee.server.p2/target</td>
+ <td rowspan="4">plugins/org.eclipse.osee.x.server.p2/target</td>
<td>repository/</td>
<td>OSEE Application Server P2 Site </td>
</tr>
@@ -957,11 +967,11 @@ ${type_declaration}
<td>OSEE Application Server</td>
</tr>
<tr>
- <td>org.eclipse.osee.server.p2.zip</td>
+ <td>org.eclipse.osee.x.server.p2.zip</td>
<td>OSEE Application Server Archived Update Site</td>
</tr>
<tr>
- <td>org.eclipse.osee.server.runtime.zip</td>
+ <td>org.eclipse.osee.x.server.runtime.zip</td>
<td>OSEE Application Server Zipped Runtime</td>
</tr>
<tr></tr>
@@ -976,8 +986,6 @@ ${type_declaration}
<a href="http://wiki.eclipse.org/OSEE/Users_Guide/Getting_Started#Supported_Databases" title="OSEE/Users Guide/Getting Started#Supported_Databases" target="osee_external">Supported Databases</a> to complete this step.
</li>
</ul>
- <h2 id="Database_Schema">Database Schema</h2>
- <p>TODO: add html generated from SKYNET_VERSIONING.xml file.</p>
<h2 id="How_to_Define_Classes_for_Coverage_Importing">How to Define Classes for Coverage Importing</h2>
<p>The following steps walk a developer through defining the classes necessary to begin importing coverage data into the OSEE application.&nbsp; Please keep in mind that these are meant to be simplified examples and developers are encouraged to 'get creative' when adapting these examples to their own particular context.
<br/>
diff --git a/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/images/TestWorkflow.png b/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/images/TestWorkflow.png
deleted file mode 100644
index d9562db0346..00000000000
--- a/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/images/TestWorkflow.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.osee.framework.dev.help.ui/toc.xml b/plugins/org.eclipse.osee.framework.dev.help.ui/toc.xml
index 63a4d63888e..668a4f9ecda 100644
--- a/plugins/org.eclipse.osee.framework.dev.help.ui/toc.xml
+++ b/plugins/org.eclipse.osee.framework.dev.help.ui/toc.xml
@@ -19,14 +19,15 @@
</topic>
</topic>
<topic href="OSEE/Developers_Guide/Developers-Guide.html#Custom_Data_Model" label="Custom Data Model">
- <topic href="OSEE/Developers_Guide/Developers-Guide.html#Artifact_Type_Table" label="Artifact Type Table"></topic>
- <topic href="OSEE/Developers_Guide/Developers-Guide.html#Artifact_Factory" label="Artifact Factory"></topic>
- <topic href="OSEE/Developers_Guide/Developers-Guide.html#Attribute_Type_Table" label="Attribute Type Table"></topic>
- <topic href="OSEE/Developers_Guide/Developers-Guide.html#Artifact_Type_.2F_Attribute_Type_Mapping_Table" label="Artifact Type / Attribute Type Mapping Table"></topic>
- <topic href="OSEE/Developers_Guide/Developers-Guide.html#Relation_Type_Table" label="Relation Type Table"></topic>
- <topic href="OSEE/Developers_Guide/Developers-Guide.html#Artifact_Type_.2F_Relation_Type_Mapping_Table" label="Artifact Type / Relation Type Mapping Table"></topic>
+ <topic href="OSEE/Developers_Guide/Developers-Guide.html#Artifact_Definitions" label="Artifact Definitions"></topic>
+ <topic href="OSEE/Developers_Guide/Developers-Guide.html#Attribute_Definitions" label="Attribute Definitions"></topic>
+ <topic href="OSEE/Developers_Guide/Developers-Guide.html#Relation_Definitions" label="Relation Definitions"></topic>
+ <topic href="OSEE/Developers_Guide/Developers-Guide.html#Making_Types_Changes_in_Production" label="Making Types Changes in Production"></topic>
+ <topic href="OSEE/Developers_Guide/Developers-Guide.html#Types_and_Access_Control_Versioning" label="Types and Access Control Versioning">
+ <topic href="OSEE/Developers_Guide/Developers-Guide.html#OSEE_Types_Instructions" label="OSEE Types Instructions"></topic>
+ <topic href="OSEE/Developers_Guide/Developers-Guide.html#Access_Control_Instructions" label="Access Control Instructions"></topic>
+ </topic>
</topic>
- <topic href="OSEE/Developers_Guide/Developers-Guide.html#Importing_an_OSEE_Data_Model" label="Importing an OSEE Data Model"></topic>
<topic href="OSEE/Developers_Guide/Developers-Guide.html#OSEE_Branches" label="OSEE Branches"></topic>
<topic href="OSEE/Developers_Guide/Developers-Guide.html#Workspace_Setup" label="Workspace Setup"></topic>
<topic href="OSEE/Developers_Guide/Developers-Guide.html#Downloading_and_Configuring_Eclipse" label="Downloading and Configuring Eclipse"></topic>
@@ -58,7 +59,6 @@
<topic href="OSEE/Developers_Guide/Developers-Guide.html#OSEE_System_Requirements" label="OSEE System Requirements"></topic>
</topic>
</topic>
- <topic href="OSEE/Developers_Guide/Developers-Guide.html#Database_Schema" label="Database Schema"></topic>
<topic href="OSEE/Developers_Guide/Developers-Guide.html#How_to_Define_Classes_for_Coverage_Importing" label="How to Define Classes for Coverage Importing"></topic>
<topic href="OSEE/Developers_Guide/Developers-Guide.html#OSEE_Web_Development" label="OSEE Web Development"></topic>
<topic href="OSEE/Developers_Guide/Developers-Guide.html#Helpful_links" label="Helpful links"></topic>
diff --git a/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Features/Views-and-Editors.html b/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Features/Views-and-Editors.html
index 4d49032aff4..854db7e6664 100644
--- a/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Features/Views-and-Editors.html
+++ b/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Features/Views-and-Editors.html
@@ -31,7 +31,7 @@
</table><hr/>
<h1 id="Views_and_Editors">Views and Editors</h1>
<h2 id="Branch_Manager_View">Branch Manager View</h2>
- <p>The Branch Manager View, shown by default in the OSEE Perspective, shows all branches and transactions on each branch managed by OSEE in a hierarchical fashion. By default, OSEE is initialized with two branches. The System Root Branch (visible to OSEE Administrators only) and the Common Branch. The System Root Branch is the base branch for all other branches in the system. The Common branch is used to store system-wide artifacts such as configuration artifacts, users, and user preferences.</p>
+ <p>The Branch Manager View, shown by default in the Define Perspective, shows all branches and transactions on each branch managed by OSEE in a hierarchical fashion. By default, OSEE is initialized with two branches. The System Root Branch (visible to OSEE Administrators only) and the Common Branch. The System Root Branch is the base branch for all other branches in the system. The Common branch is used to store system-wide artifacts such as configuration artifacts, users, and user preferences.</p>
<p>
<img align="right" border="0" src="images/BranchManager.gif"/>
</p>
@@ -186,7 +186,7 @@
<img border="0" src="images/Clear.jpg"/> icon to clear the filter box and display all items.
</p>
<h2 id="Artifact_Explorer_View">Artifact Explorer View</h2>
- <p>The Artifact Explorer view, shown by default in the OSEE perspective, shows the artifact hierarchy of the selected branch. The artifact hierarchy is derived from the artifact's default hierarchy relation. By default, all branches have a default hierarchy root artifact which is the hierarchy tree's base element. </p>
+ <p>The Artifact Explorer view, shown by default in the Define perspective, shows the artifact hierarchy of the selected branch. The artifact hierarchy is derived from the artifact's default hierarchy relation. By default, all branches have a default hierarchy root artifact which is the hierarchy tree's base element. </p>
<p>
<img align="right" border="0" src="images/ArtifactExplorer.jpg"/>
</p>
@@ -574,7 +574,7 @@
</p>
<h2 id="Quick_Search_View">Quick Search View</h2>
<p>The Quick Search view allows users to perform searches for information that is contained
- <i>inside</i> artifacts in a selected branch or search for artifacts by their GUID. The view is opened by default in the OSEE Perspective. It can also be opened by clicking on the Artifact Explorer tool bar's
+ <i>inside</i> artifacts in a selected branch or search for artifacts by their GUID. The view is opened by default in the Define Perspective. It can also be opened by clicking on the Artifact Explorer tool bar's
<img border="0" src="images/Artifact_search.jpg"/> icon.
</p>
<p>
@@ -728,7 +728,7 @@
<br/>
</p>
<h2 id="Define_Navigator">Define Navigator</h2>
- <p>The Define Navigator, shown by default in the OSEE Perspective, provides a central location to launch frequently used define operations. To quickly find a define operation to execute, enter text into the filter box. This will filter out all navigation items that contains the entered text. Select the clear action (
+ <p>The Define Navigator, shown by default in the Define Perspective, provides a central location to launch frequently used define operations. To quickly find a define operation to execute, enter text into the filter box. This will filter out all navigation items that contains the entered text. Select the clear action (
<img border="0" src="images/Clear.gif"/>) to clear out the text and restore all navigation items. To execute the operation, double-click on any of the navigation item.
</p>
<h2 id="Merge_Manager">Merge Manager</h2>
diff --git a/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html b/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html
index 5d462034cdc..ba1c88d2635 100644
--- a/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html
+++ b/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html
@@ -33,9 +33,9 @@
<h2 id="Requirements">Requirements</h2>
<ul>
<li>System with at least 4GB of RAM</li>
- <li>Java Runtime Environment (JRE) 1.6</li>
+ <li>Java Runtime Environment (JRE) 1.8</li>
<li>
- <a href="https://www.eclipse.org/downloads/packages/release/Kepler/SR2" target="osee_external">Eclipse Kepler 4.3.2</a>
+ <a href="https://www.eclipse.org/downloads/packages/release/Neon/2" target="osee_external">Eclipse Neon 2</a>
</li>
<li>Relational Databases: OSEE comes bundled with H2. For additional database support, see
<a href="Supported_Databases" title="OSEE/Users_Guide/Getting_Started#Supported_Databases">Supported Databases</a>.
@@ -48,7 +48,7 @@
<h3 id="Quick_Server_Installation">Quick Server Installation</h3>
<p>If you are interested in a quick start, and are not setting up a custom database installation, setting up the OSEE server with the bundled HSQLDB database is simple.</p>
<ul>
- <li>Create a directory to place your server in, and unzip the downloaded server zip file (e.g. org.eclipse.osee.server.runtime.zip) into that directory.</li>
+ <li>Create a directory to place your server in, and unzip the downloaded server zip file (e.g. org.eclipse.osee.x.server.runtime.zip) into that directory.</li>
</ul>
<p>You should end up with the following files and directories:</p>
<dl>
@@ -100,16 +100,17 @@
<br/>
</li>
<li>In the
- <i>Add Repository</i> dialog, choose the Archive button, then navigate the file browser to the Client Update file downloaded in step one.
+ <i>Add Repository</i> dialog, choose the Archive button, then navigate the file browser to the Client Update file downloaded in step one, "org.eclipse.osee.client.all.p2.zip".
<b>Please note that the use of the software you are about to access may be subject to third party terms and conditions and you are responsible for abiding by such terms and conditions.</b>
</li>
<li>Click on the
- <i>OK</i> button to store update site information.
+ <i>OK</i> button to store update site information, "Eclipse OSEE Client All - (Incubation)".
</li>
<li>Select the OSEE update site entry and all features listed under its category. Click the
<i>Next</i> button.
<img border="0" src="images/AvailableSoftware.png"/>
</li>
+ <li>If you receive a security popup Window regarding unsigned content, click OK.</li>
<li>The update manager calculates dependencies and offers you a list of features to install. Select the needed ones and click the
<i>Next</i> button.
</li>
@@ -191,10 +192,13 @@
<a href="http://www.postgresql.org/download" target="osee_external">http://www.postgresql.org/download</a>
</li>
<li>Follow PostgreSQL installation instructions</li>
- <li>By default, the PostgreSQL database server is configured to allow only local connections. If remote connections are to be allowed, edit postgresql.conf and pg_hba.conf to set the necessary permissions. (To setup an unsecured database instance set listen_address to * in the postgresql.conf file and add the following line to the pg_hba.conf file: host all all 0.0.0.0/0 trust)</li>
+ <li>By default, the PostgreSQL database server is configured to allow only local connections. If remote connections are to be allowed, edit postgresql.conf and pg_hba.conf to set the necessary </li>
+ </ol>
+ <p>permissions. (To setup an unsecured database instance set listen_address to * in the postgresql.conf file and add the following line to the pg_hba.conf file: host all all 0.0.0.0/0 trust). These two files are located in the \PostgreSQL\&lt;version&gt;\data directory. </p>
+ <ol>
<li>Configure PostgreSQL for OSEE
<ol>
- <li>Launch pgAdmin (in windows Start-&gt;All Programs-&gt;PostgreSQL*-&gt;pgAdmin III)</li>
+ <li>Launch pgAdmin (in windows Start-&gt;All Programs-&gt;PostgreSQL*-&gt;pgAdmin *)</li>
<li>Double click on PostgreSQL Database Server (listed under Servers on the left hand side)
<ol>
<li>If you are prompted for a password type the password selected during installation (user should be postgres by default)</li>
@@ -202,38 +206,53 @@
</li>
<li>Create an "osee" user
<ol>
- <li>Right-click on Login Roles (at the bottom of the tree on the left hand side) and select "New Login Role..."</li>
+ <li>Right-click on Login/Group Roles (in the tree on the left hand side) and select "Create -&gt; Login/Group Role..."</li>
<li>Enter the following in the dialog:
<ol>
- <li>Role Name: osee</li>
- <li>"Can login" should be checked</li>
- <li>Password: osee</li>
- <li>Password (again): osee</li>
- <li>Role Privileges--select all of the following:
+ <li>General Tab
+ <ol>
+ <li>Name: osee</li>
+ </ol>
+ </li>
+ <li>Definition Tab
+ <ol>
+ <li>Password: osee</li>
+ </ol>
+ </li>
+ <li>Privileges Tab
<ol>
- <li>Inherits rights from parent roles</li>
- <li>Superuser</li>
- <li>Can create database objects</li>
- <li>Can modify catalog directly</li>
+ <li>Can login? Yes</li>
+ <li>Superuser: Yes</li>
+ <li>Create roles? Yes</li>
+ <li>Create databases: Yes</li>
+ <li>Update catalog? Yes</li>
</ol>
</li>
</ol>
</li>
- <li>Click 'OK'</li>
+ <li>Click 'Save'</li>
<li>You should now have an "osee" user under Login Roles</li>
</ol>
</li>
<li>Expand the "Databases" item in the tree
<ol>
- <li>Create the "OSEE" database by right-clicking on "Databases" and selecting "New Database..."</li>
+ <li>Create the "OSEE" database by right-clicking on "Databases" and selecting "Create -&gt; Database..."</li>
<li>Enter the following in the dialog:
<ol>
- <li>Name: OSEE</li>
- <li>Owner: osee</li>
- <li>Encoding: UTF-8</li>
+ <li>General Tab
+ <ol>
+ <li>Database: OSEE</li>
+ <li>Owner: osee</li>
+ </ol>
+ </li>
+ <li>Definition Tab
+ <ol>
+ <li>Encoding: UTF-8</li>
+ </ol>
+ </li>
</ol>
</li>
- <li>Click 'OK'</li>
+ <li>Click 'Save'</li>
<li>You should now have an "OSEE" Database under Databases</li>
</ol>
</li>
@@ -241,20 +260,24 @@
<ol>
<li>Create the "osee" schema:
<ol>
- <li>Right click on "Schemas" and select "New Schema..."</li>
+ <li>Right click on "Schemas" and select "Create -&gt; Schema..."</li>
<li>Enter the following in the dialog:
<ol>
- <li>Name: osee</li>
- <li>Owner: osee</li>
+ <li>General Tab
+ <ol>
+ <li>Name: osee</li>
+ <li>Owner: osee</li>
+ </ol>
+ </li>
</ol>
</li>
- <li>Click 'OK'</li>
+ <li>Click 'Save'</li>
<li>You should now have an "osee" schema under schemas</li>
</ol>
</li>
- <li>The relational database is now configured. Proceed to OSEE Database Initialization</li>
</ol>
</li>
+ <li>The relational database is now configured. Proceed to OSEE Database Initialization</li>
</ol>
</li>
</ol>
@@ -275,7 +298,7 @@
<i>runH2.sh</i> for H2 on Unix. It is straightforward to convert the downloaded scripts to Windows batch files.
<ul>
<li>If running PostgreSQL, be sure to add the driver bundle (
- <a href="http://www.eclipse.org/osee/downloads/" target="osee_external">downloads</a>) to the server installation. Unzip the files into the server installation and add org.postgresql.driver@start to the bundles in config.ini.
+ <a href="http://www.eclipse.org/osee/downloads/" target="osee_external">downloads</a>) to the server installation. Unzip the files into the server installation and add org.postgresql.driver@start to the bundles in config.ini. In addition, add the org.postgresql.driver_&lt;version&gt;.jar file to the plugins directory in the Eclipse installation.
</li>
</ul>
</li>
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
index 620c5223438..8ed8ca1a0da 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
@@ -8,8 +8,10 @@ Eclipse-ExtensibleAPI: true
Bundle-Activator: org.eclipse.osee.framework.ui.skynet.internal.Activator
Service-Component: OSGI-INF/*.xml
Bundle-Vendor: Eclipse Open System Engineering Environment
-Import-Package: com.fasterxml.jackson.core.type,
+Import-Package: com.fasterxml.jackson.core,
+ com.fasterxml.jackson.core.type,
com.fasterxml.jackson.databind,
+ com.fasterxml.jackson.databind.node,
com.google.common.base,
com.google.common.cache,
com.google.common.collect,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
index ee97f63be0c..c4e983bc0d7 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
@@ -19,6 +19,9 @@ import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.WordTempl
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.eclipse.osee.framework.core.enums.PresentationType.PREVIEW;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.CharacterCodingException;
import java.util.ArrayList;
@@ -79,6 +82,7 @@ import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer;
import org.eclipse.osee.framework.ui.skynet.util.WordUiUtil;
import org.eclipse.osee.framework.ui.swt.Displays;
+import org.eclipse.osee.jaxrs.client.JaxRsApiImpl;
import org.eclipse.osee.orcs.rest.model.ApplicabilityEndpoint;
import org.eclipse.swt.program.Program;
import org.json.JSONArray;
@@ -201,14 +205,31 @@ public class WordTemplateProcessor {
try {
attributeElements.clear();
metadataElements.clear();
- JSONObject jsonObject = new JSONObject(masterTemplateOptions);
- elementType = jsonObject.getString("ElementType");
+ //JSONObject jsonObject = new JSONObject(masterTemplateOptions);
+ JaxRsApiImpl impl = new JaxRsApiImpl();
+ impl.start();
+ String json = impl.toJson(masterTemplateOptions);
+ HashMap jsonMap = new HashMap();
+ ObjectMapper OM = impl.getObjectMapper();
+
+ JsonNode node = OM.readTree(masterTemplateOptions);
+ System.out.println("node: " + node.asText());
+ System.out.print("element type: " + node.get("ElementType"));
+
+ // JsonNodeFactory n = OM.getNodeFactory();
+ //ObjectNode no= n.objectNode();
+ //no.
+ System.out.println("json: " + json);
+ // JsonParser jp = new JsonParser();
+ System.out.println("master temp: " + masterTemplateOptions);
+ // int i = 3 / 0;
+ elementType = node.get("ElementType").asText();
if (elementType.equals(ARTIFACT)) {
parseAttributeOptions(masterTemplateOptions);
parseMetadataOptions(masterTemplateOptions);
parseOutliningOptions(masterTemplateOptions);
}
- } catch (JSONException ex) {
+ } catch (IOException ex) {
OseeCoreException.wrapAndThrow(ex);
}
// Need to check if all attributes will be published. If so set the AllAttributes option.
@@ -372,9 +393,14 @@ public class WordTemplateProcessor {
wordMl.addWordMl(templateContent.substring(lastEndIndex, matcher.start()));
lastEndIndex = matcher.end();
- JSONObject jsonObject = new JSONObject(templateOptions);
- elementType = jsonObject.getString("ElementType");
+ // JSONObject jsonObject = new JSONObject(templateOptions);
+ // elementType = jsonObject.getString("ElementType");
+ JaxRsApiImpl impl = new JaxRsApiImpl();
+ impl.start();
+ ObjectMapper OM = impl.getObjectMapper();
+ JsonNode node = OM.readTree(templateOptions);
+ elementType = node.get("ElementType").toString();
if (elementType.equals(ARTIFACT)) {
parseOutliningOptions(templateOptions);
@@ -400,7 +426,7 @@ public class WordTemplateProcessor {
} catch (CharacterCodingException ex) {
OseeCoreException.wrapAndThrow(ex);
- } catch (JSONException ex) {
+ } catch (IOException ex) {
OseeCoreException.wrapAndThrow(ex);
}
@@ -468,6 +494,16 @@ public class WordTemplateProcessor {
try {
JSONObject jsonObject = new JSONObject(result);
JSONArray results = jsonObject.getJSONArray("results");
+ System.out.println("parse orcs: " + results);
+ int lk = 3 / 0;
+ JaxRsApiImpl impl = new JaxRsApiImpl();
+ impl.start();
+ String json = impl.toJson(result);
+ HashMap jsonMap = new HashMap();
+ ObjectMapper OM = impl.getObjectMapper();
+
+ JsonNode node = OM.readTree(result);
+
if (results.length() >= 1) {
JSONArray artifactIds = results.getJSONObject(0).getJSONArray("artifacts");
JSONObject id = null;
@@ -478,7 +514,7 @@ public class WordTemplateProcessor {
artifacts.add(artifact);
}
}
- } catch (JSONException ex) {
+ } catch (Exception ex) {
OseeCoreException.wrapAndThrow(ex);
}
@@ -768,7 +804,7 @@ public class WordTemplateProcessor {
publishInLine, footer);
}
}
- } else {
+ } else {
AttributeType attributeType = AttributeTypeManager.getType(attributeName);
if (artifact.isAttributeTypeValid(attributeType)) {
processAttribute(artifact, wordMl, attributeElement, attributeType, false, presentationType,
diff --git a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/JaxRsApiImpl.java b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/JaxRsApiImpl.java
index 359fae717ba..e59ee015965 100644
--- a/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/JaxRsApiImpl.java
+++ b/plugins/org.eclipse.osee.jaxrs.client/src/org/eclipse/osee/jaxrs/client/JaxRsApiImpl.java
@@ -48,14 +48,14 @@ public final class JaxRsApiImpl implements JaxRsApi {
public void start() {
SimpleModule module = JsonUtil.createModule();
- // JsonUtil.addDeserializer(module, AttributeTypeGeneric.class, tokenService::getAttributeType);
- // JsonUtil.addDeserializer(module, AttributeTypeToken.class, tokenService::getAttributeType);
- // JsonUtil.addDeserializer(module, AttributeTypeId.class, tokenService::getAttributeType);
+ //JsonUtil.addDeserializer(module, AttributeTypeGeneric.class, tokenService::getAttributeType);
+ // JsonUtil.addDeserializer(module, AttributeTypeToken.class, tokenService::getAttributeType);
+ // JsonUtil.addDeserializer(module, AttributeTypeId.class, tokenService::getAttributeType);
//JsonUtil.addDeserializer(module, ArtifactTypeToken.class, tokenService::getArtifactType);
- //JsonUtil.addDeserializer(module, ArtifactTypeId.class, tokenService::getArtifactType);
+ // JsonUtil.addDeserializer(module, ArtifactTypeId.class, tokenService::getArtifactType);
- // JsonUtil.addDeserializer(module, RelationTypeToken.class, tokenService::getRelationType);
+ //JsonUtil.addDeserializer(module, RelationTypeToken.class, tokenService::getRelationType);
mapper = JsonUtil.createStandardDateObjectMapper(module);
typeFactory = mapper.getTypeFactory();
@@ -75,6 +75,7 @@ public final class JaxRsApiImpl implements JaxRsApi {
SimpleModule module = JsonUtil.createModule();
mapper = JsonUtil.createStandardDateObjectMapper(module);
+ // System.out.println("to return: "+mapper.writeValueAsString(object));
return JsonUtil.toJson(mapper, object);
}
diff --git a/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/osgi/JdbcServiceConfigParser.java b/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/osgi/JdbcServiceConfigParser.java
index 37dfea184a2..ec484323a11 100644
--- a/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/osgi/JdbcServiceConfigParser.java
+++ b/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/osgi/JdbcServiceConfigParser.java
@@ -17,6 +17,7 @@ import static org.eclipse.osee.jdbc.JdbcException.newJdbcException;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.LinkedHashMap;
+import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -35,10 +36,14 @@ public final class JdbcServiceConfigParser {
Map<String, JdbcServiceConfig> toReturn = new LinkedHashMap<>();
if (Strings.isValid(source)) {
try {
+ LinkedList jsonList = new LinkedList();
+
JSONArray array = new JSONArray(source);
for (int index = 0; index < array.length(); index++) {
+
JSONObject object = array.getJSONObject(index);
JdbcServiceConfig newConfig = asConfig(object);
+ System.out.println("config: " + newConfig.toString());
if (!newConfig.isEmpty()) {
checkId(newConfig);
JdbcServiceConfig oldConfig = toReturn.put(newConfig.getId(), newConfig);
diff --git a/plugins/org.eclipse.osee.parent/CUsersb3091894.m2settings.xml b/plugins/org.eclipse.osee.parent/CUsersb3091894.m2settings.xml
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/plugins/org.eclipse.osee.parent/CUsersb3091894.m2settings.xml
diff --git a/plugins/org.eclipse.osee.parent/keystore.jks b/plugins/org.eclipse.osee.parent/keystore.jks
new file mode 100644
index 00000000000..502e539f916
--- /dev/null
+++ b/plugins/org.eclipse.osee.parent/keystore.jks
Binary files differ
diff --git a/plugins/org.eclipse.osee.server.p2/keystore.jks b/plugins/org.eclipse.osee.server.p2/keystore.jks
new file mode 100644
index 00000000000..30834d53178
--- /dev/null
+++ b/plugins/org.eclipse.osee.server.p2/keystore.jks
Binary files differ

Back to the top