Changeset 36955

Timestamp:

2022-11-28T06:37:21+13:00 (17 months ago)

Author:

davidb

Message:

Bump in the version of Cantoloupe used to avoid 'pom' download dependency issues; scripts tidied up to use a variable to represent the version used

Location:

gs3-extensions/iiif-servlet/trunk/src

Files:

• CLEAN-then-COMPILE.sh (modified) (1 diff)
• COMPILE-CANTALOUPE.sh (modified) (1 diff)
• INSTALL-CANTALOUPE-WAR.sh (modified) (1 diff)
• PREPARE-CANTALOUPE.sh (modified) (2 diffs)
• PREPARE-GSDL-AND-COMPILE-CORE.sh (modified) (2 diffs)
• README.txt (modified) (1 diff)
• cantaloupe-pom403.xml (added)

gs3-extensions/iiif-servlet/trunk/src/CLEAN-then-COMPILE.sh

@@ -1 +1 @@
 #!/bin/bash
+
+cversion=4.0.3
 
 echo "Checking that maven (mvn) is on your PATH:"
 which mvn
 if [ $? = 0 ] ; then
-  cd packages/cantaloupe-4.0.2 \
+  cd packages/cantaloupe-$cversion \
    && mvn clean package -DskipTests
 else

gs3-extensions/iiif-servlet/trunk/src/COMPILE-CANTALOUPE.sh

@@ -1 +1 @@
 #!/bin/bash
+
+cversion=4.0.3
 
 echo "Checking that maven (mvn) is on your PATH:"
 which mvn
 if [ $? = 0 ] ; then
-  cd packages/cantaloupe-4.0.2 \
+  cd packages/cantaloupe-$cversion \
       && mvn package -DskipTests
   echo

gs3-extensions/iiif-servlet/trunk/src/INSTALL-CANTALOUPE-WAR.sh

@@ -1 +1 @@
 #!/bin/bash
+
+cversion=4.0.3
 
 echo "Copying cantaloupe war file to tomcat/webapps area as gs-cantaloupe.war"
 
-/bin/cp packages/cantaloupe-4.0.2/target/cantaloupe-4.0.2.war ../../packages/tomcat/webapps/gs-cantaloupe.war
+/bin/cp packages/cantaloupe-$cversion/target/cantaloupe-$cversion.war ../../packages/tomcat/webapps/gs-cantaloupe.war
 

gs3-extensions/iiif-servlet/trunk/src/PREPARE-CANTALOUPE.sh

@@ -1 +1 @@
 #!/bin/bash
 
-if [ ! -d packages/cantaloupe-4.0.2 ] ; then
+cversion=4.0.3
+pversion=403
+
+if [ ! -d packages/cantaloupe-$cversion ] ; then
     cd packages/ 
-    tar xvzf cantaloupe-4.0.2.tar.gz
+    tar xvzf cantaloupe-$cversion.tar.gz
     cd ..
 fi
 
 echo "Running rsync update on src/main"
-rsync -pav src/main packages/cantaloupe-4.0.2/src/.
+rsync -pav src/main packages/cantaloupe-$cversion/src/.
 
-echo "Running rsync update on cantaloupe-pom.xml -> cantaloupe-4.0.2/pom.xml"
-rsync -pav cantaloupe-pom.xml packages/cantaloupe-4.0.2/pom.xml
+echo "Running rsync update on cantaloupe-pom$pversion.xml -> cantaloupe-$cversion/pom.xml"
+rsync -pav cantaloupe-pom$pversion.xml packages/cantaloupe-$cversion/pom.xml
 
 
@@ -17 +20 @@
 
 echo "Copying Greenstone's global.properties into Cantaloupe's resources folder"
-/bin/cp ../../web/WEB-INF/classes/global.properties packages/cantaloupe-4.0.2/src/main/resources/.
+/bin/cp ../../web/WEB-INF/classes/global.properties packages/cantaloupe-$cversion/src/main/resources/.
 
 echo "Copying Greenstone's log4j.properties into Cantaloupe's resources folder"
-/bin/cp ../../web/WEB-INF/classes/log4j.properties packages/cantaloupe-4.0.2/src/main/resources/.
+/bin/cp ../../web/WEB-INF/classes/log4j.properties packages/cantaloupe-$cversion/src/main/resources/.
 
 echo "Copying Greenstone's IIIFConfig.xml into Cantaloupe's resources folder"
-/bin/cp ../../web/WEB-INF/classes/IIIFConfig.xml packages/cantaloupe-4.0.2/src/main/resources/.
+/bin/cp ../../web/WEB-INF/classes/IIIFConfig.xml packages/cantaloupe-$cversion/src/main/resources/.
 
 

gs3-extensions/iiif-servlet/trunk/src/PREPARE-GSDL-AND-COMPILE-CORE.sh

@@ -1 +1 @@
 #!/bin/bash
 
+cversion=4.0.3
+pversion=403
+
 # First Cantaloupe checks
-if [ ! -d packages/cantaloupe-4.0.2 ] ; then
+if [ ! -d packages/cantaloupe-$cversion ] ; then
     cd packages/ 
-    tar xvzf cantaloupe-4.0.2.tar.gz
+    tar xvzf cantaloupe-$cversion.tar.gz
     cd ..
 fi
 
-if [ ! -d packages/cantaloupe-4.0.2/src/main/webapp/WEB-INF/lib ] ; then
-    echo "Creating directory: packages/cantaloupe-4.0.2/src/main/webapp/WEB-INF/lib"
-    mkdir "packages/cantaloupe-4.0.2/src/main/webapp/WEB-INF/lib"
+if [ ! -d packages/cantaloupe-$cversion/src/main/webapp/WEB-INF/lib ] ; then
+    echo "Creating directory: packages/cantaloupe-$cversion/src/main/webapp/WEB-INF/lib"
+    mkdir "packages/cantaloupe-$cversion/src/main/webapp/WEB-INF/lib"
 fi
 
@@ -22 +25 @@
 
 echo "Copying gsdl3.jar and gutil.jar to Cantaloupe's webapps/WEB-INF/lib/ directory"
-/bin/cp ../../build/gsdl3.jar packages/cantaloupe-4.0.2/src/main/webapp/WEB-INF/lib/gsdl3.jar
-/bin/cp ../../build/gutil.jar packages/cantaloupe-4.0.2/src/main/webapp/WEB-INF/lib/gutil.jar
+/bin/cp ../../build/gsdl3.jar packages/cantaloupe-$cversion/src/main/webapp/WEB-INF/lib/gsdl3.jar
+/bin/cp ../../build/gutil.jar packages/cantaloupe-$cversion/src/main/webapp/WEB-INF/lib/gutil.jar
 
 echo
 echo "If first time run, or changes made to:"
 echo "    (i) ./src (Greenstone specific code for Cantaloupe's src directory)"
-echo "   (ii) ./cantaloupe-pom.xml or ./cantaloup.properties"
+echo "   (ii) ./cantaloupe-pom$pversion.xml or ./cantaloup.properties"
 echo "  (iii) Greenstone's global.properties, log4j.properties, IIIFConfig.xml"
 echo 

gs3-extensions/iiif-servlet/trunk/src/README.txt

@@ +1 @@
+
+First time use:
+
+    ./PREPARE-GSDL-AND-COMPILE-CORE.sh
+    ./PREPARE-CANTALOUPE.sh
+    ./COMPILE-CANTALOUPE.sh
+
+Bump to cantaloupe 4.03
+
+
+http://localhost:8383/gs-cantaloupe/
+http://localhost:8383/gs-cantaloupe/admin
+
+http://localhost:8383/gs-cantaloupe/iiif/2
+
+
+http://localhost/gs-cantaloupe/iiif/2/<site>:<col>:<docid>/info.json
+
+
+Add IIIFPMH service to collection
+
+cp web/WEB-INF/lib/jdbm.jar packages/tomcat/webapps/gs-cantaloupe/WEB-INF/lib/.
+
+http://atea.space:4343/gs-cantaloupe/iiif/2/intermuse:programmes:HASHc5edd00c6c45cc68ce9532/info.js
+
+http://atea.space:4343/gs-cantaloupe/iiif/2/intermuse:programmes:HASHc5edd00c6c45cc68ce9532/full/full/0/default.jpg
+
+
+=====
+
+
 Currently the jar files for Greenstone3: