merge PR#3

transpect · Nov 29, 2022 · 74c3343 · 74c3343
2 parents 6822f7d + 1126a74
commit 74c3343
Show file tree

Hide file tree

Showing 202 changed files with 17,262 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,19 @@
 [submodule "calabash-distro"]
  path = distro
  url = https://github.com/transpect/calabash-distro
+ branch = saxon10
 [submodule "extensions/transpect/unzip-extension"]
  path = extensions/transpect/unzip-extension
  url = https://github.com/transpect/unzip-extension
+ branch = saxon10
 [submodule "extensions/transpect/image-props-extension"]
  path = extensions/transpect/image-props-extension
  url = https://github.com/transpect/image-props-extension
+ branch = saxon10
 [submodule "extensions/transpect/rng-extension"]
  path = extensions/transpect/rng-extension
  url = https://github.com/transpect/rng-extension
+ branch = saxon10
 [submodule "extensions/transpect/image-transform-extension"]
  path = extensions/transpect/image-transform-extension
  url = https://github.com/transpect/image-transform-extension
@@ -19,6 +23,8 @@
 [submodule "extensions/transpect/mathtype-extension"]
  path = extensions/transpect/mathtype-extension
  url = https://github.com/transpect/mathtype-extension
+ branch = saxon10
 [submodule "extensions/transpect/svn-extension"]
  path = extensions/transpect/svn-extension
  url = https://github.com/transpect/svn-extension
+ branch = calabash132-saxon10
diff --git a/README b/README
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.11-96
+1.3.2-100
diff --git a/calabash.bat b/calabash.bat
@@ -31,7 +31,7 @@
 set svnext=%extensions%transpect/svn-extension
 @set jaf=%scriptdir%/lib/javax.activation.jar
 @set config="%scriptdir%extensions/transpect/transpect-config.xml"
-@set distrolibs=%distro%lib/;%distro%lib/xmlresolver-1.0.4.jar;%distro%lib/commons-fileupload-1.3.3.jar;%distro%lib/classindex-3.3.jar;%distro%lib/htmlparser-1.4.jar;%mailext%;%distro%xmlcalabash-1.2.1-99.jar;%distro%lib/log4j-api-2.17.1.jar;%distro%lib/log4j-core-2.17.1.jar;%distro%lib/log4j-slf4j-impl-2.17.1.jar;%distro%lib/slf4j-api-1.7.32.jar
+@set distrolibs=%distro%lib/;%distro%lib/xmlresolver-1.0.4.jar;%distro%lib/commons-fileupload-1.3.3.jar;%distro%lib/classindex-3.3.jar;%distro%lib/htmlparser-1.4.jar;%mailext%;%distro%xmlcalabash-1.3.2-100.jar;%distro%lib/log4j-api-2.17.1.jar;%distro%lib/log4j-core-2.17.1.jar;%distro%lib/log4j-slf4j-impl-2.17.1.jar;%distro%lib/slf4j-api-1.7.32.jar
 
 @set classpath=%adaptationsdir%common/saxon/;%projectdir%saxon/saxon9ee.jar;%projectdir%saxon/saxon9pe.jar;%projectdir%saxon/saxon9he.jar;%scriptdir%saxon/saxon9he.jar;%distrolibs%;%rngvalidext%;%extensions%transpect/;%javascriptext%;%epubckeckext%;%imagetransformext%;%imagepropsext%;%unzipext%;%mathtypeext%;%svnext%;%jaf%
 

diff --git a/calabash.sh b/calabash.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 cygwin=false;
+mingw=false;
 case "`uname`" in
  CYGWIN*) cygwin=true;;
  MINGW*) mingw=true;;
@@ -100,12 +101,12 @@ fi
 # SAXON_JAR is the path to a Saxon PE or EE jar file. Its name should match the following
 # regex: /[ehp]e\.jar$/ so that we can extract the substring 'ee', 'he', or 'pe':
 if [ -z $SAXON_JAR ]; then
- if [ -e $PROJECT_DIR/saxon/saxon9ee.jar ]; then
- SAXON_JAR=$PROJECT_DIR/saxon/saxon9ee.jar
- elif [ -e $PROJECT_DIR/saxon/saxon9pe.jar ]; then
- SAXON_JAR=$PROJECT_DIR/saxon/saxon9pe.jar
+ if [ -e $PROJECT_DIR/saxon/saxon10ee.jar ]; then
+ SAXON_JAR=$PROJECT_DIR/saxon/saxon10ee.jar
+ elif [ -e $PROJECT_DIR/saxon/saxon10pe.jar ]; then
+ SAXON_JAR=$PROJECT_DIR/saxon/saxon10pe.jar
  else
- SAXON_JAR=$DIR/saxon/saxon9he.jar
+ SAXON_JAR=$PROJECT_DIR/saxon/saxon10he.jar
  fi
 fi
 if [ -z "$SAXON_PROCESSOR" ]; then
@@ -135,9 +136,9 @@ MATHTYPE_EXT="$EXT_BASE/transpect/mathtype-extension:$EXT_BASE/transpect/mathtyp
 SVN_EXT="$EXT_BASE/transpect/svn-extension:$EXT_BASE/transpect/svn-extension/lib/antlr-runtime-3.4.jar:$EXT_BASE/transpect/svn-extension/lib/jna-4.1.0.jar:$EXT_BASE/transpect/svn-extension/lib/jna-platform-4.1.0.jar:$EXT_BASE/transpect/svn-extension/lib/jsch.agentproxy.connector-factory-0.0.7.jar:$EXT_BASE/transpect/svn-extension/lib/jsch.agentproxy.core-0.0.7.jar:$EXT_BASE/transpect/svn-extension/lib/jsch.agentproxy.pageant-0.0.7.jar:$EXT_BASE/transpect/svn-extension/lib/jsch.agentproxy.sshagent-0.0.7.jar:$EXT_BASE/transpect/svn-extension/lib/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar:$EXT_BASE/transpect/svn-extension/lib/jsch.agentproxy.usocket-jna-0.0.7.jar:$EXT_BASE/transpect/svn-extension/lib/jsch.agentproxy.usocket-nc-0.0.7.jar:$EXT_BASE/transpect/svn-extension/lib/lz4-java-1.4.1.jar:$EXT_BASE/transpect/svn-extension/lib/sequence-library-1.0.4.jar:$EXT_BASE/transpect/svn-extension/lib/sqljet-1.1.12.jar:$EXT_BASE/transpect/svn-extension/lib/svnkit-1.10.1.jar:$EXT_BASE/transpect/svn-extension/lib/svnkit-cli-1.10.1.jar:$EXT_BASE/transpect/svn-extension/lib/svnkit-javahl16-1.10.1.jar:$EXT_BASE/transpect/svn-extension/lib/svnkit-javahl16-1.10.1-javadoc.jar:$EXT_BASE/transpect/svn-extension/lib/svnkit-javahl16-1.10.1-sources.jar:$EXT_BASE/transpect/svn-extension/lib/trilead-ssh2-1.0.0-build222.jar"
 MAIL_EXT="$EXT_BASE/calabash/lib/xmlcalabash1-sendmail-1.1.4.jar:$EXT_BASE/calabash/lib/javax.mail.jar"
 JAF="$DIR/lib/javax.activation.jar"
-DISTROLIBS="$DISTRO/lib/:$DISTRO/lib/xmlresolver-1.0.4.jar:$DISTRO/lib/commons-fileupload-1.3.3.jar:$DISTRO/lib/classindex-3.3.jar:$DISTRO/lib/htmlparser-1.4.jar:$PROJECT_DIR/a9s/common/calabash:$DISTRO/lib/org.restlet-2.2.2.jar:$MAIL_EXT:$DISTRO/lib/tagsoup-1.2.1.jar:$DISTRO/lib/slf4j-api-1.7.32.jar:$DISTRO/lib/log4j-api-2.17.1.jar:$DISTRO/lib/log4j-core-2.17.1.jar:$DISTRO/lib/log4j-slf4j-impl-2.17.1.jar"
+DISTROLIBS="$DISTRO/lib/:$DISTRO/lib/xmlresolver-2.0.1.jar:$DISTRO/lib/commons-fileupload-1.3.3.jar:$DISTRO/lib/classindex-3.3.jar:$DISTRO/lib/htmlparser-1.4.jar:$PROJECT_DIR/a9s/common/calabash:$DISTRO/lib/org.restlet-2.2.2.jar:$MAIL_EXT:$DISTRO/lib/tagsoup-1.2.1.jar:$DISTRO/lib/slf4j-simple-1.7.32.jar:$DISTRO/lib/slf4j-api-1.7.32.jar"
 
-CLASSPATH="$ADAPTATIONS_DIR/common/saxon/:$SAXON_JAR:$DIR/saxon/:$RNGVALID_EXT:$DISTRO/xmlcalabash-1.2.1-99.jar:$DISTROLIBS:$EPUBCHECK_EXT:$JAVASCRIPT_EXT:$IMAGEPROPS_EXT:$IMAGETRANSFORM_EXT:$UNZIP_EXT:$MATHTYPE_EXT:$SVN_EXT:$JAF:$CLASSPATH"
+CLASSPATH="$ADAPTATIONS_DIR/common/saxon/:$SAXON_JAR:$DIR/saxon/:$RNGVALID_EXT:$DISTRO/xmlcalabash-1.3.2-100.jar:$DISTROLIBS:$EPUBCHECK_EXT:$JAVASCRIPT_EXT:$IMAGEPROPS_EXT:$IMAGETRANSFORM_EXT:$UNZIP_EXT:$MATHTYPE_EXT:$SVN_EXT:$JAF:$CLASSPATH"
 
 OSDIR=$DIR
 if $cygwin; then
@@ -156,6 +157,9 @@ CATALOGS="$CATALOGS;$DIR/xmlcatalog/catalog.xml;$PROJECT_DIR/xmlcatalog/catalog.
 # If, however, this calabash dir is not a subdir of $PROJECT_DIR, then it makes sense to explicitly include them here.
 # Please note that it is _essential_ that your project contains an xmlcatalog/catalog.xml that includes the catalogs
 # of all transpect modules that you use.
+if $mingw; then
+ CATALOGS=file:https:///$(mingw_win_path "$DIR/xmlcatalog/catalog.xml")
+fi
 
 JAVA_OPTS="-Dfile.encoding=$JAVA_FILE_ENCODING -Dxml.catalog.files=$CATALOGS \
 -Djruby.compile.mode=OFF \

diff --git a/docs/notices/APACHE-ANT.txt b/docs/notices/APACHE-ANT.txt
diff --git a/docs/notices/APACHE-CODEC.txt b/docs/notices/APACHE-CODEC.txt
diff --git a/docs/notices/APACHE-HTTPCLIENT.txt b/docs/notices/APACHE-HTTPCLIENT.txt
diff --git a/docs/notices/APACHE-IO.txt b/docs/notices/APACHE-IO.txt
diff --git a/docs/notices/APACHE-LOGGING.txt b/docs/notices/APACHE-LOGGING.txt
diff --git a/docs/notices/CDDL+GPL.txt b/docs/notices/CDDL+GPL.txt
diff --git a/docs/notices/GPL.txt b/docs/notices/GPL.txt
diff --git a/docs/notices/NOTICES b/docs/notices/NOTICES
diff --git a/docs/notices/RESTLET.txt b/docs/notices/RESTLET.txt
diff --git a/docs/notices/SAXON9HE.txt b/docs/notices/SAXON9HE.txt
diff --git a/docs/notices/SLF4J.txt b/docs/notices/SLF4J.txt