diff --git a/jars/xj3d-2.3-3rdparty-nps.jar b/jars/xj3d-2.3-3rdparty-nps.jar index d2208a957cc7b18f0f06c4dda13796ca6546be37..22229903bac057ed4e6c69fa1232a5d38b391e2f 100644 Binary files a/jars/xj3d-2.3-3rdparty-nps.jar and b/jars/xj3d-2.3-3rdparty-nps.jar differ diff --git a/jars/xj3d-2.3-nps-src.jar b/jars/xj3d-2.3-nps-src.jar index d2f407a5f2d761e6b4b814d0b47f53cdd459ebcc..fa8d3525f2e1b31f11c608269374a424d7da65ed 100644 Binary files a/jars/xj3d-2.3-nps-src.jar and b/jars/xj3d-2.3-nps-src.jar differ diff --git a/jars/xj3d-2.3-nps.jar b/jars/xj3d-2.3-nps.jar index 8e2d017a5752cdf112e4b13aa6981925cde19b96..42e2f3bdeaa0040118d3aa0b68bca4e53d7a1804 100644 Binary files a/jars/xj3d-2.3-nps.jar and b/jars/xj3d-2.3-nps.jar differ diff --git a/jars/xj3d.browser_2.3.0-nps-src.jar b/jars/xj3d.browser_2.3.0-nps-src.jar index 1be5dcbefe507df088821903def1345fc260d769..eee6067d3cdb80c93efb046396fc32ef181f5da6 100644 Binary files a/jars/xj3d.browser_2.3.0-nps-src.jar and b/jars/xj3d.browser_2.3.0-nps-src.jar differ diff --git a/jars/xj3d.browser_2.3.0-nps.jar b/jars/xj3d.browser_2.3.0-nps.jar index 114f93c6d1dc16e97e104c805b0a43abecdab32f..5e7d533b48b61f7690ecd622090efeb6ef9e1766 100644 Binary files a/jars/xj3d.browser_2.3.0-nps.jar and b/jars/xj3d.browser_2.3.0-nps.jar differ diff --git a/jars/xj3d.cadfilter_2.3.0-nps-src.jar b/jars/xj3d.cadfilter_2.3.0-nps-src.jar index d7e50c25efe18897e8b241006b5362bbfcc8729c..64e08117317f2afc4d12335178eccdca7792e244 100644 Binary files a/jars/xj3d.cadfilter_2.3.0-nps-src.jar and b/jars/xj3d.cadfilter_2.3.0-nps-src.jar differ diff --git a/jars/xj3d.cadfilter_2.3.0-nps.jar b/jars/xj3d.cadfilter_2.3.0-nps.jar index e07782be40e83f6cd652a7c87a8dec8412fd4516..0e95b2cd8254ac6249a30c969094be75186748f1 100644 Binary files a/jars/xj3d.cadfilter_2.3.0-nps.jar and b/jars/xj3d.cadfilter_2.3.0-nps.jar differ diff --git a/jars/xj3d.replica_2.3.0-nps-src.jar b/jars/xj3d.replica_2.3.0-nps-src.jar index d28bd1928d8d3912e553767a355f9ea3290fd6b4..59de941b324bcba31bef629198772049dfb7e0cf 100644 Binary files a/jars/xj3d.replica_2.3.0-nps-src.jar and b/jars/xj3d.replica_2.3.0-nps-src.jar differ diff --git a/jars/xj3d.replica_2.3.0-nps.jar b/jars/xj3d.replica_2.3.0-nps.jar index e720a1db532da1ea3ad7923500a117fba9ddf763..06073669aded71a38ad7e73adbddb59edbf388af 100644 Binary files a/jars/xj3d.replica_2.3.0-nps.jar and b/jars/xj3d.replica_2.3.0-nps.jar differ diff --git a/src/java/org/web3d/util/Version.java b/src/java/org/web3d/util/Version.java deleted file mode 100644 index ae5c3d128f187e16a63539ba30b796818a6e74f2..0000000000000000000000000000000000000000 --- a/src/java/org/web3d/util/Version.java +++ /dev/null @@ -1,132 +0,0 @@ -/* -Copyright (c) 1995-2022 held by the author(s). All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - * Neither the names of the Naval Postgraduate School (NPS) - Modeling Virtual Environments and Simulation (MOVES) Institute - (http://www.nps.edu and http://www.movesinstitute.org) - nor the names of its contributors may be used to endorse or - promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -*/ -package org.web3d.util; - -import java.util.PropertyResourceBundle; -import java.util.ResourceBundle; - -/** - * Creates the version stamp information when built via regex updates from Ant - * @version $Id: Version.java 12564M 2019-12-13 20:12:38Z (local) $ - * @author <a href="mailto:tdnorbra@nps.edu?subject=org.web3d.util.Version">Terry Norbraten</a> - */ -public class Version { - - /** These must be programmatically changed by the developer */ - public static final String BUILD_MAJOR_VERSION = getProjectProperties().getString("product.version.major"); - public static final String BUILD_MINOR_VERSION = getProjectProperties().getString("product.version.level") + "-nps"; - public static final String JAVA_VERSION = System.getProperty("java.version"); - - /** These strings are set by the timestamp task in the build file - * so need not be modified here - */ - public static final String BUILD_DSTAMP = "20090227"; - public static final String BUILD_TSTAMP = "1407"; - public static final String BUILD_TODAY = "February 27 2009"; - - public static final String SP = " "; - public static final String PERIOD = "."; - - private static final String DIS_VER = getProjectProperties().getString("open.dis.ver"); - public static final String OPEN_DIS_VERSION = "NPS Open DIS v" + DIS_VER; - - /** Customizable message to be displayed, must first be initialized by class constructor */ - public static String DEVELOPER_CUSTOM_MESSAGE; - - /** Customizable message to be displayed, must first be initialized by class constructor */ - public static String AVIATRIX3D_VERSION; - - /** Customizable message to be displayed, must first be initialized by class constructor */ - public static String JOGL_VERSION; - - // https://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html - public static final String OS_JAVA_VERSION_MESSAGE = "Operating system: " + System.getProperty("os.name") + SP + System.getProperty("os.version") + "\n" + - "Java environment: " + System.getProperty("java.vendor") + SP + JAVA_VERSION + "\n"; - /** - * The release version, must first be initialized by class constructor. Milestone format will be - * <code>M<i>MainVersion</i>_<i>DevRelease#</i></code> - */ - public static String XJ3D_VERSION; - /** - * Static constructor block to initialize exception-prone constants - * https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html - * https://stackoverflow.com/questions/2420389/static-initialization-blocks - */ - static - { - if (org.j3d.aviatrix3d.Aviatrix3dVersion.getInstance() != null) - AVIATRIX3D_VERSION = org.j3d.aviatrix3d.Aviatrix3dVersion.getInstance().toString(); // TODO correct method? - else AVIATRIX3D_VERSION = "(*** error, org.j3d.aviatrix3d.Aviatrix3dVersion not found)"; - - if (com.jogamp.opengl.JoglVersion.getInstance() != null) - JOGL_VERSION = com.jogamp.opengl.JoglVersion.getInstance().toString(); // TODO correct method? - else JOGL_VERSION = "(*** error, com.jogamp.opengl.JoglVersion not found)"; - - DEVELOPER_CUSTOM_MESSAGE = "utilizing " + OPEN_DIS_VERSION + - "\nwith 3D rendering by\n" + AVIATRIX3D_VERSION + - "\non top of\n" + JOGL_VERSION; - - XJ3D_VERSION = "v" + BUILD_MAJOR_VERSION + PERIOD + - BUILD_MINOR_VERSION + SP + DEVELOPER_CUSTOM_MESSAGE + SP + "\n" + - OS_JAVA_VERSION_MESSAGE + - "\nBuildStamp time and date:" + SP + BUILD_TSTAMP + SP + "on" + SP + BUILD_TODAY; - } - - /** - * Constructor to finish initializations, if any - */ - public Version() - { - // all initializations handled in static block - } - - /** - * <p>Project specific Project properties resourced from - * configuration/project.properties. These are not expected to dynamically - * change during runtime.</p> - * @return specific Project properties resourced from config/xj3d.properties - */ - public static ResourceBundle getProjectProperties() { - return PropertyResourceBundle.getBundle("config.xj3d"); - } - - /** - * Command line entry point for this class - * @param args command line arguments if any - */ - public static void main(String args[]) { - System.out.println("Xj3D" + SP + XJ3D_VERSION); - } - -} // end class file Version.java