From 78af387e004b59e30563680815a466e19402dd8e Mon Sep 17 00:00:00 2001 From: qadan Date: Fri, 18 Oct 2013 10:55:28 -0300 Subject: [PATCH 1/7] see if this new tomcat works --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index cf1de5c5..d8566735 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -6,7 +6,7 @@ mysql -u root -e "GRANT ALL PRIVILEGES ON fedora.* To 'fedora'@'localhost' IDENT mysql -u root -e "GRANT ALL PRIVILEGES ON drupal.* To 'drupal'@'localhost' IDENTIFIED BY 'drupal';" cd $HOME git clone git://github.com/Islandora/tuque.git -git clone -b $FEDORA_VERSION git://github.com/Islandora/islandora_tomcat.git +git clone -b $FEDORA_VERSION git://github.com/qadan/islandora_tomcat.git cd islandora_tomcat export CATALINA_HOME='.' ./bin/startup.sh From 1d3191c1c1e61bef341e168873b5fd7ccf3e7bc7 Mon Sep 17 00:00:00 2001 From: qadan Date: Mon, 21 Oct 2013 12:04:54 -0300 Subject: [PATCH 2/7] with FEDORA_HOME defined --- tests/scripts/travis_setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index d8566735..ec57a37f 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -9,6 +9,7 @@ git clone git://github.com/Islandora/tuque.git git clone -b $FEDORA_VERSION git://github.com/qadan/islandora_tomcat.git cd islandora_tomcat export CATALINA_HOME='.' +export FEDORA_HOME='/home/travis/islandora_tomcat/fedora' ./bin/startup.sh cd $HOME pear upgrade --force Console_Getopt From cd439daab5a69226e8296c8e04c349d585215059 Mon Sep 17 00:00:00 2001 From: qadan Date: Mon, 21 Oct 2013 14:49:46 -0300 Subject: [PATCH 3/7] brrrrrr --- tests/scripts/travis_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index ec57a37f..9fd482da 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -8,8 +8,8 @@ cd $HOME git clone git://github.com/Islandora/tuque.git git clone -b $FEDORA_VERSION git://github.com/qadan/islandora_tomcat.git cd islandora_tomcat -export CATALINA_HOME='.' -export FEDORA_HOME='/home/travis/islandora_tomcat/fedora' +export CATALINA_HOME=`pwd` +export FEDORA_HOME='$CATALINA_HOME/fedora' ./bin/startup.sh cd $HOME pear upgrade --force Console_Getopt From c7691b9d520f5a0262dd2f12039f8396448d7a5d Mon Sep 17 00:00:00 2001 From: qadan Date: Mon, 21 Oct 2013 15:53:26 -0300 Subject: [PATCH 4/7] ain't even mad --- tests/scripts/travis_setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 9fd482da..d8566735 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -8,8 +8,7 @@ cd $HOME git clone git://github.com/Islandora/tuque.git git clone -b $FEDORA_VERSION git://github.com/qadan/islandora_tomcat.git cd islandora_tomcat -export CATALINA_HOME=`pwd` -export FEDORA_HOME='$CATALINA_HOME/fedora' +export CATALINA_HOME='.' ./bin/startup.sh cd $HOME pear upgrade --force Console_Getopt From 4e369fcba7caa7fbbeaeef84b224b5ac12c21972 Mon Sep 17 00:00:00 2001 From: qadan Date: Thu, 31 Oct 2013 12:39:53 -0300 Subject: [PATCH 5/7] testing with Gervais' tomcat --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index d8566735..2e7f87c8 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -6,7 +6,7 @@ mysql -u root -e "GRANT ALL PRIVILEGES ON fedora.* To 'fedora'@'localhost' IDENT mysql -u root -e "GRANT ALL PRIVILEGES ON drupal.* To 'drupal'@'localhost' IDENTIFIED BY 'drupal';" cd $HOME git clone git://github.com/Islandora/tuque.git -git clone -b $FEDORA_VERSION git://github.com/qadan/islandora_tomcat.git +git clone -b $FEDORA_VERSION git://github.com/GervaisdeM/islandora_tomcat.git cd islandora_tomcat export CATALINA_HOME='.' ./bin/startup.sh From 944f916f456322a6bd7be45a694053477e4f2a97 Mon Sep 17 00:00:00 2001 From: qadan Date: Thu, 31 Oct 2013 12:40:32 -0300 Subject: [PATCH 6/7] adding in JAVA_OPTS --- tests/scripts/travis_setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 2e7f87c8..b723ee80 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -9,6 +9,7 @@ git clone git://github.com/Islandora/tuque.git git clone -b $FEDORA_VERSION git://github.com/GervaisdeM/islandora_tomcat.git cd islandora_tomcat export CATALINA_HOME='.' +export JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -Djavax.net.ssl.trustStore=$CATALINA_HOME/fedora/server/truststore -Djavax.net.ssl.trustStorePassword=tomcat" ./bin/startup.sh cd $HOME pear upgrade --force Console_Getopt From 798ba7eea34228f812d40723eb086e36420ba2c2 Mon Sep 17 00:00:00 2001 From: qadan Date: Fri, 1 Nov 2013 13:50:51 -0300 Subject: [PATCH 7/7] Using the real islandora_tomcat now that it's merged --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index b723ee80..f46c2fc6 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -6,7 +6,7 @@ mysql -u root -e "GRANT ALL PRIVILEGES ON fedora.* To 'fedora'@'localhost' IDENT mysql -u root -e "GRANT ALL PRIVILEGES ON drupal.* To 'drupal'@'localhost' IDENTIFIED BY 'drupal';" cd $HOME git clone git://github.com/Islandora/tuque.git -git clone -b $FEDORA_VERSION git://github.com/GervaisdeM/islandora_tomcat.git +git clone -b $FEDORA_VERSION git://github.com/Islandora/islandora_tomcat.git cd islandora_tomcat export CATALINA_HOME='.' export JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -Djavax.net.ssl.trustStore=$CATALINA_HOME/fedora/server/truststore -Djavax.net.ssl.trustStorePassword=tomcat"