Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2018-10-02 16:20:39 -0400
committerdonald.g.dunne2018-10-04 15:55:26 -0400
commit6e7ad05bd906c824ff192c587cecbe2a02a8a9e6 (patch)
tree5714d0f73a6bd978f75cdfc463ebcd12818a55b3
parent41aa3ab13906a2ec9832ebae5425157a3ccf35bc (diff)
downloadorg.eclipse.osee-6e7ad05bd906c824ff192c587cecbe2a02a8a9e6.tar.gz
org.eclipse.osee-6e7ad05bd906c824ff192c587cecbe2a02a8a9e6.tar.xz
org.eclipse.osee-6e7ad05bd906c824ff192c587cecbe2a02a8a9e6.zip
feature[ats_TW11300]: Elevate Description attribute to top Artifact type
-rw-r--r--plugins/org.eclipse.osee.ats.mocks/data/binary_data.zipbin322009 -> 321858 bytes
-rw-r--r--plugins/org.eclipse.osee.ats.mocks/data/hsql.zipbin204216 -> 206751 bytes
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee7
-rw-r--r--plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/types/OseeTypes_OAuth.osee1
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/README.txt2
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zipbin322009 -> 321858 bytes
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zipbin204216 -> 206751 bytes
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zipbin322009 -> 321858 bytes
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/demo/hsql.zipbin204216 -> 206751 bytes
10 files changed, 4 insertions, 9 deletions
diff --git a/plugins/org.eclipse.osee.ats.mocks/data/binary_data.zip b/plugins/org.eclipse.osee.ats.mocks/data/binary_data.zip
index 6e55fa4491..a2f8a39a40 100644
--- a/plugins/org.eclipse.osee.ats.mocks/data/binary_data.zip
+++ b/plugins/org.eclipse.osee.ats.mocks/data/binary_data.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.ats.mocks/data/hsql.zip b/plugins/org.eclipse.osee.ats.mocks/data/hsql.zip
index a630c2d6c3..4a72ecfee0 100644
--- a/plugins/org.eclipse.osee.ats.mocks/data/hsql.zip
+++ b/plugins/org.eclipse.osee.ats.mocks/data/hsql.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java
index 61eab58ba3..2152036706 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AttributeTypeEditPresenterTest.java
@@ -53,7 +53,8 @@ public class AttributeTypeEditPresenterTest {
CoreAttributeTypes.RelationOrder,
CoreAttributeTypes.ContentUrl,
CoreAttributeTypes.Annotation,
- CoreAttributeTypes.StaticId};
+ CoreAttributeTypes.StaticId,
+ CoreAttributeTypes.Description};
private AttributeTypeEditPresenter controller;
private MockDisplay display;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee b/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee
index 84d44fdfa9..b8bc0e5d80 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee
+++ b/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee
@@ -5,6 +5,7 @@ artifactType "Artifact" {
attribute "Content URL"
attribute "Static Id"
attribute "Relation Order"
+ attribute "Description"
}
artifactType "Access Control Model" extends "General Data" {
@@ -342,7 +343,6 @@ artifactType "Subscription Group" extends "User Group" {
artifactType "Universal Group" extends "Group Artifact" {
id 8
- attribute "Description"
}
artifactType "Renderer Template" extends "MS Word Whole Document" {
@@ -408,7 +408,6 @@ artifactType "General Document" extends "Native Artifact" {
artifactType "Url" extends "Artifact" {
id 15
- attribute "Description"
}
attributeType "Name" extends StringAttribute {
@@ -621,7 +620,6 @@ artifactType "MS Word Template" extends "MS Word" {
abstract artifactType "Native Artifact" extends "Artifact" {
id 20
attribute "Extension"
- attribute "Description"
attribute "Native Content"
}
@@ -1854,7 +1852,6 @@ artifactType "Osee Type Definition" extends "Artifact" {
artifactType "Feature" extends "Artifact" {
id 87
- attribute "Description"
}
relationType "Related Feature" {
@@ -1870,7 +1867,6 @@ relationType "Related Feature" {
artifactType "OSEE App" extends "Artifact" {
id 89
attribute "Osee App Definition"
- attribute "Description"
}
attributeType "Osee App Definition" extends StringAttribute {
@@ -1885,7 +1881,6 @@ attributeType "Osee App Definition" extends StringAttribute {
artifactType "Breaker" extends "Artifact" {
id 188458869981236
attribute "Display Text"
- attribute "Description"
attribute "Circuit Breaker ID"
attribute "Require Confirmation"
}
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/types/OseeTypes_OAuth.osee b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/types/OseeTypes_OAuth.osee
index e3ee0ec524..3df374287f 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/types/OseeTypes_OAuth.osee
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/types/OseeTypes_OAuth.osee
@@ -2,7 +2,6 @@ import "platform:/plugin/org.eclipse.osee.framework.skynet.core/support/OseeType
artifactType "OAuth Client" extends "Artifact" {
id 756912961500447526
- attribute "Description"
attribute "Website URI"
attribute "Logo URI"
attribute "Is Confidential"
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/README.txt b/plugins/org.eclipse.osee.orcs.db.mock/README.txt
index c128cedfee..ec834f0f0f 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/README.txt
+++ b/plugins/org.eclipse.osee.orcs.db.mock/README.txt
@@ -8,7 +8,7 @@ When database schema, types or dbinit change, the files in the /data directory m
To do so:
1) Delete C:/Users/<account>/hsql and C:/Users/<account>/attr
-2) Do a normal AtsClient_Integration_TestSuite, stop before ClientResourceTest
+2) Do a normal AtsClient_Integration_TestSuite, stop at AtsTest_AllAts_Suite.setup
3) Zip up hsql dir to hsql.zip and copy to this directory
4) Zip up attr to binary_data.zip and copy to this directory
5) Re-run the local Test Suite and fix any errors
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zip b/plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zip
index 6e55fa4491..a2f8a39a40 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zip
+++ b/plugins/org.eclipse.osee.orcs.db.mock/data/binary_data.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zip b/plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zip
index a630c2d6c3..4a72ecfee0 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zip
+++ b/plugins/org.eclipse.osee.orcs.db.mock/data/hsql.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip b/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip
index 6e55fa4491..a2f8a39a40 100644
--- a/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip
+++ b/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
index a630c2d6c3..4a72ecfee0 100644
--- a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
+++ b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
Binary files differ

Back to the top