diff --git a/build.xml b/build.xml
index f32ff38bb202df976a1264680a1045b39693295e..4c08e726592c96c80cf1dc02b144a2dee7009157 100644
--- a/build.xml
+++ b/build.xml
@@ -16,10 +16,10 @@ are met:
notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
- * The names of the Web3D Consortium (http://www.web3D.org),
- Naval Postgraduate School (NPS) (http://www.nps.edu),
+ * The names of the Web3D Consortium (https://www.web3D.org),
+ Naval Postgraduate School (NPS) (https://www.nps.edu),
Modeling Virtual Environments and Simulation (MOVES) Institute
- (http://www.MovesInstitute.org), and
+ (https://www.MovesInstitute.org), and
the names of its contributors may not be used to endorse or
promote products derived from this software without specific
prior written permission.
@@ -364,8 +364,8 @@ Key references:
https://sourceforge.net/projects/saxon
https://www.saxonica.com/html/documentation/sourcedocs/xml-catalogs.html
"How to use a catalog file: Using catalogs with Saxon"
- http://www.sagehill.net/docbookxsl/UseCatalog.html
- download resolver.jar from https://www.apache.org/dist/xerces/xml-commons (formerly http://xml.apache.org/commons/dist)
+ https://www.sagehill.net/docbookxsl/UseCatalog.html
+ download resolver.jar from https://www.apache.org/dist/xerces/xml-commons (formerly https://xml.apache.org/commons/dist)
unzip package and install resolver.jar into classpath above,
must also have CatalogManager.properties in CLASSPATH
<arg value="-r:org.apache.xml.resolver.tools.CatalogResolver"/>
@@ -952,7 +952,7 @@ and
</p>
<p>
Officially released models and .zip distribution are maintained at
-<a href="http://www.web3d.org/x3d/content/examples/Basic" target="_blank">http://www.web3d.org/x3d/content/examples/Basic</a>.
+<a href="https://www.web3d.org/x3d/content/examples/Basic" target="_blank">https://www.web3d.org/x3d/content/examples/Basic</a>.
</p>
<p>
@@ -975,9 +975,9 @@ Additional example build projects nearby include
<p>Additional information is available at
<a href="https://savage.nps.edu/Savage/developers.html#Jenkins" target="_blank">Savage Developers Guide</a>,
<a href="https://SavageDefense.nps.navy.mil/SavageDefense/developers.html#Jenkins">SavageDefense Developers Guide</a>,
-<a href="http://www.web3d.org/x3d/content/examples/X3dResources.html" target="_blank">X3D Resources</a>
+<a href="https://www.web3d.org/x3d/content/examples/X3dResources.html" target="_blank">X3D Resources</a>
and
-<a href="http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html" target="_blank">X3D Scene Authoring Hints</a>.
+<a href="https://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html" target="_blank">X3D Scene Authoring Hints</a>.
</p>
-->
</target>
@@ -1117,9 +1117,9 @@ Nearby: additional X3D Example build projects include
</p>
<p>Additional information is available at <a href="https://savage.nps.edu/developers.html" target="_blank">Savage Developers Guide</a>,
-<a href="http://www.web3d.org/x3d/content/examples/X3dResources.html" target="_blank">X3D Resources</a>
+<a href="https://www.web3d.org/x3d/content/examples/X3dResources.html" target="_blank">X3D Resources</a>
and
-<a href="http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html" target="_blank">X3D Scene Authoring Hints</a>.
+<a href="https://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html" target="_blank">X3D Scene Authoring Hints</a>.
</p>
-->
<elseif>
@@ -1178,9 +1178,9 @@ Nearby: additional X3D Example build projects include
<p>Additional information is available at
<a href="https://savage.nps.edu/developers.html" target="_blank">Savage Developers Guide</a>,
<a href="https://SavageDefense.nps.navy.mil/developers.html" target="_blank">SavageDefense Developers Guide</a>,
-<a href="http://www.web3d.org/x3d/content/examples/X3dResources.html" target="_blank">X3D Resources</a>
+<a href="https://www.web3d.org/x3d/content/examples/X3dResources.html" target="_blank">X3D Resources</a>
and
-<a href="http://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html" target="_blank">X3D Scene Authoring Hints</a>.
+<a href="https://www.web3d.org/x3d/content/examples/X3dSceneAuthoringHints.html" target="_blank">X3D Scene Authoring Hints</a>.
</p>
-->
</elseif>
@@ -1402,13 +1402,13 @@ ignoreSetupDownloadErrors=true
<if>
<equals arg1="${archive.name}" arg2="SavageDefense" />
<then>
- <get src="http://xmsf.svn.sourceforge.net/viewvc/xmsf/trunk/AuvWorkbench/lib/xj3d/${xj3d.jar}"
+ <get src="https://sourceforge.net/p/xmsf/code/HEAD/tree/trunk/AuvWorkbench//lib/xj3d/${xj3d.jar}"
dest="${xj3d.dir.jars}/${xj3d.jar}" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/>
- <get src="http://xmsf.svn.sourceforge.net/viewvc/xmsf/trunk/AuvWorkbench/lib/xj3d/${xj3d.cadfilter.jar}"
+ <get src="https://sourceforge.net/p/xmsf/code/HEAD/tree/trunk/AuvWorkbench//lib/xj3d/${xj3d.cadfilter.jar}"
dest="${xj3d.dir.jars}/${xj3d.cadfilter.jar}" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/>
- <get src="http://xmsf.svn.sourceforge.net/viewvc/xmsf/trunk/AuvWorkbench/lib/xj3d/${xj3d.3rdparty.jar}"
+ <get src="https://sourceforge.net/p/xmsf/code/HEAD/tree/trunk/AuvWorkbench//lib/xj3d/${xj3d.3rdparty.jar}"
dest="${xj3d.dir.jars}/${xj3d.3rdparty.jar}" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/>
- <get src="http://xmsf.svn.sourceforge.net/viewvc/xmsf/trunk/AuvWorkbench/lib/xj3d/${xj3d.browser.jar}"
+ <get src="https://sourceforge.net/p/xmsf/code/HEAD/tree/trunk/AuvWorkbench//lib/xj3d/${xj3d.browser.jar}"
dest="${xj3d.dir.jars}/${xj3d.browser.jar}" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/>
</then>
<else>
@@ -1518,15 +1518,15 @@ ignoreSetupDownloadErrors=true
</target>
<target name="get.X3DJSAIL.update" description="get latest X3DJSAIL update" >
- <echo message="get latest X3DJSAIL update from http://www.web3d.org/specifications/java/X3DJSAIL.html"/>
- <get src="http://www.web3d.org/specifications/java/jars/${jsai.full.archive.jar.name}"
+ <echo message="get latest X3DJSAIL update from https://www.web3d.org/specifications/java/X3DJSAIL.html"/>
+ <get src="https://www.web3d.org/specifications/java/jars/${jsai.full.archive.jar.name}"
dest="lib/" verbose="true" ignoreerrors="false"/>
<length property="jsai.full.archive.jar.length" file="lib/${jsai.full.archive.jar.name}"/>
<echo>Download complete, lib/${jsai.full.archive.jar.name} size ${jsai.full.archive.jar.length} bytes</echo>
</target>
<target name="get.slideshowTools" description="retrieve slideshow package"> <!-- unless="${ignoreSetupDownloadErrors}" -->
- <echo message="Retrieve open-source google slideshow package http://code.google.com/p/slideshow"/>
+ <echo message="Retrieve open-source google slideshow package https://code.google.com/archive/p/slideshow"/>
<property name="mootools.zip" value="Slideshow-1.3.2.110508.zip"/>
<property name="mootools.dir" value="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/slideshow"/>
<get src="${mootools.dir}/${mootools.zip}"
@@ -1954,7 +1954,7 @@ ignoreSetupDownloadErrors=true
<echo message="XML well-formed check: ${archive.name} build.xml and scenes"/>
<echo message="Verifying Apache Ant XML Catalog resolver classpath: ${resolver.dir}/resolver.jar (${resolver.jar.length} bytes)"/>
<xmlvalidate failonerror="false" warn="true" lenient="true" file="build.xml"/>
- <echo message="X3D DTDs and schemas available at http://www.web3d.org/specifications"/>
+ <echo message="X3D DTDs and schemas available at https://www.web3d.org/specifications"/>
<echo message="check well-formedness of X3D scenes"/>
<xmlvalidate failonerror="false" warn="true" lenient="true">
<!-- only check *.x3d files of interest (and *Canonical.xml versions as a double-check) not grandchild directories holding errors or work in progress -->
@@ -1985,7 +1985,7 @@ ignoreSetupDownloadErrors=true
depends="clean.duplicates">
<!-- X3D schema validation -->
<echo message="Validate using X3D schema as declared in scenes: ${archive.name} archive"/>
- <echo message="X3D DTDs and schemas available at http://www.web3d.org/specifications"/>
+ <echo message="X3D DTDs and schemas available at https://www.web3d.org/specifications"/>
<!-- TODO need to try increasing stack space to 16m, fullchecking true results in java.lang.StackOverflowError
at com.sun.org.apache.xerces.internal.impl.xpath.regex.RegularExpression.matchString(RegularExpression.java:1903) -->
<schemavalidate failonerror="false" fullchecking="false" lenient="false" warn="true">
@@ -2003,7 +2003,7 @@ ignoreSetupDownloadErrors=true
depends="clean.duplicates">
<!-- X3D schema validation -->
<echo message="Validate using X3D schema version 4.0: ${archive.name} archive"/>
- <echo message="X3D DTDs and schemas available at http://www.web3d.org/specifications"/>
+ <echo message="X3D DTDs and schemas available at https://www.web3d.org/specifications"/>
<!-- TODO need to try increasing stack space to 16m, fullchecking true results in java.lang.StackOverflowError
at com.sun.org.apache.xerces.internal.impl.xpath.regex.RegularExpression.matchString(RegularExpression.java:1903) -->
<schemavalidate failonerror="false" fullchecking="true" lenient="false" warn="true"
@@ -2021,7 +2021,7 @@ ignoreSetupDownloadErrors=true
<target name="validate.schema.new" description="XML validation for new or modified .x3d examples using X3D schema as declared in scenes"
depends="clean.duplicates">
<echo message="Validate using X3D schema as declared in scenes: ${archive.name} archive, new scenes"/>
- <echo message="X3D DTDs and schemas available at http://www.web3d.org/specifications"/>
+ <echo message="X3D DTDs and schemas available at https://www.web3d.org/specifications"/>
<for param="file.path.name">
<path>
<fileset refid="x3dScenes"/>
@@ -2074,7 +2074,7 @@ ignoreSetupDownloadErrors=true
depends="clean.duplicates">
<!-- X3D schema validation -->
<echo message="Validate using X3D schema as declared in scenes,saxonicaSA: ${archive.name} archive"/>
- <echo message="http://www.web3d.org/specifications http://www.saxonica.com"/>
+ <echo message="https://www.web3d.org/specifications https://www.saxonica.com"/>
<for param="file.path.name">
<path>
<fileset refid="x3dScenes"/>
@@ -2091,7 +2091,7 @@ ignoreSetupDownloadErrors=true
<target name="validate.schematron" description="validate each .x3d scene using X3D Schematron rules (caution: time consuming unless xmlcatalog points to local copy)"
depends="get.saxon,clean.duplicates">
<echo message="Validate using X3D Schematron: ${archive.name} archive"/>
- <echo message="http://www.web3d.org/x3d/tools/schematron/X3dSchematron.html"/>
+ <echo message="https://www.web3d.org/x3d/tools/schematron/X3dSchematron.html"/>
<for param="file.path.name">
<path>
<fileset refid="x3dScenes"/>
@@ -2172,8 +2172,8 @@ ignoreSetupDownloadErrors=true
</target>
<!-- prerequisite: xmllint installed on system path.
- provided as part of libxml library, http://xmlsoft.org
- suggested installation for Windows is cygwin, http://cygwin.com -->
+ provided as part of libxml library, https://xmlsoft.org
+ suggested installation for Windows is cygwin, https://cygwin.com -->
<!-- TODO: not working
-->
<target name="validate.xmllint">
@@ -2200,7 +2200,7 @@ ignoreSetupDownloadErrors=true
<arg value="--version"/><!-- display the version of the XML library used -->
<arg value="--valid"/> <!-- validate the document in addition to std well-formed check -->
<arg value="--noout"/> <!-- don't output the result tree -->
- <!-- <arg value="- -dtdvalid http://www.web3d.org/specifications/x3d-4.0.dtd"/>
+ <!-- <arg value="- -dtdvalid https://www.web3d.org/specifications/x3d-4.0.dtd"/>
do a posteriori validation against a given DTD -->
<arg value="${path.scene}/${filename.prefix}.x3d"/>
</exec>
@@ -2912,14 +2912,14 @@ ignoreSetupDownloadErrors=true
<target name="processScenes.regularExpressionChecks" description="find offensive lines using regexes">
<property name="regexNegativeLookBehinds" value="(?<!address=)(?<!pecification)(?<!ection)(?<!aragraph)(?<!CosmoPlayer)(?<!CAD Exchanger)"/>
<!-- (?<!address=) is a "negative lookbehind" to filter out strings starting with address= (that appear in the same line, remainder model still gets searched OK -->
- <!-- http://stackoverflow.com/questions/977251/regular-expressions-and-negating-a-whole-character-group -->
+ <!-- https://stackoverflow.com/questions/977251/regular-expressions-and-negating-a-whole-character-group -->
<!-- these regexes track common pathologies like multiple decimal points (i.e. missing whitespace), leading zeroes, etc. -->
<property name="regexGarbledFloats" value="(\s|,|"|')(((\+|-)?((\.\d+)|(\d+\.\d*))((E|e)(\+|-)?\d+)?(\.|\+|-)+(\d*))|(\d+((\+|-)\d+)+))(\s|,|"|')"/>
<property name="regexLeadingZeroes" value="(\s|,|"|')(\+|-)?0\d+(\.\d*)?((E|e)(\+|-)?\d+)?(\s|,|"|')"/>
- <!-- reference: X3dValuesRegexChecker.java http://www.web3d.org/x3d/tools/canonical/src/org/web3d/x3d/tools/X3dValuesRegexChecker.java -->
- <!-- reference: X3dToolsConstants.java http://www.web3d.org/x3d/tools/canonical/src/org/web3d/x3d/tools/X3dToolsConstants.java -->
- <!-- reference: X3dValuesRegexChecker.java http://www.web3d.org/x3d/tools/X3dValidator/src/java/org/web3d/x3d/tools/X3dValuesRegexChecker.java -->
- <!-- reference: X3dToolsConstants.java http://www.web3d.org/x3d/tools/X3dValidator/src/java/org/web3d/x3d/tools/X3dToolsConstants.java -->
+ <!-- reference: X3dValuesRegexChecker.java https://www.web3d.org/x3d/tools/canonical/src/org/web3d/x3d/tools/X3dValuesRegexChecker.java -->
+ <!-- reference: X3dToolsConstants.java https://www.web3d.org/x3d/tools/canonical/src/org/web3d/x3d/tools/X3dToolsConstants.java -->
+ <!-- reference: X3dValuesRegexChecker.java https://www.web3d.org/x3d/tools/X3dValidator/src/java/org/web3d/x3d/tools/X3dValuesRegexChecker.java -->
+ <!-- reference: X3dToolsConstants.java https://www.web3d.org/x3d/tools/X3dValidator/src/java/org/web3d/x3d/tools/X3dToolsConstants.java -->
<concat>
<!-- destfile not specified, so concat goes to console -->
<header filtering="no" trimleading="yes">==============================================
@@ -3684,7 +3684,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
</target>
<target name="view.javadoc.online" description="view local package javadoc in web browser (Netbeans only)">
- <nbbrowse url="http://www.web3d.org/x3d/content/examples/${archive.name}/javadoc" /> <!-- do not follow with /index.html -->
+ <nbbrowse url="https://www.web3d.org/x3d/content/examples/${archive.name}/javadoc" /> <!-- do not follow with /index.html -->
<!-- TODO implementation-independent approach if possible. other Ant approachs have to be customized for each OS -->
</target>
@@ -3694,7 +3694,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
</target>
<target name="view.examples.online" description="view online examples in web browser (Netbeans only)">
- <nbbrowse url="http://www.web3d.org/x3d/content/examples/${archive.name}" />
+ <nbbrowse url="https://www.web3d.org/x3d/content/examples/${archive.name}" />
<!-- TODO implementation-independent approach if possible. other Ant approachs have to be customized for each OS -->
</target>
@@ -4064,7 +4064,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
<exclude name="Tools/Terrain/GeoManager.*"/>
<!-- SavageDefense -->
<exclude name="qrcode/**/*.*"/>
- <!-- http://ant.apache.org/manual/Tasks/javac.html#bootstrap -->
+ <!-- https://ant.apache.org/manual/Tasks/javac.html#bootstrap -->
<!-- https://stackoverflow.com/questions/4134803/ant-passing-compilerarg-into-javac -->
<!-- https://stackoverflow.com/questions/20174355/how-class-loading-is-done-by-using-xbootclasspath-ppath -->
<!-- https://stackoverflow.com/questions/48148607/how-to-add-a-jar-to-the-boot-classpath-in-java-9 -->
@@ -4340,7 +4340,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
version="${javadoc.version}"
Windowtitle="${javadoc.windowtitle}">
<!-- TODO
- http://stackoverflow.com/questions/10519558/createprocess-error-206-the-filename-or-extension-is-too-long-when-running-main
+ https://stackoverflow.com/questions/10519558/createprocess-error-206-the-filename-or-extension-is-too-long-when-running-main
sourcepath="${src.org.web3d.x3d.sai}"
useexternalfile="true"