From 0497dbb488c7b2b33b7fc30012cc5f067e8e52b1 Mon Sep 17 00:00:00 2001 From: mchyzer Date: Mon, 25 May 2020 21:55:37 -0400 Subject: [PATCH] remove bundle --- .../container_files/seed-data/bootstrap.gsh | 1 - .../container_files/seed-data/bootstrap.gsh | 1 - .../container_files/seed-data/bootstrap.gsh | 1 - full-demo/Dockerfile | 12 ++++++----- full-demo/container_files/demo.gsh | 21 +++++++++---------- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/ex101/ex101.1.1/container_files/seed-data/bootstrap.gsh b/ex101/ex101.1.1/container_files/seed-data/bootstrap.gsh index 1aad87a..8fd9321 100644 --- a/ex101/ex101.1.1/container_files/seed-data/bootstrap.gsh +++ b/ex101/ex101.1.1/container_files/seed-data/bootstrap.gsh @@ -2,7 +2,6 @@ gs = GrouperSession.startRootSession(); addRootStem("101.1.1", "101.1.1") addRootStem("basis", "basis"); addRootStem("ref", "ref"); -addRootStem("bundle", "bundle"); addRootStem("app", "app"); addRootStem("org", "org"); addRootStem("test", "test"); diff --git a/ex201/ex201.1.1/container_files/seed-data/bootstrap.gsh b/ex201/ex201.1.1/container_files/seed-data/bootstrap.gsh index b5bd117..ca13eef 100644 --- a/ex201/ex201.1.1/container_files/seed-data/bootstrap.gsh +++ b/ex201/ex201.1.1/container_files/seed-data/bootstrap.gsh @@ -2,7 +2,6 @@ gs = GrouperSession.startRootSession(); addRootStem("201.1.1", "201.1.1") addRootStem("basis", "basis"); addRootStem("ref", "ref"); -addRootStem("bundle", "bundle"); addRootStem("app", "app"); addRootStem("org", "org"); addRootStem("test", "test"); diff --git a/ex401/ex401.1.1/container_files/seed-data/bootstrap.gsh b/ex401/ex401.1.1/container_files/seed-data/bootstrap.gsh index ff074dd..d4e8e7d 100644 --- a/ex401/ex401.1.1/container_files/seed-data/bootstrap.gsh +++ b/ex401/ex401.1.1/container_files/seed-data/bootstrap.gsh @@ -1,7 +1,6 @@ gs = GrouperSession.startRootSession(); addRootStem("basis", "basis"); addRootStem("ref", "ref"); -addRootStem("bundle", "bundle"); addRootStem("app", "app"); addRootStem("org", "org"); addRootStem("test", "test"); diff --git a/full-demo/Dockerfile b/full-demo/Dockerfile index ea793ce..ae81d0e 100644 --- a/full-demo/Dockerfile +++ b/full-demo/Dockerfile @@ -13,14 +13,16 @@ COPY container_files/demo.gsh /seed-data/ COPY container_files/grouper-loader.properties /opt/grouper/grouperWebapp/WEB-INF/classes COPY container_files/subject.properties /opt/grouper/grouperWebapp/WEB-INF/classes -RUN (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \ +RUN . /usr/local/bin/library.sh \ + && prep_conf && prep_finish && setupFiles; \ + (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \ && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ (mysqld_safe & ) \ && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \ - . /usr/local/bin/library.sh \ - && prep_conf && prep_finish && setupFiles \ - && cd /opt/grouper/grouperWebapp/WEB-INF \ - && sudo --preserve-env=PATH -u tomcat bin/gsh.sh /seed-data/demo.gsh \ + cd /opt/grouper/grouperWebapp/WEB-INF/bin \ + && cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ \ + && if [ ! -f /usr/local/bin/java ]; then ln -s /usr/lib/jvm/java-1.8.0-amazon-corretto/bin/java /usr/local/bin/java; fi \ + && sudo --preserve-env=PATH -u tomcat ./gsh.sh /seed-data/demo.gsh \ && pkill -HUP slapd \ && while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \ pkill -u mysql mysqld \ diff --git a/full-demo/container_files/demo.gsh b/full-demo/container_files/demo.gsh index 785912c..feb244d 100644 --- a/full-demo/container_files/demo.gsh +++ b/full-demo/container_files/demo.gsh @@ -1,7 +1,6 @@ gs = GrouperSession.startRootSession(); addRootStem("basis", "basis"); addRootStem("ref", "ref"); -addRootStem("bundle", "bundle"); addRootStem("app", "app"); addRootStem("org", "org"); testStem = addRootStem("test", "test"); @@ -60,12 +59,12 @@ attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperL attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapGroupNameExpressionName(), 'ref:dept:${groupAttribute}'); attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapGroupDisplayNameExpressionName(), '${groupAttribute}'); +addStem("ref", "student", "student"); -addGroup("bundle", "default_services", "default_services"); -addGroup("bundle", "student_services", "student_services"); -addGroup("bundle", "employee_services", "employee_services"); +addGroup("ref", "default_services", "default_services"); +addGroup("ref:student", "student_services", "student_services"); +addGroup("ref", "employee_services", "employee_services"); -addStem("ref", "student", "student"); addStem("ref:student", "class", "class"); addGroup("ref:student:class", "freshmen", "freshmen"); addGroup("ref:student:class", "sophomore", "sophomore"); @@ -105,12 +104,12 @@ addGroup("ref:role", "recruiter", "recruiter"); addGroup("ref:role", "coach", "coach"); addGroup("ref:role", "vicePresident", "vicePresident"); -addMember("bundle:student_services", "ref:student:class:freshmen"); -addMember("bundle:student_services", "ref:student:class:sophomore"); -addMember("bundle:student_services", "ref:student:class:junior"); -addMember("bundle:student_services", "ref:student:class:senior"); -addMember("bundle:student_services", "ref:student:class:graduate"); -addMember("bundle:student_services", "ref:student:class:doctorate"); +addMember("ref:student:student_services", "ref:student:class:freshmen"); +addMember("ref:student:student_services", "ref:student:class:sophomore"); +addMember("ref:student:student_services", "ref:student:class:junior"); +addMember("ref:student:student_services", "ref:student:class:senior"); +addMember("ref:student:student_services", "ref:student:class:graduate"); +addMember("ref:student:student_services", "ref:student:class:doctorate"); addStem("org", "admissions", "admissions"); addStem("org:admissions", "etc", "etc");