Skip to content
Snippets Groups Projects
Commit 78cfd17e authored by Adam Laskowski's avatar Adam Laskowski
Browse files

ssdm-13365: Renamed openbis_ng_ui to ui-admin

parent 94ab0d6a
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Showing
with 11 additions and 11 deletions
...@@ -87,7 +87,7 @@ option for cross-compilation". ...@@ -87,7 +87,7 @@ option for cross-compilation".
1. run openBISDevelopementEnvironmentASPrepare gradle task 1. run openBISDevelopementEnvironmentASPrepare gradle task
2. run openBISDevelopementEnvironmentASStart gradle task 2. run openBISDevelopementEnvironmentASStart gradle task
3. In command line do: 3. In command line do:
1. cd /<OPENBIS_PROJECT_ROOT>/openbis_ng_ui 1. cd /<OPENBIS_PROJECT_ROOT>/ui-admin
2. npm install 2. npm install
3. npm run dev 3. npm run dev
4. Open in your chosen browser a url, by default: http://localhost:8124/ng-ui-path 4. Open in your chosen browser a url, by default: http://localhost:8124/ng-ui-path
......
includeFlat 'lib-commonbase', 'lib-common', includeFlat 'lib-commonbase', 'lib-common',
'api-openbis-java', 'lib-openbis-common', 'lib-authentication', 'lib-dbmigration', 'server-application-server', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication', 'lib-dbmigration', 'server-application-server',
'server-original-data-store', 'server-screening', 'openbis_standard_technologies', 'server-external-data-store', 'server-original-data-store', 'server-screening', 'openbis_standard_technologies', 'server-external-data-store',
'openbis_ng_ui', 'lib-microservice-server' 'ui-admin', 'lib-microservice-server'
includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication', 'lib-dbmigration', 'server-application-server', includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication', 'lib-dbmigration', 'server-application-server',
'server-original-data-store', 'server-screening', 'openbis_standard_technologies', 'app-openbis-installer', 'server-original-data-store', 'server-screening', 'openbis_standard_technologies', 'app-openbis-installer',
'lib-image-readers', 'test-ui-core', 'test-api-openbis-javascript', 'server-external-data-store', 'openbis_ng_ui', 'lib-image-readers', 'test-ui-core', 'test-api-openbis-javascript', 'server-external-data-store', 'ui-admin',
'lib-microservice-server' 'lib-microservice-server'
\ No newline at end of file
...@@ -38,7 +38,7 @@ evaluationDependsOn(':server-application-server') ...@@ -38,7 +38,7 @@ evaluationDependsOn(':server-application-server')
evaluationDependsOn(':server-original-data-store') evaluationDependsOn(':server-original-data-store')
evaluationDependsOn(':server-screening') evaluationDependsOn(':server-screening')
evaluationDependsOn(':server-external-data-store') evaluationDependsOn(':server-external-data-store')
evaluationDependsOn(':openbis_ng_ui') evaluationDependsOn(':ui-admin')
apply from: '../build/javaproject.gradle' apply from: '../build/javaproject.gradle'
...@@ -498,8 +498,8 @@ task deleteOpenbisNgUi(type: Delete) { ...@@ -498,8 +498,8 @@ task deleteOpenbisNgUi(type: Delete) {
delete 'dist/core-plugins/openbis-ng-ui' delete 'dist/core-plugins/openbis-ng-ui'
} }
task copyOpenbisNgUiToCorePlugins(type: Copy, dependsOn: [deleteOpenbisNgUi, ':openbis_ng_ui:copyWebApp']) { task copyOpenbisNgUiToCorePlugins(type: Copy, dependsOn: [deleteOpenbisNgUi, ':ui-admin:copyWebApp']) {
from project(':openbis_ng_ui').file('build/core-plugins') from project(':ui-admin').file('build/core-plugins')
into file('dist/core-plugins') into file('dist/core-plugins')
} }
......
includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication', 'lib-dbmigration', 'server-application-server', includeFlat 'lib-commonbase', 'lib-common', 'api-openbis-java', 'lib-openbis-common', 'lib-authentication', 'lib-dbmigration', 'server-application-server',
'server-original-data-store', 'server-screening', 'server-external-data-store', 'server-original-data-store', 'server-screening', 'server-external-data-store',
'openbis_ng_ui', 'lib-microservice-server' 'ui-admin', 'lib-microservice-server'
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
sudo /usr/sbin/VBoxService --timesync-set-start sudo /usr/sbin/VBoxService --timesync-set-start
sudo mount --bind /home/vagrant/openbis-build /home/vagrant/openbis/openbis_ng_ui/node sudo mount --bind /home/vagrant/openbis-build /home/vagrant/openbis/ui-admin/node
sudo mount --bind /home/vagrant/openbis-build/node_modules /home/vagrant/openbis/openbis_ng_ui/node_modules sudo mount --bind /home/vagrant/openbis-build/node_modules /home/vagrant/openbis/ui-admin/node_modules
cd openbis/openbis_ng_ui cd openbis/ui-admin
./gradlew --gradle-user-home /home/vagrant/openbis-build --project-cache-dir /home/vagrant/openbis-build npmSetup ./gradlew --gradle-user-home /home/vagrant/openbis-build --project-cache-dir /home/vagrant/openbis-build npmSetup
export PATH=$PATH:/home/vagrant/openbis-build/nodejs/node-v10.1.0-linux-x64/bin export PATH=$PATH:/home/vagrant/openbis-build/nodejs/node-v10.1.0-linux-x64/bin
node /home/vagrant/openbis-build/nodejs/node-v10.1.0-linux-x64/bin/npm install node /home/vagrant/openbis-build/nodejs/node-v10.1.0-linux-x64/bin/npm install
cd cd
screen -S dev -t webpack -Adm bash -c "cd openbis/openbis_ng_ui; export PATH=$PATH:/home/vagrant/openbis-build/nodejs/node-v10.1.0-linux-x64/bin; node /home/vagrant/openbis-build/nodejs/node-v10.1.0-linux-x64/bin/npm run dev; bash" screen -S dev -t webpack -Adm bash -c "cd openbis/ui-admin; export PATH=$PATH:/home/vagrant/openbis-build/nodejs/node-v10.1.0-linux-x64/bin; node /home/vagrant/openbis-build/nodejs/node-v10.1.0-linux-x64/bin/npm run dev; bash"
echo "Waiting Webpack to launch on 8124..." echo "Waiting Webpack to launch on 8124..."
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment