Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

platform model enhancements

  • Loading branch information...
commit 99414b03f1eb77a053f8c42c17564b4dec6f76b3 1 parent 41f0254
Jorn Bettin JornBettin authored
Showing with 92 additions and 115 deletions.
  1. +1 −0  org.s23m.cell.kernel.tests/META-INF/MANIFEST.MF
  2. +2 −2 ...s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/artifactinstantiation/InstantiationSequences.java
  3. +1 −1  org.s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/artifactinstantiation/KernelTestSequence.java
  4. +6 −6 org.s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/tests/EnterpriseArchitectureModellingTest.java
  5. +1 −0  org.s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/tests/S23MTestCase.java
  6. +1 −1  org.s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/tests/VisualisationExampleTest.java
  7. +5 −5 org.s23m.cell.kernel/src/main/java/org/s23m/cell/api/models2/EnterpriseArchitecture.java
  8. +6 −6 org.s23m.cell.kernel/src/main/java/org/s23m/cell/api/models2/RepositoryStructure.java
  9. +4 −4 org.s23m.cell.kernel/src/main/java/org/s23m/cell/core/F_Instantiation.java
  10. +2 −2 org.s23m.cell.kernel/src/main/java/org/s23m/cell/core/XtensionIdentityFactory.java
  11. +2 −2 org.s23m.cell.kernel/src/main/java/org/s23m/cell/core/XtensionSemanticIdentityRegistry.java
  12. +10 −6 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/api/Instantiation.java
  13. +4 −9 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/Agency.java
  14. +3 −1 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/CellEngineering.java
  15. +14 −6 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/CellPlatform.java
  16. +9 −12 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/CellPlatformDomain.java
  17. +17 −49 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/Organization.java
  18. +1 −0  org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/testfoundation/TestFoundation.java
  19. +1 −1  ...cell.repository.client/src/main/java/org/s23m/cell/repository/client/mediator/RepositoryClientMediator.java
  20. +1 −1  org.s23m.cell.serialization/src/main/java/org/s23m/cell/serialization/serializer/SerializerFactory.java
  21. +1 −1  org.s23m.cell.serialization/src/main/java/org/s23m/cell/serialization/serializer/SerializerHolder.java
1  org.s23m.cell.kernel.tests/META-INF/MANIFEST.MF
View
@@ -8,3 +8,4 @@ Require-Bundle: org.s23m.cell.kernel;bundle-version="1.0.0",org.junit4
Bundle-ActivationPolicy: lazy
Export-Package: org.s23m.cell.kernel.artifactinstantiation,
org.s23m.cell.kernel.tests
+Import-Package: org.s23m.cell.platform
4 ...m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/artifactinstantiation/InstantiationSequences.java
View
@@ -81,7 +81,7 @@
public final Set crm_aviz = RepositoryStructure.graphVisualizations.addConcrete(Visualization.graphVisualization,
- addDisjunctSemanticIdentitySet("crm schema container visualizedGraph", "crm schema container graphVisualizations", testDomain));
+ addDisjunctSemanticIdentitySet("crm schema container visualizedGraph", "crm schema container cellVisualizations", testDomain));
public Set crm_viz_structure_diag_product;
@@ -98,7 +98,7 @@ public static InstantiationSequences getInstance() {
public void visualizationExample() {
final Set crm_viz = crm_aviz.addConcrete(Visualization.visualizedGraph,
- addDisjunctSemanticIdentitySet("crm schema visualizedGraph", "crm schema graphVisualizations", testDomain));
+ addDisjunctSemanticIdentitySet("crm schema visualizedGraph", "crm schema cellVisualizations", testDomain));
final Set crm_viz_details = crm_aviz.addConcrete(Visualization.details,
addDisjunctSemanticIdentitySet("crm schema visualizedGraph | details", "crm schema visualizedGraph | details", testDomain));
2  org.s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/artifactinstantiation/KernelTestSequence.java
View
@@ -76,7 +76,7 @@ public static void run() {
public static final Set crm_aviz = RepositoryStructure.graphVisualizations.addConcrete(Visualization.graphVisualization,
- Instantiation.addDisjunctSemanticIdentitySet("crm schema container visualizedGraph", "crm schema container graphVisualizations", testDomain));
+ Instantiation.addDisjunctSemanticIdentitySet("crm schema container visualizedGraph", "crm schema container cellVisualizations", testDomain));
12 ...s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/tests/EnterpriseArchitectureModellingTest.java
View
@@ -19,9 +19,9 @@ protected void executeInstantiationSequence() {
// instantiation level 1
final Set person = acmeEA.addConcrete(EnterpriseArchitecture.who,
- addDisjunctSemanticIdentitySet("person", "persons", testDomain));
- final Set organization = acmeEA.addConcrete(EnterpriseArchitecture.who,
- addDisjunctSemanticIdentitySet("organization", "organizations", testDomain));
+ addDisjunctSemanticIdentitySet("nonLinearSystem", "persons", testDomain));
+ final Set sandbox_organization = acmeEA.addConcrete(EnterpriseArchitecture.who,
+ addDisjunctSemanticIdentitySet("sandbox_organization", "sandbox_organizations", testDomain));
// Notice that we can instantiate an edge, this is only because "who" is not only an instance of vertex, but also a subSet of a vertex!
// The enterpriseArchitectureGraph is a true extension of Graph (we remain at instantiation level 0!), and we can refine the Graph semantics as we please
final Set employeesToEmployers = arrow(coreGraphs.edge , addDisjunctSemanticIdentitySet("employees To Employers", "employees To Employers", testDomain),
@@ -29,7 +29,7 @@ protected void executeInstantiationSequence() {
person,
S23MSemanticDomains.minCardinality_0, S23MSemanticDomains.maxCardinality_n, S23MSemanticDomains.isNavigable_TRUE, S23MSemanticDomains.isContainer_FALSE,
addDisjunctSemanticIdentitySet("employer", "employers", testDomain),
- organization,
+ sandbox_organization,
S23MSemanticDomains.minCardinality_0, S23MSemanticDomains.maxCardinality_n, S23MSemanticDomains.isNavigable_TRUE, S23MSemanticDomains.isContainer_FALSE);
// Here we see that we can instantiate the whoToWho as well - this is the easy part
@@ -38,12 +38,12 @@ protected void executeInstantiationSequence() {
arrow(whoToWho, addDisjunctSemanticIdentitySet("fun to more fun", "fun to more fun", testDomain),
addDisjunctSemanticIdentitySet("fun", "fun", testDomain), person,
S23MSemanticDomains.minCardinality_0, S23MSemanticDomains.maxCardinality_n, S23MSemanticDomains.isNavigable_TRUE, S23MSemanticDomains.isContainer_FALSE,
- addDisjunctSemanticIdentitySet("more fun", "more fun", testDomain), organization,
+ addDisjunctSemanticIdentitySet("more fun", "more fun", testDomain), sandbox_organization,
S23MSemanticDomains.minCardinality_0, S23MSemanticDomains.maxCardinality_n, S23MSemanticDomains.isNavigable_TRUE, S23MSemanticDomains.isContainer_FALSE);
// instantiation level 2
final Set joeBloggs = acmeMelbourne.addConcrete(person, addDisjunctSemanticIdentitySet("Joe Bloggs", "Joe Bloggs", testDomain));
- final Set canberraHQ = acmeMelbourne.addConcrete(organization, addDisjunctSemanticIdentitySet("Melbourne HQ", "Melbourne HQ", testDomain));
+ final Set canberraHQ = acmeMelbourne.addConcrete(sandbox_organization, addDisjunctSemanticIdentitySet("Melbourne HQ", "Melbourne HQ", testDomain));
arrow(employeesToEmployers, addDisjunctSemanticIdentitySet("Business Analyst to Main Employer", "Business Analyst to Main Employer", testDomain),
addDisjunctSemanticIdentitySet("Business Analyst", "Business Analyst", testDomain), joeBloggs,
1  org.s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/tests/S23MTestCase.java
View
@@ -31,6 +31,7 @@ public S23MTestCase() {
public void setUp() {
if (!kernelHasBooted) {
org.s23m.cell.S23MKernel.boot();
+ //org.s23m.cell.platform.S23MPlatform.bootTemplate();
instantiationSequences = InstantiationSequences.getInstance();
testData = new InstantiationData(instantiationSequences);
2  org.s23m.cell.kernel.tests/src/main/java/org/s23m/cell/kernel/tests/VisualisationExampleTest.java
View
@@ -15,7 +15,7 @@ protected void executeInstantiationSequence() {
final Set crm_product = instantiationSequences.crm_product;
final Set crm_viz = crm_aviz.addConcrete(Visualization.visualizedGraph,
- Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph", "crm schema graphVisualizations", testDomain));
+ Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph", "crm schema cellVisualizations", testDomain));
final Set crm_viz_details = crm_aviz.addConcrete(Visualization.details,
Instantiation.addDisjunctSemanticIdentitySet("crm schema visualizedGraph | details", "crm schema visualizedGraph | details", testDomain));
10 org.s23m.cell.kernel/src/main/java/org/s23m/cell/api/models2/EnterpriseArchitecture.java
View
@@ -58,20 +58,20 @@
private static final Set s6 = Instantiation.arrow(coreGraphs.superSetReference, where, coreGraphs.vertex);
private static final Set s7 = Instantiation.arrow(coreGraphs.superSetReference, why, coreGraphs.vertex);
- public static final Set organization = RepositoryStructure.productlinemanagement.addConcrete(EnterpriseArchitecture.who, Instantiation.addDisjunctSemanticIdentitySet("organization", "organizations", S23MSemanticDomains.sandboxSemanticDomains));
- public static final Set system = RepositoryStructure.productlinemanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("system", "systems", S23MSemanticDomains.sandboxSemanticDomains));
+ public static final Set sandbox_organization = RepositoryStructure.productlinemanagement.addConcrete(EnterpriseArchitecture.who, Instantiation.addDisjunctSemanticIdentitySet("sandbox sandbox_organization", "sandbox organizations", S23MSemanticDomains.sandboxSemanticDomains));
+ public static final Set system = RepositoryStructure.productlinemanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("linearSystem", "systems", S23MSemanticDomains.sandboxSemanticDomains));
public static final Set managedfeature = RepositoryStructure.productlinemanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("managed feature", "managed features", S23MSemanticDomains.sandboxSemanticDomains));
public static final Set product = RepositoryStructure.productmanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("product", "products", S23MSemanticDomains.sandboxSemanticDomains));
public static final Set productfeedback = RepositoryStructure.productmanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("product feedback", "product feedbacks", S23MSemanticDomains.sandboxSemanticDomains));
public static final Set usecase = RepositoryStructure.productmanagement.addConcrete(EnterpriseArchitecture.how, Instantiation.addDisjunctSemanticIdentitySet("use case", "use cases", S23MSemanticDomains.sandboxSemanticDomains));
public static final Set timebox = RepositoryStructure.projectmanagement.addConcrete(EnterpriseArchitecture.when, Instantiation.addDisjunctSemanticIdentitySet("timebox", "timeboxes", S23MSemanticDomains.sandboxSemanticDomains));
- private static final Set v1 = Instantiation.arrow(coreGraphs.visibility, organization, system);
+ private static final Set v1 = Instantiation.arrow(coreGraphs.visibility, sandbox_organization, system);
private static final Set v2 = Instantiation.arrow(coreGraphs.visibility, system, managedfeature);
private static final Set v3 = Instantiation.arrow(coreGraphs.visibility, product, productfeedback);
private static final Set v4 = Instantiation.arrow(coreGraphs.visibility, product, usecase);
- private static final Set v5 = Instantiation.arrow(coreGraphs.visibility, productfeedback, organization);
- private static final Set v6 = Instantiation.arrow(coreGraphs.visibility, usecase, organization);
+ private static final Set v5 = Instantiation.arrow(coreGraphs.visibility, productfeedback, sandbox_organization);
+ private static final Set v6 = Instantiation.arrow(coreGraphs.visibility, usecase, sandbox_organization);
private static final Set v7 = Instantiation.arrow(coreGraphs.visibility, usecase, managedfeature);
private static final Set v8 = Instantiation.arrow(coreGraphs.visibility, timebox, product);
12 org.s23m.cell.kernel/src/main/java/org/s23m/cell/api/models2/RepositoryStructure.java
View
@@ -61,8 +61,8 @@
//public static final Set applicationengineering = Root.sandbox.addConcrete(domainengineering, Instantiation.addDisjunctSemanticIdentitySet("application engineering", "", S23MSemanticDomains.agentSemanticDomains));
//public static final Set applicationoperation = Root.sandbox.addConcrete(applicationengineering, Instantiation.addDisjunctSemanticIdentitySet("application operation", "", S23MSemanticDomains.agentSemanticDomains));
/*
- public static final Set organization = productlinemanagement.addConcrete(EnterpriseArchitecture.who, Instantiation.addDisjunctSemanticIdentitySet("organization", "organizations", S23MSemanticDomains.agentSemanticDomains));
- public static final Set system = productlinemanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("system", "systems", S23MSemanticDomains.agentSemanticDomains));
+ public static final Set sandbox_organization = productlinemanagement.addConcrete(EnterpriseArchitecture.who, Instantiation.addDisjunctSemanticIdentitySet("sandbox_organization", "organizations", S23MSemanticDomains.agentSemanticDomains));
+ public static final Set linearSystem = productlinemanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("linearSystem", "systems", S23MSemanticDomains.agentSemanticDomains));
public static final Set managedfeature = productlinemanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("managed feature", "managed features", S23MSemanticDomains.agentSemanticDomains));
public static final Set product = productmanagement.addConcrete(EnterpriseArchitecture.what, Instantiation.addDisjunctSemanticIdentitySet("product", "products", S23MSemanticDomains.agentSemanticDomains));
@@ -89,13 +89,13 @@ public static void instantiateFeature() {
Instantiation.arrow(coreGraphs.visibility, applicationengineering, productlinemanagement);
Instantiation.arrow(coreGraphs.visibility, applicationengineering, domainengineering);
- /*Instantiation.arrow(coreGraphs.visibility, organization, system);
- Instantiation.arrow(coreGraphs.visibility, system, managedfeature);
+ /*Instantiation.arrow(coreGraphs.visibility, sandbox_organization, linearSystem);
+ Instantiation.arrow(coreGraphs.visibility, linearSystem, managedfeature);
Instantiation.arrow(coreGraphs.visibility, product, productfeedback);
Instantiation.arrow(coreGraphs.visibility, product, usecase);
- Instantiation.arrow(coreGraphs.visibility, productfeedback, organization);
- Instantiation.arrow(coreGraphs.visibility, usecase, organization);
+ Instantiation.arrow(coreGraphs.visibility, productfeedback, sandbox_organization);
+ Instantiation.arrow(coreGraphs.visibility, usecase, sandbox_organization);
Instantiation.arrow(coreGraphs.visibility, usecase, managedfeature);
Instantiation.arrow(coreGraphs.visibility, timebox, product);
8 org.s23m.cell.kernel/src/main/java/org/s23m/cell/core/F_Instantiation.java
View
@@ -167,8 +167,8 @@ public static Vertex instantiateConcrete(final Identity semanticIdentity, final
final Vertex temp;
if (SemanticStateOfInMemoryModel.semanticDomainIsInitialized()) {
if (xtensionIdentityFactory.agent().isEqualTo(category.identity())
- || xtensionIdentityFactory.person().isEqualTo(category.identity())
- || xtensionIdentityFactory.system().isEqualTo(category.identity())
+ || xtensionIdentityFactory.nonLinearSystem().isEqualTo(category.identity())
+ || xtensionIdentityFactory.linearSystem().isEqualTo(category.identity())
) {
temp = new Vertex((Graph) Root.agents, semanticIdentity, category);
} else {
@@ -238,8 +238,8 @@ public static Vertex instantiateAbstract(final Identity semanticIdentity, final
final Vertex temp;
if (SemanticStateOfInMemoryModel.semanticDomainIsInitialized()) {
if (xtensionIdentityFactory.agent().isEqualTo(category.identity())
- || xtensionIdentityFactory.person().isEqualTo(category.identity())
- || xtensionIdentityFactory.system().isEqualTo(category.identity())
+ || xtensionIdentityFactory.nonLinearSystem().isEqualTo(category.identity())
+ || xtensionIdentityFactory.linearSystem().isEqualTo(category.identity())
) {
temp = new Vertex((Graph) Root.agents, semanticIdentity, category);
} else {
4 org.s23m.cell.kernel/src/main/java/org/s23m/cell/core/XtensionIdentityFactory.java
View
@@ -44,7 +44,7 @@ public XtensionIdentityFactory() {
public final Identity agentSemanticDomains() {return F_Instantiation.identityFactory.createIdentityInKernel("agent semantic domains", "agent semantic domains", XtensionSemanticIdentityRegistry.agentSemanticDomains.ordinal());}
public final Identity cellKernel() {return F_Instantiation.identityFactory.createIdentityInKernel("cell kernel - JAVA", "cell kernel - JAVA", XtensionSemanticIdentityRegistry.cellKernel.ordinal());}
public final Identity agent() {return F_Instantiation.identityFactory.createIdentityInKernel("agent", "agents", XtensionSemanticIdentityRegistry.agent.ordinal());}
- public final Identity person() {return F_Instantiation.identityFactory.createIdentityInKernel("person", "people", XtensionSemanticIdentityRegistry.person.ordinal());}
- public final Identity system() {return F_Instantiation.identityFactory.createIdentityInKernel("system", "systems", XtensionSemanticIdentityRegistry.system.ordinal());}
+ public final Identity nonLinearSystem() {return F_Instantiation.identityFactory.createIdentityInKernel("non-linear linearSystem", "non-linear systems", XtensionSemanticIdentityRegistry.nonLinearSystem.ordinal());}
+ public final Identity linearSystem() {return F_Instantiation.identityFactory.createIdentityInKernel("linear linearSystem", "linear systems", XtensionSemanticIdentityRegistry.linearSystem.ordinal());}
}
4 org.s23m.cell.kernel/src/main/java/org/s23m/cell/core/XtensionSemanticIdentityRegistry.java
View
@@ -49,7 +49,7 @@
agentSemanticDomains,
cellKernel,
agent,
- person,
- system,
+ nonLinearSystem,
+ linearSystem,
}
16 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/api/Instantiation.java
View
@@ -68,7 +68,8 @@ public static Set addAgent(final String name, final String pluralName) {
return F_Instantiation.instantiateConcrete(F_Instantiation.reuseSemanticIdentity(sd.identity()), Agency.agent);
}
public static Set addStage(final String name, final String pluralName, final Set semanticDomain) {
- if (semanticDomain.category().isSuperSetOf(SemanticDomain.semanticdomain).is_TRUE()) {
+ //if (semanticDomain.category().isSuperSetOf(SemanticDomain.semanticdomain).is_TRUE()) {
+ if (SemanticDomain.semanticdomain.isSuperSetOf(semanticDomain.category()).is_TRUE()) {
final Set sd = org.s23m.cell.api.Instantiation.addSemanticDomain(name, pluralName, semanticDomain);
final Set t = Instantiation.toAgent(semanticDomain);
if (t.category().isEqualTo(Agency.agent)) {
@@ -86,7 +87,8 @@ public static Set addStage(final String name, final String pluralName, final Set
return F_InstantiationImpl.raiseError(coreSets.semanticErr_operationIsIllegalOnThisInstance.identity(), coreSets.semanticErr);
} else {
final Set sd = Instantiation.toSemanticDomain(semanticDomain);
- if (sd.category().isSuperSetOf(SemanticDomain.semanticdomain).is_TRUE()) {
+ //if (sd.category().isSuperSetOf(SemanticDomain.semanticdomain).is_TRUE()) {
+ if (SemanticDomain.semanticdomain.isSuperSetOf(sd.category()).is_TRUE()) {
return Instantiation.addStage(name, pluralName, sd);
} else {
return F_InstantiationImpl.raiseError(coreSets.semanticErr_operationIsIllegalOnThisInstance.identity(), coreSets.semanticErr);
@@ -98,15 +100,17 @@ private static Set addDefaultContainers(final Set stage) {
final Set time = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.timeConsciousness, stage, CellPlatformDomain.time);
final Set languages = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.language, stage, CellPlatformDomain.languages);
final Set licenses = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.licensing, stage, CellPlatformDomain.licenses);
- // TODO fix up organisation model
- //org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.organization, stage, CellPlatformDomain.organizations);
final Set terminologies = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.terminology, stage, CellPlatformDomain.terminologies);
- final Set graphVisualizatons = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(Visualization.graphVisualization, stage, CellPlatformDomain.graphVisualizations);
+ final Set cellVisualizatons = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(Visualization.graphVisualization, stage, CellPlatformDomain.cellVisualizations);
+ // TODO fix up organisation model
+ final Set organizations = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.organization, stage, CellPlatformDomain.organizations);
final Set cells = org.s23m.cell.platform.api.Instantiation.instantiateConcrete(CellEngineering.cellContent, stage, CellPlatformDomain.cells);
+
+ org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, organizations, time);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, languages);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, time);
org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, terminologies);
- org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, licenses);
+ org.s23m.cell.platform.api.Instantiation.arrow(coreGraphs.visibility, cells, licenses);
return stage;
}
13 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/Agency.java
View
@@ -38,14 +38,14 @@
public static final Set agent = CellEngineering.agency.addConcrete(coreGraphs.vertex, CellPlatformDomain.agent);
private static final Set s1 = Instantiation.arrow(coreGraphs.superSetReference, agent, coreGraphs.vertex);
- public static final Set person = CellEngineering.agency.addConcrete(coreGraphs.vertex, CellPlatformDomain.person);
- public static final Set system = CellEngineering.agency.addConcrete(coreGraphs.vertex, CellPlatformDomain.system);
+ public static final Set nonLinearSystem = CellEngineering.agency.addConcrete(coreGraphs.vertex, CellPlatformDomain.nonLinearSystem);
+ public static final Set linearSystem = CellEngineering.agency.addConcrete(coreGraphs.vertex, CellPlatformDomain.linearSystem);
public static final Set stage = CellEngineering.agency.addConcrete(coreGraphs.vertex, CellPlatformDomain.stage);
private static final Set s0 = Instantiation.arrow(coreGraphs.superSetReference, stage, agent);
- private static final Set s2 = Instantiation.arrow(coreGraphs.superSetReference, person, agent);
- private static final Set s3 = Instantiation.arrow(coreGraphs.superSetReference, system, agent);
+ private static final Set s2 = Instantiation.arrow(coreGraphs.superSetReference, nonLinearSystem, agent);
+ private static final Set s3 = Instantiation.arrow(coreGraphs.superSetReference, linearSystem, agent);
//private static final Set v2 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.agency, CellEngineering.timeConsciousness);
private static final Set v1 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.agency, CellEngineering.language);
private static final Set v2 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.agency, CellEngineering.jargon);
@@ -122,11 +122,6 @@
S23MSemanticDomains.isContainer_FALSE
);
- public static final Set s23mCellPlatform = org.s23m.cell.platform.api.Instantiation.addAgent("cell platform", "cell platform");
- public static final Set development = org.s23m.cell.platform.api.Instantiation.addStage("development", "development", s23mCellPlatform);
- public static final Set testing = org.s23m.cell.platform.api.Instantiation.addStage("test", "test", s23mCellPlatform);
- public static final Set production = org.s23m.cell.platform.api.Instantiation.addStage("production", "production", s23mCellPlatform);
-
public static Set instantiateFeature() {
return CellEngineering.agency;
}
4 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/CellEngineering.java
View
@@ -44,6 +44,8 @@
public static final Set agency = Root.cellengineering.addConcrete(coreGraphs.vertex, CellPlatformDomain.agency);
public static final Set jargon = Root.cellengineering.addConcrete(coreGraphs.vertex, CellPlatformDomain.jargon);
private static final Set s0 = Instantiation.arrow(coreGraphs.superSetReference, jargon, language);
+ private static final Set v0 = Instantiation.arrow(coreGraphs.visibility, jargon, language);
+
public static final Set timeConsciousness = Root.cellengineering.addConcrete(coreGraphs.vertex, CellPlatformDomain.timeConsciousness);
public static final Set licensing = Root.cellengineering.addConcrete(coreGraphs.vertex, CellPlatformDomain.licensing);
@@ -53,7 +55,7 @@
public static final Set logicalExpression = Root.cellengineering.addAbstract(CellContent.cell, CellPlatformDomain.logicalExpression);
public static final Set representationStyleCategories = Root.cellengineering.addConcrete(coreGraphs.vertex, CellPlatformDomain.representationStyleCategories);
public static final Set semanticDimension = Root.cellengineering.addConcrete(coreGraphs.vertex, CellPlatformDomain.semanticDimension);
- public static final Set organization = Root.cellengineering.addConcrete(SemanticDimension.who, CellPlatformDomain.organization);
+ public static final Set organization = Root.cellengineering.addConcrete(coreGraphs.vertex, CellPlatformDomain.organization);
static Set instantiateFeature() {
20 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/CellPlatform.java
View
@@ -27,6 +27,7 @@
import static org.s23m.cell.core.F_Instantiation.identityFactory;
+import org.s23m.cell.Set;
import org.s23m.cell.platform.testfoundation.TestFoundation;
public class CellPlatform {
@@ -36,19 +37,26 @@ public static void instantiateFeature() {
final int inMemoryComplexity = identityFactory.inMemoryComplexity();
CellEngineering.instantiateFeature();
Agency.instantiateFeature();
+
//CellEngineering.instantiateFeature();
// TODO Fix up S23MSemantics.instantiateFeature();
- //ValidityInterval.instantiateFeature();
- //TimeConsciousness.instantiateFeature();
- //Language.instantiateFeature();
- //Terminology.instantiateFeature();
- //SemanticDimension.instantiateFeature();
- //Licensing.instantiateFeature();
+ ValidityInterval.instantiateFeature();
+ TimeConsciousness.instantiateFeature();
+ Language.instantiateFeature();
+ Terminology.instantiateFeature();
+ SemanticDimension.instantiateFeature();
+ Licensing.instantiateFeature();
+
Organization.instantiateFeature();
LogicalFunction.instantiateFeature();
CellVisualization.instantiateFeature();
RepresentationStyleCategories.instantiateFeature();
+ final Set s23mCellPlatform = org.s23m.cell.platform.api.Instantiation.addAgent("cell platform", "cell platform");
+ final Set development = org.s23m.cell.platform.api.Instantiation.addStage("development", "development", s23mCellPlatform);
+ final Set testing = org.s23m.cell.platform.api.Instantiation.addStage("test", "test", s23mCellPlatform);
+ final Set production = org.s23m.cell.platform.api.Instantiation.addStage("production", "production", s23mCellPlatform);
+
// Basis for test cases building on top of the foundation
TestFoundation.instantiateFeature();
}
21 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/CellPlatformDomain.java
View
@@ -36,26 +36,27 @@
// GOMODEL cell platform DOMAIN
public static final Set cellPlatformDomain = Instantiation.addSemanticDomain("cell platform - JAVA", "cell platform - JAVA", S23MSemanticDomains.agentSemanticDomains);
- //public static final Set cellPlatformDomain = Instantiation.addSemanticDomain("cell platform", "cell platforms", Root.semanticdomains);
public static final Set world = Instantiation.addDisjunctSemanticIdentitySet("world", "set of worlds", cellPlatformDomain);
public static final Set legalEntity = Instantiation.addDisjunctSemanticIdentitySet("legal entity", "set of legal entities", cellPlatformDomain);
+ //public static final Set organization = Instantiation.addDisjunctSemanticIdentitySet("organization", "set of organizations", cellPlatformDomain);
public static final Set organization = Instantiation.addSemanticRole("organization", "organizations", cellPlatformDomain, legalEntity);
public static final Set agency = Instantiation.addDisjunctSemanticIdentitySet("agency", "set of agency", cellPlatformDomain);
public static final Set agent = ((Graph)cellPlatformDomain).addConcrete(SemanticDomain.disjunctSemanticIdentitySet, F_Instantiation.xtensionIdentityFactory.agent());
- public static final Set person = ((Graph)cellPlatformDomain).addConcrete(SemanticDomain.disjunctSemanticIdentitySet, F_Instantiation.xtensionIdentityFactory.person());
- public static final Set system = ((Graph)cellPlatformDomain).addConcrete(SemanticDomain.disjunctSemanticIdentitySet, F_Instantiation.xtensionIdentityFactory.system());
+ public static final Set nonLinearSystem = ((Graph)cellPlatformDomain).addConcrete(SemanticDomain.disjunctSemanticIdentitySet, F_Instantiation.xtensionIdentityFactory.nonLinearSystem());
+ public static final Set linearSystem = ((Graph)cellPlatformDomain).addConcrete(SemanticDomain.disjunctSemanticIdentitySet, F_Instantiation.xtensionIdentityFactory.linearSystem());
public static final Set stage = Instantiation.addDisjunctSemanticIdentitySet("stage", "stages", cellPlatformDomain);
public static final Set agent_to_stages = Instantiation.addDisjunctSemanticIdentitySet("agent_to_stages", "set of agent_to_stages", cellPlatformDomain);
public static final Set user = Instantiation.addSemanticRole("user", "users", cellPlatformDomain, agent);
+ public static final Set member = Instantiation.addSemanticRole("member", "members", cellPlatformDomain, agent);
public static final Set creator = Instantiation.addSemanticRole("creator", "creators", cellPlatformDomain, agent);
public static final Set role = Instantiation.addDisjunctSemanticIdentitySet("role", "roles", cellPlatformDomain);
public static final Set languagePreference = Instantiation.addDisjunctSemanticIdentitySet("language preference", "set of language preferences", cellPlatformDomain);
- public static final Set parentOrganization = Instantiation.addSemanticRole("parent", "set of parents", cellPlatformDomain, organization);
- public static final Set subOrganization = Instantiation.addSemanticRole("sub organization", "set of sub organizations", cellPlatformDomain, organization);
+ //public static final Set parentOrganization = Instantiation.addSemanticRole("parent", "set of parents", cellPlatformDomain, organization);
+ //public static final Set subOrganization = Instantiation.addSemanticRole("sub organization", "set of sub organizations", cellPlatformDomain, organization);
public static final Set parentRole = Instantiation.addSemanticRole("parent", "set of parents", cellPlatformDomain, role);
public static final Set includedRole = Instantiation.addSemanticRole("included role", "set of included roles", cellPlatformDomain, role);
public static final Set excludedRole = Instantiation.addSemanticRole("excluded role", "set of excluded roles", cellPlatformDomain, role);
@@ -114,7 +115,7 @@
public static final Set licenses = Instantiation.addDisjunctSemanticIdentitySet("licenses", "set of licenses", cellPlatformDomain);
public static final Set organizations = Instantiation.addDisjunctSemanticIdentitySet("organizations", "set of organizations", cellPlatformDomain);
public static final Set terminologies = Instantiation.addDisjunctSemanticIdentitySet("terminologies", "set of terminologies", cellPlatformDomain);
- public static final Set graphVisualizations = Instantiation.addDisjunctSemanticIdentitySet("graph visualizations", "set of graph visualizations", cellPlatformDomain);
+ public static final Set cellVisualizations = Instantiation.addDisjunctSemanticIdentitySet("cell visualizations", "set of cell visualizations", cellPlatformDomain);
public static final Set timeConsciousness = Instantiation.addDisjunctSemanticIdentitySet("time consciousness", "set of time consciousness", cellPlatformDomain);
@@ -129,15 +130,11 @@
public static final Set transaction_to_creationTimestamp = Instantiation.addDisjunctSemanticIdentitySet("transaction to creation timestamp", "set of transaction to creation timestamps", cellPlatformDomain);
public static final Set transaction_to_creator = Instantiation.addDisjunctSemanticIdentitySet("transaction to creator", "set of transaction to creators", cellPlatformDomain);
- public static final Set organization_to_user = Instantiation.addDisjunctSemanticIdentitySet("organization to user", "set of organizations to users", cellPlatformDomain);
+ public static final Set organization_to_members = Instantiation.addDisjunctSemanticIdentitySet("organization to member", "set of organizations to members", cellPlatformDomain);
public static final Set organization_to_roles = Instantiation.addDisjunctSemanticIdentitySet("organization to roles", "set of organizations to roles", cellPlatformDomain);
- public static final Set organization_to_subOrganizations = Instantiation.addDisjunctSemanticIdentitySet("organization to sub organizations", "set of organizations to sub organizations", cellPlatformDomain);
- public static final Set user_to_languagePreferences = Instantiation.addDisjunctSemanticIdentitySet("user to language preferences", "set of user to language preferences", cellPlatformDomain);
- public static final Set user_to_roles = Instantiation.addDisjunctSemanticIdentitySet("user to roles", "set of user to roles", cellPlatformDomain);
+ public static final Set member_to_roles = Instantiation.addDisjunctSemanticIdentitySet("member to roles", "set of member to roles", cellPlatformDomain);
public static final Set role_to_includedRoles = Instantiation.addDisjunctSemanticIdentitySet("role to included roles", "set of role to included roles", cellPlatformDomain);
public static final Set role_to_excludedRoles = Instantiation.addDisjunctSemanticIdentitySet("role to excluded roles", "set of role to excluded roles", cellPlatformDomain);
- public static final Set languagePreference_to_language = Instantiation.addDisjunctSemanticIdentitySet("language preference to language", "set of language preference to languages", cellPlatformDomain);
-
public static final Set language = Instantiation.addDisjunctSemanticIdentitySet("language", "languages", cellPlatformDomain);
public static final Set jargon = Instantiation.addDisjunctSemanticIdentitySet("jargon", "jargons", cellPlatformDomain);
66 org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/models/Organization.java
View
@@ -36,22 +36,23 @@
public class Organization {
// STRUCTURE OF MODEL REPOSITORY
- //public static final Set legalEntity = Root.cellengineering.addConcrete(SemanticDimension.who, CellPlatformDomain.legalEntity);
- //public static final Set organization = Root.cellengineering.addConcrete(SemanticDimension.who, CellPlatformDomain.organization);
- //public static final Set person = Root.cellengineering.addConcrete(SemanticDimension.who, CellPlatformDomain.person);
- private static final Set v6 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.organization, CellEngineering.semanticDimension);
+ private static final Set v4 = Instantiation.arrow(coreGraphs.visibility, Root.cellengineering, CellEngineering.organization);
+ private static final Set v6 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.organization, CellEngineering.timeConsciousness);
+ private static final Set s0 = Instantiation.arrow(coreGraphs.superSetReference, CellEngineering.organization, coreGraphs.vertex);
+ private static final Set v5 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.organization, CellEngineering.cellContent);
- public static final Set user = CellEngineering.organization.addConcrete(SemanticDimension.who, CellPlatformDomain.user);
- public static final Set role = CellEngineering.organization.addConcrete(SemanticDimension.who, CellPlatformDomain.role);
- public static final Set languagePreference = user.addConcrete(SemanticDimension.what, CellPlatformDomain.languagePreference);
- private static final Set s1 = Instantiation.arrow(coreGraphs.superSetReference, CellEngineering.organization, SemanticDimension.who);
- private static final Set s2 = Instantiation.arrow(coreGraphs.superSetReference, user, SemanticDimension.who);
- private static final Set s3 = Instantiation.arrow(coreGraphs.superSetReference, role, SemanticDimension.who);
- public static final Set user_to_roles = Instantiation.arrow(TimeConsciousness.timeConsciousEdge,
- CellPlatformDomain.user_to_roles,
- user,
- user,
+ public static final Set member = CellEngineering.organization.addConcrete(TimeConsciousness.timeConsciousVertex, CellPlatformDomain.member);
+ public static final Set role = CellEngineering.organization.addConcrete(TimeConsciousness.timeConsciousVertex, CellPlatformDomain.role);
+ private static final Set s2 = Instantiation.arrow(coreGraphs.superSetReference, member, TimeConsciousness.timeConsciousVertex);
+ private static final Set s3 = Instantiation.arrow(coreGraphs.superSetReference, role, TimeConsciousness.timeConsciousVertex);
+ private static final Set v7 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.organization, member);
+ private static final Set v8 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.organization, role);
+
+ public static final Set member_to_roles = Instantiation.arrow(TimeConsciousness.timeConsciousEdge,
+ CellPlatformDomain.member_to_roles,
+ member,
+ member,
coreSets.minCardinality_0,
coreSets.maxCardinality_n,
coreSets.isNavigable_TRUE,
@@ -62,22 +63,8 @@
coreSets.maxCardinality_n,
coreSets.isNavigable_TRUE,
coreSets.isContainer_FALSE
- );
- public static final Set organization_to_subOrganizations = Instantiation.arrow(TimeConsciousness.timeConsciousEdge,
- CellPlatformDomain.organization_to_subOrganizations,
- CellPlatformDomain.parentOrganization,
- CellEngineering.organization,
- coreSets.minCardinality_0,
- coreSets.maxCardinality_1,
- coreSets.isNavigable_TRUE,
- coreSets.isContainer_TRUE,
- CellPlatformDomain.subOrganization,
- CellEngineering.organization,
- coreSets.minCardinality_0,
- coreSets.maxCardinality_n,
- coreSets.isNavigable_TRUE,
- coreSets.isContainer_FALSE
- );
+);
+
public static final Set role_to_includedRoles = Instantiation.arrow(TimeConsciousness.timeConsciousEdge,
CellPlatformDomain.role_to_includedRoles,
CellPlatformDomain.parentRole,
@@ -108,25 +95,6 @@
coreSets.isNavigable_TRUE,
coreSets.isContainer_FALSE
);
- private static final Set v0 = Instantiation.arrow(coreGraphs.visibility, CellEngineering.organization, CellEngineering.language);
- private static final Set v1 = Instantiation.arrow(coreGraphs.visibility, user, CellEngineering.language);
- public static final Set languagePreference_to_language = Instantiation.arrow(TimeConsciousness.timeConsciousEdge,
- CellPlatformDomain.languagePreference_to_language,
- languagePreference,
- languagePreference,
- coreSets.minCardinality_0,
- coreSets.maxCardinality_n,
- coreSets.isNavigable_FALSE,
- coreSets.isContainer_FALSE,
- CellEngineering.language,
- CellEngineering.language,
- coreSets.minCardinality_1,
- coreSets.maxCardinality_1,
- coreSets.isNavigable_TRUE,
- coreSets.isContainer_FALSE
- );
-
- private static final Set v5 = Instantiation.arrow(coreGraphs.visibility, Root.cellengineering, CellEngineering.organization);
public static Set instantiateFeature() {
1  org.s23m.cell.platform/src/main/java/org/s23m/cell/platform/testfoundation/TestFoundation.java
View
@@ -25,6 +25,7 @@
package org.s23m.cell.platform.testfoundation;
+
public class TestFoundation {
public static void instantiateFeature() {
2  ...l.repository.client/src/main/java/org/s23m/cell/repository/client/mediator/RepositoryClientMediator.java
View
@@ -58,7 +58,7 @@ public RepositoryClient getComponent(final ProtocolType type)throws UnsupportedO
}
private boolean isLocallyDeployed() {
- // TODO remove the need for this system property
+ // TODO remove the need for this linearSystem property
return Boolean.valueOf(ConfigValues.getString("RepositoryClientServer.IS_LOCALLY_DEPLOYED")) ||
Boolean.valueOf(System.getProperty("S23M.development.local.database"));
}
2  org.s23m.cell.serialization/src/main/java/org/s23m/cell/serialization/serializer/SerializerFactory.java
View
@@ -37,7 +37,7 @@ public static Serializer getS23MInstanceSerializer(final SerializationType type)
if (type.equals(SerializationType.XML)) {
return new FileSystemSerializer();
} else {
- throw new UnsupportedOperationException("Non file-system serializatio is not supported yet.");
+ throw new UnsupportedOperationException("Non file-linearSystem serializatio is not supported yet.");
}
}
2  org.s23m.cell.serialization/src/main/java/org/s23m/cell/serialization/serializer/SerializerHolder.java
View
@@ -41,7 +41,7 @@ public static Serializer getS23MInstanceSerializer(final SerializationType type)
if (type.equals(SerializationType.XML)) {
return SerializerInstance.XML_SERIALIZER;
} else {
- throw new UnsupportedOperationException("Non file-system serializatio is not supported yet.");
+ throw new UnsupportedOperationException("Non file-linearSystem serializatio is not supported yet.");
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.