From 571837833dcb889a7fb5389e0e4e0d29032abc9a Mon Sep 17 00:00:00 2001
From: Ricardo Jun <jtaniguc@redhat.com>
Date: Mon, 26 Nov 2018 17:30:35 +0100
Subject: [PATCH] Merge branch 'master' of github.com:RedHatTraining/business-process-apps-training-lab

---
 extras/backup/images.sh               |    1 +
 extras/backup/workstation.sh          |    3 ++-
 extras/backup/InstallConfigRecord.xml |   10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/extras/backup/InstallConfigRecord.xml b/extras/backup/InstallConfigRecord.xml
index 8a0060f..05b5a74 100644
--- a/extras/backup/InstallConfigRecord.xml
+++ b/extras/backup/InstallConfigRecord.xml
@@ -10,8 +10,8 @@
 <installgroup>devstudio</installgroup>
 </com.jboss.devstudio.core.installer.JBossAsSelectPanel>
 <com.jboss.devstudio.core.installer.InstallAdditionalFeaturesPanel id="features">
-<ius>com.jboss.devstudio.core.package,org.testng.eclipse.feature.group</ius>
-<locations>devstudio</locations>
+<ius>com.jboss.devstudio.core.package,org.testng.eclipse.feature.group,com.jboss.devstudio.integration-stack.bpr.feature.feature.group</ius>
+<locations>devstudio,devstudio-is</locations>
 </com.jboss.devstudio.core.installer.InstallAdditionalFeaturesPanel>
 <com.jboss.devstudio.core.installer.InstallAdditionalRuntimesPanel id="runtimes">
 <locations/>
@@ -25,9 +25,9 @@
 </com.jboss.devstudio.core.installer.CreateLinkPanel>
 <com.izforge.izpack.panels.ShortcutPanel id="shortcut">
 <programGroup name=""/>
-<shortcut KdeSubstUID="false" categories="Applications;Development;" commandLine="" createForAll="true" description="Runs the Red Hat Developer Studio 12.0.0.GA" encoding="UTF-8" group="false" icon="/usr/local/devstudio/studio/48-devstudio.icon.png" iconIndex="0" initialState="1" mimetype="" name="Red Hat Developer Studio 12.9.0.GA" target="/usr/local/devstudio/studio/devstudio" terminal="false" terminalOptions="" tryexec="" type="Application" url="" usertype="0" workingDirectory="/usr/local/devstudio/studio"/>
-<shortcut KdeSubstUID="false" categories="Applications;Development;" commandLine="" createForAll="true" description="Runs the Red Hat Developer Studio 12.0.0.GA" encoding="UTF-8" group="true" icon="/usr/local/devstudio/studio/48-devstudio.icon.png" iconIndex="0" initialState="1" mimetype="" name="Red Hat Developer Studio 12.9.0.GA" target="/usr/local/devstudio/studio/devstudio" terminal="false" terminalOptions="" tryexec="" type="Application" url="" usertype="0" workingDirectory="/usr/local/devstudio/studio"/>
-<shortcut KdeSubstUID="false" categories="Applications;Development;" commandLine="-jar &quot;/usr/local/devstudio/Uninstaller/uninstaller.jar&quot;" createForAll="true" description="Uninstall Red Hat Developer Studio 12.9.0.GA" encoding="UTF-8" group="true" icon="/usr/local/devstudio/studio/48-uninstall.icon.png" iconIndex="0" initialState="1" mimetype="" name="Uninstall Red Hat Developer Studio 12.0.0.GA" target="java" terminal="false" terminalOptions="" tryexec="" type="Application" url="" usertype="0" workingDirectory="/usr/local/devstudio/Uninstaller"/>
+<shortcut KdeSubstUID="false" categories="Applications;Development;" commandLine="" createForAll="true" description="Runs the Red Hat Developer Studio 12.0.0.GA" encoding="UTF-8" group="false" icon="/home/student/jbds/studio/48-devstudio.icon.png" iconIndex="0" initialState="1" mimetype="" name="Red Hat Developer Studio 12.0.0.GA" target="/home/student/jbds/studio/devstudio" terminal="false" terminalOptions="" tryexec="" type="Application" url="" usertype="0" workingDirectory="/home/student/jbds/studio"/>
+<shortcut KdeSubstUID="false" categories="Applications;Development;" commandLine="" createForAll="true" description="Runs the Red Hat Developer Studio 12.0.0.GA" encoding="UTF-8" group="true" icon="/home/student/jbds/studio/48-devstudio.icon.png" iconIndex="0" initialState="1" mimetype="" name="Red Hat Developer Studio 12.0.0.GA" target="/home/student/jbds/studio/devstudio" terminal="false" terminalOptions="" tryexec="" type="Application" url="" usertype="0" workingDirectory="/home/student/jbds/studio"/>
+<shortcut KdeSubstUID="false" categories="Applications;Development;" commandLine="-jar &quot;/home/student/jbds/Uninstaller/uninstaller.jar&quot;" createForAll="true" description="Uninstall Red Hat Developer Studio 12.0.0.GA" encoding="UTF-8" group="true" icon="/home/student/jbds/studio/48-uninstall.icon.png" iconIndex="0" initialState="1" mimetype="" name="Uninstall Red Hat Developer Studio 12.0.0.GA" target="java" terminal="false" terminalOptions="" tryexec="" type="Application" url="" usertype="0" workingDirectory="/home/student/jbds/Uninstaller"/>
 </com.izforge.izpack.panels.ShortcutPanel>
 <com.jboss.devstudio.core.installer.ShortcutPanelPatch id="shortcutpatch"/>
 <com.izforge.izpack.panels.SimpleFinishPanel id="finish"/>
diff --git a/extras/backup/images.sh b/extras/backup/images.sh
index 670fe30..d4cc21f 100644
--- a/extras/backup/images.sh
+++ b/extras/backup/images.sh
@@ -1,4 +1,5 @@
 rsync -aPv docker-clean root@services:/etc/sysconfig/docker
+ssh root@classroom rht-config-nat
 ssh root@services systemctl restart docker
 
 ssh root@services "docker pull registry.access.redhat.com/rhpam-7/rhpam70-businesscentral-openshift:1.0 && docker tag registry.access.redhat.com/rhpam-7/rhpam70-businesscentral-openshift:1.0 registry.lab.example.com/rhpam-7/rhpam70-businesscentral-openshift:1.0 && docker push registry.lab.example.com/rhpam-7/rhpam70-businesscentral-openshift:1.0" 
diff --git a/extras/backup/workstation.sh b/extras/backup/workstation.sh
index 7bf5899..769ad4a 100644
--- a/extras/backup/workstation.sh
+++ b/extras/backup/workstation.sh
@@ -1,4 +1,5 @@
 ssh root@workstation yum install -y libreoffice-calc
+ssh root@workstation yum clean all -y
 rsync -aPv /home/kiosk/Downloads/devstudio-*.jar student@workstation:/home/student
 rsync -aPv InstallConfigRecord.xml student@workstation:/home/student
 ssh student@workstation java -jar /home/student/devstudio-*.jar /home/student/InstallConfigRecord.xml
@@ -6,4 +7,4 @@
 ssh root@workstation chown -R student:student /home/student/jbds
 ssh root@workstation chown -R student:student /home/student/Desktop/*
 ssh root@workstation rm -rf /home/student/devstudio-*.jar
-ssh root@workstation rm -rf /home/student/InstallConfigRecord.xml
\ No newline at end of file
+ssh root@workstation rm -rf /home/student/InstallConfigRecord.xml

--
Gitblit v1.9.3