diff options
| -rw-r--r-- | .idea/workspace.xml | 103 | ||||
| -rw-r--r-- | deliveries/os_settings.sh | 2 |
2 files changed, 64 insertions, 41 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 25a0f081..d60d8f17 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="9f8fedf4-4e3c-46d3-845e-c0f9aba359d6" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_docker_push.sh" afterPath="$PROJECT_DIR$/deliveries/os_docker_push.sh" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_docker_release.sh" afterPath="$PROJECT_DIR$/deliveries/os_docker_release.sh" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/deliveries/os_settings.sh" afterPath="$PROJECT_DIR$/deliveries/os_settings.sh" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -34,7 +33,7 @@ <file leaf-file-name="os_build_febe.sh" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="565"> + <state relative-caret-position="688"> <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> <folding /> </state> @@ -45,13 +44,13 @@ <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="136"> - <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> + <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="os_docker_release.sh" pinned="false" current-in-tab="true"> + <file leaf-file-name="os_docker_release.sh" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="425"> @@ -74,18 +73,18 @@ <file leaf-file-name="os_Dockerfile" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/deliveries/os_Dockerfile"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <state relative-caret-position="-306"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="os_settings.sh" pinned="false" current-in-tab="false"> + <file leaf-file-name="os_settings.sh" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="153"> + <caret line="9" column="83" lean-forward="false" selection-start-line="9" selection-start-column="83" selection-end-line="9" selection-end-column="83" /> <folding /> </state> </provider> @@ -149,14 +148,15 @@ <option value="$PROJECT_DIR$/deliveries/os_build_febe.sh" /> <option value="$PROJECT_DIR$/deliveries/os_docker_push.sh" /> <option value="$PROJECT_DIR$/deliveries/os_docker_release.sh" /> + <option value="$PROJECT_DIR$/deliveries/os_settings.sh" /> </list> </option> </component> <component name="ProjectFrameBounds"> <option name="x" value="-8" /> <option name="y" value="-8" /> - <option name="width" value="1616" /> - <option name="height" value="1176" /> + <option name="width" value="1936" /> + <option name="height" value="1056" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> @@ -495,8 +495,8 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1616" height="1176" extended-state="6" /> - <editor active="true" /> + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> + <editor active="false" /> <layout> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> @@ -510,10 +510,10 @@ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25790986" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29144096" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3206941" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26599148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="BPMNPalette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -541,6 +541,30 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="221"> + <caret line="13" column="89" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="89" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="136"> + <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="425"> + <caret line="25" column="24" lean-forward="true" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/deliveries/configure-and-run.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="17"> @@ -845,7 +869,7 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_Dockerfile"> + <entry file="file://$PROJECT_DIR$/deliveries/createMaria.sh"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> @@ -853,67 +877,66 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> + <entry file="file://$PROJECT_DIR$/project.config" /> + <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="68"> + <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/createMaria.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/Apps_Users_OnBoarding_Script.sql"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/project.config" /> - <entry file="file://$PROJECT_DIR$/deliveries/run.sh"> + <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="68"> - <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> + <state relative-caret-position="221"> + <caret line="13" column="89" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="89" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="565"> - <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> + <state relative-caret-position="136"> + <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/Apps_Users_OnBoarding_Script.sql"> + <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="425"> + <caret line="25" column="24" lean-forward="false" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/ecomp-portal-FE/pom.xml"> + <entry file="file://$PROJECT_DIR$/deliveries/os_Dockerfile"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="221"> - <caret line="13" column="89" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="89" /> + <state relative-caret-position="-306"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_docker_push.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/os_build_febe.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="136"> - <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> + <state relative-caret-position="688"> + <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/deliveries/os_docker_release.sh"> + <entry file="file://$PROJECT_DIR$/deliveries/os_settings.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="425"> - <caret line="25" column="24" lean-forward="false" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" /> + <state relative-caret-position="153"> + <caret line="9" column="83" lean-forward="false" selection-start-line="9" selection-start-column="83" selection-end-line="9" selection-end-column="83" /> <folding /> </state> </provider> diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh index 86f7f9d2..081d9c64 100644 --- a/deliveries/os_settings.sh +++ b/deliveries/os_settings.sh @@ -7,5 +7,5 @@ FE_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-FE SCRIPT_DIR="PROJECT/Source/ecomp-portal-core/ecomp-portal-BE/ecomp-portal-resources/sql scripts" SDK_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/sdk-app/db-scripts DBC_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/db-scripts -PORTAL_SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/sdk-app/target/ep-sdk-app-* +PORTAL_SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/sdk-app/target/ep-sdk-app PORTAL_DBC_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/target/ep-dbc-app |