Core reorganize and add Mongodb dependency
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/.idea/workspace.xml b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/.idea/workspace.xml
index 4c018ae..3b16ba6 100755
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/.idea/workspace.xml
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/.idea/workspace.xml
@@ -1,12 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="56f0a5a7-f7a6-423e-8493-f43bae7d3210" name="Default Changelist" comment="Prepare STEM CI Project">
+ <list default="true" id="56f0a5a7-f7a6-423e-8493-f43bae7d3210" name="Default Changelist" comment="">
+ <change afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/model/StemProject.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.component.ts" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/app/views/modeldesigner/modeldesigner.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/views/modeldesigner/modeldesigner.component.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreCleint.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreCleint.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/scss/style.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/scss/style.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../../../stemcentral/configservice/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../stemcentral/configservice/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../../../stemcentral/discoveryservice/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../stemcentral/discoveryservice/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/modelbuilder/EclipseLoader.java" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/modelbuilder/EclipseLoader.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/modelbuilder/GreetingController.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/modelbuilder/GreetingProps.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/modelbuilder/MeinServlet.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/modelbuilder/ModelbuilderApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/modelbuilder/controllers/ModelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/modelbuilder/listeners/ApplicationEventListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/listeners/ApplicationEventListener.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path="../org.eclipse.stem.cloud.spring.ui.zip" />
@@ -37,61 +50,62 @@
<session id="1966304627">
<usages-collector id="statistics.lifecycle.project">
<counts>
- <entry key="project.closed" value="12" />
+ <entry key="project.closed" value="13" />
<entry key="project.open.time.0" value="2" />
<entry key="project.open.time.1" value="2" />
<entry key="project.open.time.10" value="1" />
<entry key="project.open.time.11" value="2" />
- <entry key="project.open.time.19" value="1" />
+ <entry key="project.open.time.19" value="2" />
<entry key="project.open.time.2" value="2" />
<entry key="project.open.time.23" value="1" />
+ <entry key="project.open.time.28" value="1" />
<entry key="project.open.time.3" value="1" />
<entry key="project.open.time.4" value="1" />
<entry key="project.open.time.6" value="1" />
<entry key="project.open.time.7" value="1" />
<entry key="project.open.time.9" value="1" />
- <entry key="project.opened" value="16" />
+ <entry key="project.opened" value="18" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CLASS" value="4" />
<entry key="CSS" value="12" />
- <entry key="HTML" value="88" />
+ <entry key="HTML" value="91" />
<entry key="IDEA_MODULE" value="1" />
<entry key="Image" value="32" />
- <entry key="JAVA" value="46" />
+ <entry key="JAVA" value="48" />
<entry key="JSON" value="90" />
<entry key="JavaScript" value="20" />
<entry key="Markdown" value="13" />
<entry key="PLAIN_TEXT" value="22" />
- <entry key="SCSS" value="80" />
+ <entry key="SCSS" value="83" />
<entry key="SVG" value="18" />
<entry key="SourceMap" value="1" />
- <entry key="TypeScript" value="256" />
+ <entry key="TypeScript" value="257" />
<entry key="XML" value="18" />
- <entry key="YAML" value="9" />
+ <entry key="YAML" value="10" />
<entry key="tsconfig" value="31" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="2" />
- <entry key="HTML" value="693" />
- <entry key="JAVA" value="580" />
+ <entry key="HTML" value="840" />
+ <entry key="JAVA" value="602" />
<entry key="JSON" value="66" />
<entry key="JavaScript" value="8" />
<entry key="PLAIN_TEXT" value="160" />
- <entry key="SCSS" value="420" />
- <entry key="TypeScript" value="1590" />
+ <entry key="SCSS" value="492" />
+ <entry key="TypeScript" value="1606" />
<entry key="XML" value="102" />
- <entry key="YAML" value="87" />
+ <entry key="YAML" value="116" />
<entry key="tsconfig" value="27" />
</counts>
</usages-collector>
<usages-collector id="statistics.js.language.service.starts">
<counts>
- <entry key="Angular2LanguageService" value="13" />
+ <entry key="Angular2LanguageService" value="15" />
</counts>
</usages-collector>
</session>
@@ -99,37 +113,46 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/ModelbuilderApplication.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="13" selection-start-line="13" selection-end-line="13" />
+ <state relative-caret-position="-52">
+ <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/SecurityConfig.java">
+ <entry file="file://$PROJECT_DIR$/src/app/views/modeldesigner/modeldesigner.component.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="480">
- <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
+ <state relative-caret-position="150">
+ <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="38" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#!!top" />
+ <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.component.ts">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="88">
- <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
+ <state relative-caret-position="255">
+ <caret line="20" column="40" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/DefaultView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreCleint.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="15" selection-start-line="15" selection-end-line="15" />
+ <state relative-caret-position="390">
+ <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -138,44 +161,54 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/index.html">
+ <entry file="file://$PROJECT_DIR$/src/app/views/theme/typography.component.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="465">
- <caret line="31" column="7" selection-start-line="31" selection-end-line="31" selection-end-column="7" />
+ <state relative-caret-position="2055">
+ <caret line="137" selection-start-line="137" selection-end-line="137" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main.ts">
+ <entry file="file://$PROJECT_DIR$/src/app/views/base/cards.component.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" column="40" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="40" />
+ <state relative-caret-position="165">
+ <caret line="11" column="21" selection-start-line="11" selection-start-column="21" selection-end-line="11" selection-end-column="21" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/styles.scss">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/scss/_custom.scss">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/scss/style.scss">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="364">
+ <caret line="97" column="18" selection-start-line="97" selection-start-column="9" selection-end-line="97" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="472">
+ <caret line="99" column="31" selection-start-line="99" selection-start-column="31" selection-end-line="99" selection-end-column="31" />
<folding>
- <element signature="e#0#47#0" expanded="true" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.module.ts">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="9" column="74" selection-start-line="9" selection-start-column="74" selection-end-line="9" selection-end-column="74" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner-routing.module.ts">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="45">
- <caret line="3" column="15" selection-start-line="3" selection-end-line="4" />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -189,15 +222,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>core/cloud/graphs</find>
- <find>graphs::::::::::::::</find>
- <find>graphs::::::::::::</find>
- <find>this.http.get</find>
- <find>Scenarios</find>
- <find>tab-pane</find>
- <find>tab-container</find>
- <find>butt</find>
- <find>Navs</find>
<find>coreui</find>
<find>@coreui/</find>
<find>foo</find>
@@ -219,6 +243,15 @@
<find>HttpClient</find>
<find>keycloak-spring-boot-starter</find>
<find>user</find>
+ <find>min</find>
+ <find>.card</find>
+ <find>border</find>
+ <find>submit</find>
+ <find>card</find>
+ <find>Align terms and descriptions horizontally by using our grid</find>
+ <find>Scenarios</find>
+ <find>tre</find>
+ <find>stemprojects</find>
</findStrings>
<replaceStrings>
<replace>client</replace>
@@ -255,8 +288,6 @@
<option value="$PROJECT_DIR$/src/app/app.module.ts" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/GreetingController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
- <option value="$PROJECT_DIR$/src/app/views/modeldesigner/modeldesigner.component.html" />
<option value="$PROJECT_DIR$/src/app/views/base/navbars/navbars.component.html" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/src/app/app.component.css" />
@@ -273,14 +304,10 @@
<option value="$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner-routing.module.ts" />
<option value="$PROJECT_DIR$/src/app/app.routing.ts" />
<option value="$PROJECT_DIR$/src/app/_nav.ts" />
- <option value="$PROJECT_DIR$/src/scss/style.scss" />
- <option value="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreCleint.java" />
<option value="$PROJECT_DIR$/src/app/views/modeldesigner/createstemform.component.html" />
<option value="$PROJECT_DIR$/src/app/views/modeldesigner/createstemform.component.ts" />
- <option value="$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.component.ts" />
<option value="$PROJECT_DIR$/src/external.html" />
<option value="$PROJECT_DIR$/src/main/resources/templates/index.html" />
- <option value="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/ModelbuilderApplication.java" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/DefaultView.java" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/SecurityConfig.java" />
@@ -288,6 +315,12 @@
<option value="$PROJECT_DIR$/src/index.html" />
<option value="$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.module.ts" />
<option value="$PROJECT_DIR$/pom.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+ <option value="$PROJECT_DIR$/src/scss/style.scss" />
+ <option value="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreCleint.java" />
+ <option value="$PROJECT_DIR$/src/app/views/modeldesigner/modeldesigner.component.html" />
+ <option value="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java" />
+ <option value="$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.component.ts" />
</list>
</option>
</component>
@@ -760,10 +793,11 @@
<path value="$PROJECT_DIR$/package.json" />
</packageJsonPaths>
</component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="y" value="143" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="-1" />
+ <option name="y" value="23" />
<option name="width" value="1920" />
- <option name="height" value="978" />
+ <option name="height" value="1098" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -771,8 +805,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
<pane id="Scope" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -804,6 +838,14 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
+ <item name="base" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="org.eclipse.stem.cloud.spring.ui" type="b2602c69:ProjectViewProjectNode" />
+ <item name="org.eclipse.stem.cloud.spring.ui" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="app" type="462c0819:PsiDirectoryNode" />
+ <item name="views" type="462c0819:PsiDirectoryNode" />
<item name="modeldesigner" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -836,6 +878,12 @@
<item name="modelbuilder" type="462c0819:PsiDirectoryNode" />
<item name="controllers" type="462c0819:PsiDirectoryNode" />
</path>
+ <path>
+ <item name="org.eclipse.stem.cloud.spring.ui" type="b2602c69:ProjectViewProjectNode" />
+ <item name="org.eclipse.stem.cloud.spring.ui" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="scss" type="462c0819:PsiDirectoryNode" />
+ </path>
</expand>
<select />
</subPane>
@@ -848,10 +896,10 @@
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
- <property name="SearchEverywhereHistoryKey" value="Webpack	null	null _nav	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/_nav.ts @CrossOrigin	PSI	JAVA://org.springframework.web.bind.annotation.CrossOrigin _	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/_variables.scss ng2-tree	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/node_modules/ng2-tree/bundles/ng2-tree.umd.js _variables	null	null variables	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/vendors/_variables.scss KeycloakBaseSpringBootConfiguration	FILE	jar:///Users/ahmadswaid/.m2/repository/org/keycloak/keycloak-spring-boot-adapter-core/9.0.0/keycloak-spring-boot-adapter-core-9.0.0.jar!/org/keycloak/adapters/springboot/KeycloakBaseSpringBootConfiguration.class app.module.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/app.module.ts karma.conf.js	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/karma.conf.js webpack config	null	null app.routing.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/app.routing.ts _varia	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/node_modules/@coreui/coreui/scss/_variables.scss modelDesigner.module.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner-routing.module.ts /modelDesigner.module.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner.module.ts dashboard.module.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/dashboard/dashboard-routing.module.ts _var	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/node_modules/@coreui/coreui/scss/_variables.scss var	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/vendors/_variables.scss navbar-height	null	null logo.svg	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/assets/img/brand/logo.svg 6.jpg	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/assets/img/avatars/6.jpg side	null	null run-script	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/node/node_modules/npm/lib/run-script.js" />
+ <property name="SearchEverywhereHistoryKey" value="typo	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/theme/typography.component.html Webpack	null	null _nav	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/_nav.ts @CrossOrigin	PSI	JAVA://org.springframework.web.bind.annotation.CrossOrigin _	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/_variables.scss ng2-tree	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/node_modules/ng2-tree/bundles/ng2-tree.umd.js _variables	null	null variables	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/vendors/_variables.scss KeycloakBaseSpringBootConfiguration	FILE	jar:///Users/ahmadswaid/.m2/repository/org/keycloak/keycloak-spring-boot-adapter-core/9.0.0/keycloak-spring-boot-adapter-core-9.0.0.jar!/org/keycloak/adapters/springboot/KeycloakBaseSpringBootConfiguration.class app.module.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/app.module.ts karma.conf.js	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/karma.conf.js webpack config	null	null app.routing.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/app.routing.ts _varia	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/node_modules/@coreui/coreui/scss/_variables.scss modelDesigner.module.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner-routing.module.ts /modelDesigner.module.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner.module.ts dashboard.module.ts	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/dashboard/dashboard-routing.module.ts _var	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/node_modules/@coreui/coreui/scss/_variables.scss var	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/vendors/_variables.scss navbar-height	null	null logo.svg	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/assets/img/brand/logo.svg 6.jpg	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/assets/img/avatars/6.jpg side	null	null run-script	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/node/node_modules/npm/lib/run-script.js" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1586878228542" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587327976689" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
@@ -860,7 +908,7 @@
<property name="project.structure.side.proportion" value="0.0" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="preferences.externalDependencies" />
- <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
+ <property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
@@ -923,7 +971,9 @@
<workItem from="1585050430422" duration="16007000" />
<workItem from="1585125797023" duration="596000" />
<workItem from="1586085672323" duration="27540000" />
- <workItem from="1586461526943" duration="69535000" />
+ <workItem from="1586461526943" duration="80521000" />
+ <workItem from="1587156418698" duration="952000" />
+ <workItem from="1587285497572" duration="8837000" />
</task>
<task id="LOCAL-00001" summary="NG Web Application extra">
<created>1584009232463</created>
@@ -981,11 +1031,18 @@
<option name="project" value="LOCAL" />
<updated>1586871295161</updated>
</task>
- <option name="localTasksCounter" value="9" />
+ <task id="LOCAL-00009" summary="test triggering the build">
+ <created>1586878287204</created>
+ <option name="number" value="00009" />
+ <option name="presentableId" value="LOCAL-00009" />
+ <option name="project" value="LOCAL" />
+ <updated>1586878287204</updated>
+ </task>
+ <option name="localTasksCounter" value="10" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="291318000" />
+ <option name="totallyTimeSpent" value="312093000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -997,10 +1054,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1920" height="1098" extended-state="6" />
- <editor active="true" />
+ <frame x="-1" y="23" width="1920" height="1098" extended-state="0" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2771855" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2835821" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Web" order="2" side_tool="true" />
<window_info id="Image Layers" order="3" />
@@ -1008,20 +1064,20 @@
<window_info id="UI Designer" order="5" />
<window_info id="Capture Tool" order="6" />
<window_info id="Favorites" order="7" side_tool="true" />
- <window_info anchor="bottom" id="Java Enterprise" order="0" weight="0.32903865" />
+ <window_info anchor="bottom" id="Java Enterprise" order="0" weight="0.32902583" />
<window_info anchor="bottom" id="Spring" order="1" weight="0.32902583" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.49946696" weight="0.29025844" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.3976143" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.39680958" />
<window_info anchor="bottom" id="Message" order="4" />
<window_info anchor="bottom" id="Find" order="5" weight="0.32902583" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32844242" />
<window_info anchor="bottom" id="Cvs" order="7" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
- <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.4989339" visible="true" weight="0.24950299" />
+ <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.4989339" visible="true" weight="0.24850895" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5010661" side_tool="true" weight="0.24950299" />
<window_info anchor="bottom" id="Version Control" order="12" show_stripe_button="false" />
- <window_info anchor="bottom" id="TypeScript" order="13" weight="0.32844242" />
+ <window_info anchor="bottom" id="TypeScript" order="13" weight="0.3300199" />
<window_info anchor="bottom" id="Messages" order="14" weight="0.32902583" />
<window_info anchor="right" id="Bean Validation" order="0" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -1033,44 +1089,8 @@
<window_info anchor="right" id="Connector for AWS Lambda" order="7" side_tool="true" />
<window_info anchor="right" id="Palette	" order="8" />
<window_info anchor="right" id="Database" order="9" weight="0.32995737" />
- <window_info anchor="right" id="Maven Projects" order="10" visible="true" weight="0.37153518" />
+ <window_info anchor="right" id="Maven Projects" order="10" weight="0.37153518" />
</layout>
- <layout-to-restore>
- <window_info content_ui="combo" id="Project" order="0" weight="0.2553305" />
- <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info id="Web" order="2" side_tool="true" />
- <window_info id="Image Layers" order="3" />
- <window_info id="Designer" order="4" />
- <window_info id="UI Designer" order="5" />
- <window_info id="Capture Tool" order="6" />
- <window_info id="Favorites" order="7" side_tool="true" />
- <window_info anchor="bottom" id="Java Enterprise" order="0" weight="0.32903865" />
- <window_info anchor="bottom" id="Spring" order="1" weight="0.32902583" />
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49946696" weight="0.29119638" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.39841986" />
- <window_info anchor="bottom" id="Message" order="4" />
- <window_info anchor="bottom" id="Find" order="5" weight="0.32903865" />
- <window_info anchor="bottom" id="TODO" order="6" weight="0.32844242" />
- <window_info anchor="bottom" id="Cvs" order="7" weight="0.25" />
- <window_info anchor="bottom" id="Inspection" order="8" weight="0.4" />
- <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
- <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.4989339" visible="true" weight="0.28329572" />
- <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5010661" side_tool="true" weight="0.24950299" />
- <window_info anchor="bottom" id="Version Control" order="12" show_stripe_button="false" />
- <window_info anchor="bottom" id="TypeScript" order="13" weight="0.32844242" />
- <window_info anchor="bottom" id="Messages" order="14" weight="0.32902583" />
- <window_info anchor="right" id="Bean Validation" order="0" />
- <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
- <window_info anchor="right" id="Commander" order="2" weight="0.4" />
- <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
- <window_info anchor="right" id="Palette" order="4" />
- <window_info anchor="right" id="Capture Analysis" order="5" />
- <window_info anchor="right" id="Theme Preview" order="6" />
- <window_info anchor="right" id="Connector for AWS Lambda" order="7" side_tool="true" />
- <window_info anchor="right" id="Palette	" order="8" />
- <window_info anchor="right" id="Database" order="9" weight="0.32995737" />
- <window_info anchor="right" id="Maven Projects" order="10" weight="0.14818764" />
- </layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
@@ -1085,37 +1105,18 @@
<MESSAGE value="Model Cloud Extension Project!" />
<MESSAGE value="fixing modelDesigner-routing.module" />
<MESSAGE value="Prepare STEM CI Project" />
- <option name="LAST_COMMIT_MESSAGE" value="Prepare STEM CI Project" />
+ <MESSAGE value="test triggering the build" />
+ <option name="LAST_COMMIT_MESSAGE" value="test triggering the build" />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/package.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="141">
- <caret line="20" column="32" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/app/app.component.css">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/scss/_variables.scss">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="125">
- <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/app/views/base/navbars/navbars.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="123">
<caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
- <folding>
- <element signature="e#0#100#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1133,44 +1134,14 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/app/modeldesigner/modeldesigner.module.ts">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="603">
- <caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/app/modeldesigner/modeldesigner-routing.module.ts">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <folding>
- <element signature="e#0#41#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/app/modeldesigner/createstemform.component.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-12088" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/app/views/base/cards.component.html">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/app/modeldesigner/createstemform.component.ts">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="15">
- <caret line="1" column="20" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="20" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/src/app/modeldesigner/modeldesigner.module.ts" />
+ <entry file="file://$PROJECT_DIR$/src/app/modeldesigner/modeldesigner-routing.module.ts" />
+ <entry file="file://$PROJECT_DIR$/src/app/modeldesigner/createstemform.component.html" />
+ <entry file="file://$PROJECT_DIR$/src/app/modeldesigner/createstemform.component.ts" />
<entry file="file://$PROJECT_DIR$/src/app/containers/model-designer-layout/model-designer-layout.component.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
- <folding>
- <element signature="e#0#41#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1208,9 +1179,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
- <folding>
- <element signature="e#0#41#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1218,28 +1186,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="64" column="17" lean-forward="true" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
- <folding>
- <element signature="e#11#58#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/app/views/modeldesigner/modeldesigner.component.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="9" column="24" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="24" />
- <folding>
- <element signature="n#style#0;n#tabset#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tab#0;n#tabset#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#ng-template#0;n#tab#0;n#tabset#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/scss/style.scss">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="573">
- <caret line="90" column="4" selection-start-line="90" selection-start-column="4" selection-end-line="90" selection-end-column="4" />
</state>
</provider>
</entry>
@@ -1268,9 +1214,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="46" column="24" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="24" />
- <folding>
- <element signature="e#0#41#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1285,19 +1228,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
- <folding>
- <element signature="e#0#40#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.component.ts">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="11" column="41" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" />
- <folding>
- <element signature="e#0#50#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1308,47 +1238,8 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/external.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="9" column="7" lean-forward="true" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreCleint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="360">
- <caret line="24" column="53" selection-start-line="24" selection-start-column="53" selection-end-line="24" selection-end-column="53" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="547">
- <caret line="89" column="3" selection-start-line="89" selection-start-column="3" selection-end-line="89" selection-end-column="3" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="12" column="20" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="20" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/external.html" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html" />
<entry file="file://$PROJECT_DIR$/npm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
@@ -1356,13 +1247,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/ModelbuilderApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="13" selection-start-line="13" selection-end-line="13" />
- </state>
- </provider>
- </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/keycloak/keycloak-spring-security-adapter/9.0.0/keycloak-spring-security-adapter-9.0.0-sources.jar!/org/keycloak/adapters/springsecurity/config/KeycloakWebSecurityConfigurerAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
@@ -1381,9 +1265,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" selection-start-line="15" selection-end-line="15" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1429,9 +1310,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="40" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="40" />
- <folding>
- <element signature="e#0#47#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1456,10 +1334,94 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/ModelbuilderApplication.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="25" selection-start-line="25" selection-end-line="25" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="615">
+ <caret line="41" selection-start-line="41" selection-end-line="41" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/app/views/theme/typography.component.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2055">
+ <caret line="137" selection-start-line="137" selection-end-line="137" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/app/views/base/cards.component.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="165">
+ <caret line="11" column="21" selection-start-line="11" selection-start-column="21" selection-end-line="11" selection-end-column="21" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/styles.scss">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/scss/_custom.scss">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/scss/style.scss">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="364">
+ <caret line="97" column="18" selection-start-line="97" selection-start-column="9" selection-end-line="97" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="88">
- <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
+ <state relative-caret-position="-52">
+ <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreCleint.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="390">
+ <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/app/views/modeldesigner/modeldesigner.component.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="38" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#!!top" />
+ <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="472">
+ <caret line="99" column="31" selection-start-line="99" selection-start-column="31" selection-end-line="99" selection-end-column="31" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/app/views/modeldesigner/modelDesigner.component.ts">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="255">
+ <caret line="20" column="40" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
</state>
</provider>
</entry>
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner.component.ts b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner.component.ts
index ccbb011..636bc29 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner.component.ts
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner.component.ts
@@ -11,6 +11,22 @@
export class ModelDesignerComponent implements OnInit {
constructor(private http: HttpClient) {
try {
+ this.http.get("core/cloud/stemprojects", {responseType: 'json'}).subscribe((data: any[]) => {
+ console.log("stemprojects", data);
+ this.stemprojects = {
+ settings: {
+ 'isCollapsedOnInit': true
+ },
+ value: 'stemprojects',
+ children: data['subDirectories']
+ };
+ });
+ }
+ catch (e) {
+ console.log(e)
+ }
+
+ try {
this.http.get("core/cloud/graphs", {responseType: 'json'}).subscribe((data: any[])=>{
console.log("graphs",data);
@@ -116,6 +132,7 @@
}
}
+ public stemprojects: TreeModel;
public Scenarios: TreeModel;
public models: TreeModel;
public graph: TreeModel;
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modeldesigner.component.html b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modeldesigner.component.html
index c38a57a..08a9d86 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modeldesigner.component.html
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modeldesigner.component.html
@@ -1,70 +1,109 @@
-<div style="height: 100%">
- <div class="row" style="height: 60%">
+<div class="container-fluid " style="height: 90% ;">
+ <div class="row" style="height: 100%">
+ <div class="col-sm-2" >
+ <div class="card" style="height: 110%">
+ <div class="card-header">
+ STEM Projects
+ </div>
+ <div class="card-body">
- <div class="col-md-3 mb-3" style="height: 100%">
- <tabset style="height: 100%">
- <tab style="height: 100%">
- <ng-template tabHeading style="height: 100%"><i class="icon-list"></i> Project Explorer </ng-template>
- </tab>
- </tabset>
- </div><!--/.col-->
- <div class="col-md-9 mb-9" style="height: 100%">
+ <div class="pre-scrollable">
+ <tree [tree]="stemprojects"></tree>
+ </div>
+ </div>
+ </div>
- </div><!--/.col-->
+ </div>
+
+ <div class="col-sm-10" style="height: 105%">
+ <div class="card" style="height: 67%">
+ <div class="card-header">
+ Content
+ </div>
+ <div class="card-body">
+
+ <div class="bd-example">
+ <dl class="row">
+ <dt class="col-sm-3">Description lists</dt>
+ <dd class="col-sm-9">A description list is perfect for defining terms.</dd>
+
+ <dt class="col-sm-3">Euismod</dt>
+ <dd class="col-sm-9">
+ <p>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</p>
+ <p>Donec id elit non mi porta gravida at eget metus.</p>
+ </dd>
+
+ <dt class="col-sm-3">Malesuada porta</dt>
+ <dd class="col-sm-9">Etiam porta sem malesuada magna mollis euismod.</dd>
+
+ <dt class="col-sm-3 text-truncate">Truncated term is truncated</dt>
+ <dd class="col-sm-9">Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd>
+
+ <dt class="col-sm-3">Nesting</dt>
+ <dd class="col-sm-9">
+ <dl class="row">
+ <dt class="col-sm-4">Nested definition list</dt>
+ <dd class="col-sm-8">Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc.</dd>
+ </dl>
+ </dd>
+ </dl>
+ </div>
+ </div>
+ </div>
+ <div class="card" style="height: 40%">
+
+ <div class="col-md-12 mb-12" style="height: 100%">
+ <!-- Nav tabs -->
+ <tabset>
+ <tab>
+ <ng-template tabHeading><i class="icon-list"></i> Scenarios </ng-template>
+ <div class="pre-scrollable">
+ <tree [tree]="Scenarios"></tree>
+ </div>
+ </tab>
+ <tab>
+ <ng-template tabHeading><i class="icon-calculator"></i> Models </ng-template>
+ <div class="pre-scrollable">
+ <tree [tree]="models"></tree>
+ </div>
+ </tab>
+ <tab>
+ <ng-template tabHeading><i class="icon-pie-chart"></i> Graphs</ng-template>
+ <div class="pre-scrollable">
+ <tree [tree]="graph"></tree>
+ </div>
+ </tab>
+ <tab>
+ <ng-template tabHeading><i class="icon-list"></i> Predicate </ng-template>
+ <div class="pre-scrollable">
+ <tree [tree]="predicate"></tree>
+ </div>
+ </tab>
+ <tab>
+ <ng-template tabHeading><i class="icon-calculator"></i> Sequencer </ng-template>
+ <div class="pre-scrollable">
+ <tree [tree]="sequencer"></tree>
+ </div>
+ </tab>
+ <tab>
+ <ng-template tabHeading><i class="icon-pie-chart"></i> Triggers</ng-template>
+ <div class="pre-scrollable">
+ <tree [tree]="triggers"></tree>
+ </div>
+ </tab>
+ <tab>
+ <ng-template tabHeading><i class="icon-pie-chart"></i> Experiments</ng-template>
+ <div class="pre-scrollable">
+ <tree [tree]="experiments"></tree>
+ </div>
+ </tab>
+
+ </tabset>
+ </div><!--/.col-->
+ </div>
+ </div>
</div>
- <!--/.row-->
- <!--/.row-->
- <div class="row" style="height: 40%">
-
- <div class="col-md-12 mb-12" style="height: 100%">
- <!-- Nav tabs -->
- <tabset>
- <tab>
- <ng-template tabHeading><i class="icon-list"></i> Scenarios </ng-template>
- <div class="pre-scrollable">
- <tree [tree]="Scenarios"></tree>
- </div>
- </tab>
- <tab>
- <ng-template tabHeading><i class="icon-calculator"></i> Models </ng-template>
- <div class="pre-scrollable">
- <tree [tree]="models"></tree>
- </div>
- </tab>
- <tab>
- <ng-template tabHeading><i class="icon-pie-chart"></i> Graphs</ng-template>
- <div class="pre-scrollable">
- <tree [tree]="graph"></tree>
- </div>
- </tab>
- <tab>
- <ng-template tabHeading><i class="icon-list"></i> Predicate </ng-template>
- <div class="pre-scrollable">
- <tree [tree]="predicate"></tree>
- </div>
- </tab>
- <tab>
- <ng-template tabHeading><i class="icon-calculator"></i> Sequencer </ng-template>
- <div class="pre-scrollable">
- <tree [tree]="sequencer"></tree>
- </div>
- </tab>
- <tab>
- <ng-template tabHeading><i class="icon-pie-chart"></i> Triggers</ng-template>
- <div class="pre-scrollable">
- <tree [tree]="triggers"></tree>
- </div>
- </tab>
- <tab>
- <ng-template tabHeading><i class="icon-pie-chart"></i> Experiments</ng-template>
- <div class="pre-scrollable">
- <tree [tree]="experiments"></tree>
- </div>
- </tab>
-
- </tabset>
- </div><!--/.col-->
- </div>
- <!--/.row-->
</div>
+
+
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/ModelController.java b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/ModelController.java
index 2655b1f..7254254 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/ModelController.java
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/ModelController.java
@@ -1,17 +1,20 @@
package modelbuilder.controllers;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
import reactor.core.publisher.Mono;
@RestController
@CrossOrigin(origins="*")
public class ModelController {
+ @Value("${eureka.instance.instance-id}")
+ private String instanceId;
+
private StemCoreCleint client;
@Autowired
@@ -71,6 +74,15 @@
.header(responseHeaderKey, responseHeaderValue)
.body(client.getTrigger()));
}
+ @GetMapping(value = "/core/cloud/newproject", produces = "application/json")
+ public Mono<ResponseEntity<String>> newproject(@RequestParam("name") String name) {
+ String responseHeaderKey = "Baeldung-Example-Header";
+ String responseHeaderValue = "Value-ResponseEntityBuilder";
+ return Mono.just(ResponseEntity.ok()
+ .header(responseHeaderKey, responseHeaderValue)
+ .body(client.newproject(name)));
+ }
+
@GetMapping(value = "/core/cloud/experiments", produces = "application/json")
public Mono<ResponseEntity<String>> scanExperiments() {
String responseHeaderKey = "Baeldung-Example-Header";
@@ -79,13 +91,18 @@
.header(responseHeaderKey, responseHeaderValue)
.body(client.getExperiments()));
}
-
- @GetMapping(value = "/core/cloud/newproject", produces = "application/json")
- public Mono<ResponseEntity<String>> newproject(@RequestParam("name") String name) {
+ @GetMapping(value = "/core/cloud/stemprojects", produces = "application/json")
+ public Mono<ResponseEntity<String>> stemprojects() {
String responseHeaderKey = "Baeldung-Example-Header";
String responseHeaderValue = "Value-ResponseEntityBuilder";
return Mono.just(ResponseEntity.ok()
.header(responseHeaderKey, responseHeaderValue)
- .body(client.newproject(name)));
+ .body(client.stemprojects()));
+ }
+
+
+ @GetMapping("/instanceId")
+ public String getHelloWordObject() {
+ return "Instance id: " + instanceId;
}
}
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/StemCoreCleint.java b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/StemCoreCleint.java
index e7e03a3..36e85d3 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/StemCoreCleint.java
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/StemCoreCleint.java
@@ -23,4 +23,6 @@
String getExperiments();
@GetMapping("/core/cloud/newproject")
String newproject(@RequestParam("name") String name);
+ @GetMapping("/core/cloud/stemprojects")
+ String stemprojects();
}
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/resources/application.yml b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/resources/application.yml
index 393e72e..743552f 100755
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/resources/application.yml
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/main/resources/application.yml
@@ -14,6 +14,8 @@
public-client: true
+
+
management:
endpoints:
web:
@@ -37,3 +39,4 @@
springframework:
security: DEBUG
+
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/style.scss b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/style.scss
index 7559694..992c126 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/style.scss
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring.ui/src/scss/style.scss
@@ -52,7 +52,6 @@
.tab-pane {
padding: $spacer;
height: 100%;
- min-height: 300px;
}
}
@@ -89,8 +88,27 @@
}
.btn {
- margin-left:20px; }
+ margin-left:20px;
+}
+.main .container-fluid {
+ padding: 0 10px;
+}
+.sidenav{
+ color: aliceblue;
+ padding: 0px;
+ background-color: #191919;
+
+}
+.card{
+ background: rgb(27,26,35) ;
+ color: white;
+ border: white;
+
+}
+.contentPage{
+ color: aliceblue;
+}
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/.idea/workspace.xml b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/.idea/workspace.xml
index cb30a78..9a92a28 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/.idea/workspace.xml
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/.idea/workspace.xml
@@ -3,10 +3,18 @@
<component name="ChangeListManager">
<list default="true" id="25007212-7393-46fd-859a-5d3b717ea36d" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modelDesigner.component.ts" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modeldesigner.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/app/views/modeldesigner/modeldesigner.component.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/ModelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/ModelController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/StemCoreCleint.java" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/main/java/modelbuilder/controllers/StemCoreCleint.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/main/resources/application.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/scss/style.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../org.eclipse.stem.cloud.spring.ui/src/scss/style.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../../../stemcentral/configservice/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../stemcentral/configservice/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../../../stemcentral/discoveryservice/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../stemcentral/discoveryservice/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/model/StemProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/model/StemProject.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -19,25 +27,26 @@
<session id="-1460303482">
<usages-collector id="statistics.lifecycle.project">
<counts>
- <entry key="project.closed" value="2" />
+ <entry key="project.closed" value="3" />
<entry key="project.open.time.0" value="1" />
<entry key="project.open.time.1" value="1" />
- <entry key="project.open.time.11" value="1" />
- <entry key="project.opened" value="3" />
+ <entry key="project.open.time.11" value="2" />
+ <entry key="project.open.time.19" value="1" />
+ <entry key="project.opened" value="5" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
- <entry key="JAVA" value="24" />
- <entry key="XML" value="3" />
- <entry key="YAML" value="2" />
+ <entry key="JAVA" value="40" />
+ <entry key="XML" value="5" />
+ <entry key="YAML" value="3" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
- <entry key="JAVA" value="899" />
+ <entry key="JAVA" value="1496" />
<entry key="PLAIN_TEXT" value="14" />
- <entry key="XML" value="10" />
+ <entry key="XML" value="19" />
<entry key="YAML" value="21" />
</counts>
</usages-collector>
@@ -46,55 +55,28 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/GreetingController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="30" column="2" selection-start-line="30" selection-start-column="2" selection-end-line="30" selection-end-column="2" />
+ <state relative-caret-position="120">
+ <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/EclipseLoader.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="13" column="66" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="66" />
+ <state relative-caret-position="369">
+ <caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.3.RELEASE/spring-web-5.2.3.RELEASE-sources.jar!/org/springframework/web/bind/annotation/GetMapping.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/model/StemProject.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="600">
- <caret line="60" column="43" selection-start-line="60" selection-start-column="39" selection-end-line="60" selection-end-column="43" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/ModelbuilderApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="28" selection-start-line="28" selection-end-line="28" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="405">
- <caret line="27" selection-start-line="27" selection-end-line="27" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/listeners/ApplicationEventListener.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="12" selection-start-line="12" selection-end-line="12" />
+ <state relative-caret-position="240">
+ <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -103,10 +85,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="241">
- <caret line="64" column="56" selection-start-line="64" selection-start-column="56" selection-end-line="64" selection-end-column="56" />
+ <state relative-caret-position="135">
+ <caret line="9" column="38" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -115,10 +97,23 @@
</entry>
</file>
<file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="300">
- <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+ <state relative-caret-position="240">
+ <caret line="25" column="28" lean-forward="true" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
+ <folding>
+ <element signature="e#4131#4132#0" expanded="true" />
+ <element signature="e#4176#4177#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.2.4.RELEASE/spring-data-mongodb-2.2.4.RELEASE-sources.jar!/org/springframework/data/mongodb/repository/MongoRepository.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="329">
+ <caret line="49" column="12" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
</state>
</provider>
</entry>
@@ -128,8 +123,8 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
- <option value="Interface" />
<option value="Class" />
+ <option value="Interface" />
</list>
</option>
</component>
@@ -147,6 +142,11 @@
<find>godproject</find>
<find>?????</find>
<find>projectName</find>
+ <find>mang</find>
+ <find>mongo</find>
+ <find>core/cloud</find>
+ <find>save</find>
+ <find>mon</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -158,13 +158,19 @@
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/GreetingController.java" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreCleint.java" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreserverPoint.java" />
- <option value="$PROJECT_DIR$/src/main/java/modelbuilder/EclipseLoader.java" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/StemCoreServerPoint.java" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/listeners/ApplicationEventListener.java" />
- <option value="$PROJECT_DIR$/src/main/java/modelbuilder/ModelbuilderApplication.java" />
<option value="$PROJECT_DIR$/src/main/resources/application.yml" />
<option value="$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/modelbuilder/EclipseLoader.java" />
+ <option value="$PROJECT_DIR$/src/main/java/model/StemProject.java" />
+ <option value="$PROJECT_DIR$/src/main/java/controller/ModelController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/modelbuilder/ModelbuilderApplication.java" />
+ <option value="$PROJECT_DIR$/src/main/java/ModelbuilderApplication.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/model/StemProject.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java" />
<option value="$PROJECT_DIR$/pom.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java" />
</list>
</option>
</component>
@@ -202,7 +208,8 @@
<select />
</treeState>
</component>
- <component name="ProjectFrameBounds">
+ <component name="ProjectFrameBounds" extendedState="6">
+ <option name="x" value="-1" />
<option name="y" value="23" />
<option name="width" value="1920" />
<option name="height" value="1098" />
@@ -213,7 +220,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -245,7 +252,7 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="modelbuilder" type="462c0819:PsiDirectoryNode" />
+ <item name="cloud" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="org.eclipse.stem.cloud.spring" type="b2602c69:ProjectViewProjectNode" />
@@ -253,8 +260,17 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="modelbuilder" type="462c0819:PsiDirectoryNode" />
- <item name="controllers" type="462c0819:PsiDirectoryNode" />
+ <item name="cloud" type="462c0819:PsiDirectoryNode" />
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="org.eclipse.stem.cloud.spring" type="b2602c69:ProjectViewProjectNode" />
+ <item name="org.eclipse.stem.cloud.spring" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="cloud" type="462c0819:PsiDirectoryNode" />
+ <item name="model" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="org.eclipse.stem.cloud.spring" type="b2602c69:ProjectViewProjectNode" />
@@ -273,7 +289,7 @@
<select />
</subPane>
</pane>
- <pane id="Scope" />
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -281,15 +297,20 @@
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
- <property name="SearchEverywhereHistoryKey" value="Test	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/test" />
+ <property name="SearchEverywhereHistoryKey" value="lombok 	ACTION	LombokActionGroup Test	FILE	file:///Users/ahmadswaid/git/org.eclipse.stem/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/test" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1586878228571" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587327976738" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="preferences.externalDependencies" />
</component>
+ <component name="RecentsManager">
+ <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="" />
+ </key>
+ </component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
@@ -305,7 +326,7 @@
<component name="RunManager">
<configuration name="ModelbuilderApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="org.eclipse.stem.cloud.spring" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="modelbuilder.ModelbuilderApplication" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="org.eclipse.stem.cloud.ModelbuilderApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -323,18 +344,19 @@
<updated>1586012917494</updated>
<workItem from="1586012918782" duration="25544000" />
<workItem from="1586085735312" duration="32975000" />
- <workItem from="1586461527982" duration="23344000" />
+ <workItem from="1586461527982" duration="23931000" />
+ <workItem from="1587156418702" duration="7982000" />
+ <workItem from="1587285506847" duration="12568000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="81863000" />
+ <option name="totallyTimeSpent" value="103000000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1920" height="1098" extended-state="0" />
- <editor active="true" />
+ <frame x="0" y="23" width="1920" height="1098" extended-state="6" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2553305" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26066098" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@@ -343,9 +365,9 @@
<window_info id="Capture Tool" order="6" />
<window_info id="Web" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
- <window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" weight="0.25646123" />
- <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.39860836" />
+ <window_info anchor="bottom" id="Find" order="1" weight="0.32902583" />
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.25646123" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.39860836" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
@@ -375,18 +397,6 @@
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
- <component name="XDebuggerManager">
- <breakpoint-manager>
- <breakpoints>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java</url>
- <line>55</line>
- <properties />
- <option name="timeStamp" value="1" />
- </line-breakpoint>
- </breakpoints>
- </breakpoint-manager>
- </component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
@@ -395,13 +405,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/MeinServlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
- </state>
- </provider>
- </entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/netflix/eureka/eureka-client/1.9.13/eureka-client-1.9.13-sources.jar!/com/netflix/appinfo/InstanceInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
@@ -441,17 +444,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/GreetingController.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/com/netflix/eureka/eureka-core/1.9.13/eureka-core-1.9.13-sources.jar!/com/netflix/eureka/resources/ServerInfoResource.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="30" column="2" selection-start-line="30" selection-start-column="2" selection-end-line="30" selection-end-column="2" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/EclipseLoader.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="13" column="66" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="66" />
+ <state relative-caret-position="120">
+ <caret line="19" column="18" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="18" />
</state>
</provider>
</entry>
@@ -462,38 +458,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="405">
- <caret line="27" selection-start-line="27" selection-end-line="27" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/netflix/eureka/eureka-core/1.9.13/eureka-core-1.9.13-sources.jar!/com/netflix/eureka/resources/ServerInfoResource.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
- <caret line="19" column="18" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="18" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/controllers/ModelController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="241">
- <caret line="64" column="56" selection-start-line="64" selection-start-column="56" selection-end-line="64" selection-end-column="56" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/ModelbuilderApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="28" selection-start-line="28" selection-end-line="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/listeners/ApplicationEventListener.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/listeners/ApplicationEventListener.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="12" selection-start-line="12" selection-end-line="12" />
@@ -503,10 +468,93 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/GreetingController.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/GreetingProps.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/modelbuilder/MeinServlet.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/modelbuilder/EclipseLoader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="255">
+ <caret line="19" column="45" lean-forward="true" selection-start-line="19" selection-start-column="45" selection-end-line="19" selection-end-column="45" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="30">
+ <caret line="2" column="26" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="26" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.3.RELEASE/spring-web-5.2.3.RELEASE-sources.jar!/org/springframework/web/bind/annotation/RestController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="392">
+ <caret line="49" column="18" selection-start-line="49" selection-start-column="18" selection-end-line="49" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="120">
+ <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.4.RELEASE/spring-data-commons-2.2.4.RELEASE-sources.jar!/org/springframework/data/repository/CrudRepository.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="180">
+ <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.4.RELEASE/spring-data-commons-2.2.4.RELEASE-sources.jar!/org/springframework/data/repository/PagingAndSortingRepository.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="31" column="62" lean-forward="true" selection-start-line="31" selection-start-column="62" selection-end-line="31" selection-end-column="62" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="135">
+ <caret line="9" column="38" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="38" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/model/StemProject.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="300">
- <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+ <state relative-caret-position="369">
+ <caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.2.4.RELEASE/spring-data-mongodb-2.2.4.RELEASE-sources.jar!/org/springframework/data/mongodb/repository/MongoRepository.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="329">
+ <caret line="49" column="12" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="25" column="28" lean-forward="true" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
+ <folding>
+ <element signature="e#4131#4132#0" expanded="true" />
+ <element signature="e#4176#4177#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/pom.xml b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/pom.xml
index 93f6dda..1ed8b86 100755
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/pom.xml
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/pom.xml
@@ -51,10 +51,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
@@ -65,14 +66,20 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-cassandra</artifactId>
+ <artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.12</version>
</dependency>
<dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.stem.tycho</groupId>
<artifactId>org.eclipse.stem.core</artifactId>
<version>3.0.0-SNAPSHOT</version>
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java
index 2a4a21c..f2b30a7 100755
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/ModelbuilderApplication.java
@@ -1,3 +1,5 @@
+package org.eclipse.stem.cloud;
+
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java
index b516dbd..f15c16e 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/controller/ModelController.java
@@ -1,5 +1,6 @@
package org.eclipse.stem.cloud.controller;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.netflix.appinfo.InstanceInfo;
import com.netflix.discovery.EurekaClient;
import org.apache.http.HttpEntity;
@@ -7,6 +8,8 @@
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
+import org.eclipse.stem.cloud.model.StemProject;
+import org.eclipse.stem.cloud.repository.StemProjectRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
@@ -21,6 +24,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.util.List;
@RestController
public class ModelController {
@@ -31,6 +35,9 @@
@Autowired
RestTemplate restTemplate;
+ @Autowired
+ StemProjectRepository stemProjectRepo;
+
@Value("${spring.application.name}")
private String appName;
@@ -71,13 +78,40 @@
public void scanExperiments(OutputStream out) throws IOException {
coreCall("engine/cloud/models?treetype=experiments",out);
}
+ @GetMapping(value = "/core/cloud/stemprojects", produces = "application/json")
+ @ResponseStatus(value = HttpStatus.OK)
+ public void stemprojects(OutputStream out) throws IOException {
+ List<StemProject> stemProject= stemProjectRepo.findAll();
+ String response = valueAsString(stemProject);
+ out.write(response.getBytes());
+ out.flush();
+ }
@GetMapping(value = "/core/cloud/newproject", produces = "application/json")
@ResponseStatus(value = HttpStatus.OK)
public void newproject(OutputStream out, @RequestParam("name") String name) throws IOException {
+ StemProject project = new StemProject();
+ project.setUserName("Ahmad");
+ String dirs[] = {"Models","Scenarios","Sequences"};
+ project.setSubDirectories(dirs);
+ stemProjectRepo.save(project);
coreCall("engine/cloud/models?treetype=newproject&projectName="+name,out);
}
+ public String valueAsString(Object object) {
+ // Creating Object of ObjectMapper define in Jakson Api
+ ObjectMapper Obj = new ObjectMapper();
+ String jsonStr = "";
+ try {
+ // get Oraganisation object as a json string
+ jsonStr = Obj.writeValueAsString(object);
+ }
+
+ catch (IOException e) {
+ e.printStackTrace();
+ }
+ return jsonStr;
+ }
private String serverIPAddr(){
eurekaClient.getApplication(appName).shuffleAndStoreInstances(true);
InstanceInfo instance = eurekaClient.getApplication(appName).getInstances().get(0);
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/model/StemProject.java b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/model/StemProject.java
index 3aa6c00..c6d5b06 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/model/StemProject.java
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/model/StemProject.java
@@ -9,12 +9,12 @@
@Data
@RequiredArgsConstructor
-@Document
+@Document(collection="StemProjects")
public class StemProject {
@Id
private String id;
private String name;
- private String owner;
+ private String userName;
private boolean common;
private String[] subDirectories;
diff --git a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java
index a5e861c..ff16b6d 100644
--- a/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java
+++ b/org.eclipse.stem/releng/org.eclipse.stem.cloud.spring/src/main/java/org/eclipse/stem/cloud/repository/StemProjectRepository.java
@@ -1,4 +1,12 @@
package org.eclipse.stem.cloud.repository;
-public interface StemProjectRepository {
+import org.eclipse.stem.cloud.model.StemProject;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.web.bind.annotation.CrossOrigin;
+
+import java.util.List;
+
+@CrossOrigin(origins="*")
+public interface StemProjectRepository extends MongoRepository<StemProject,String> {
+ //List<StemProject> findAllStemProjectByUserName(String userName);
}
