Maven, offline mode, and --enable-mongoose (#939)

closes #938 
closes #941 
closes #943

.disabled_workflows/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
         apt-get install -y git bison curl flex g++ libx11-dev libxml2-dev libxt-dev
         libmotif-common libmotif-dev make openjdk-8-jdk python2.7-dev swig
         zlib1g-dev llvm llvm-dev clang libclang-dev libudunits2-dev
-        libgtest-dev cmake
+        libgtest-dev cmake maven
         
     - name: Build gtest
       run: cd /usr/src/gtest && cmake . && make && cp libgtest* /usr/lib/
@@ -46,7 +46,7 @@ jobs:
         apt-get install -y git bison curl flex g++ libx11-dev libxml2-dev libxt-dev
         libmotif-common libmotif-dev make openjdk-8-jdk python2.7-dev swig
         zlib1g-dev llvm llvm-dev clang libclang-dev libudunits2-dev
-        libgtest-dev cmake
+        libgtest-dev cmake maven
         
     - name: Build gtest
       run: cd /usr/src/gtest && cmake . && make && cp libgtest* /usr/lib/
@@ -74,7 +74,7 @@ jobs:
         apt-get install -y git bison curl flex g++ libx11-dev libxml2-dev libxt-dev
         libmotif-common libmotif-dev make openjdk-8-jdk python2.7-dev swig
         zlib1g-dev llvm llvm-dev clang libclang-dev libudunits2-dev
-        libgtest-dev cmake
+        libgtest-dev cmake maven
         
     - name: Build gtest
       run: cd /usr/src/gtest && cmake . && make && cp libgtest* /usr/lib/
@@ -106,7 +106,7 @@ jobs:
       run: |
         # sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.15.pkg -target /
         brew cask install xquartz
-        brew install llvm swig udunits openmotif
+        brew install llvm swig udunits openmotif maven
     - name: Build Trick
       run: |
         export MAKEFLAGS=-j4
@@ -134,7 +134,7 @@ jobs:
         llvm llvm-devel llvm-static libxml2-devel libX11-devel libXt-devel 
         ncurses-devel openmotif openmotif-devel perl perl-Digest-MD5 
         python-devel swig zlib-devel udunits2 udunits2-devel 
-        java-1.8.0-openjdk-devel gtest-devel
+        java-1.8.0-openjdk-devel gtest-devel maven
     - name: Build Trick
       run: |
         export MAKEFLAGS=-j4
@@ -156,7 +156,7 @@ jobs:
         dnf install -y git bison flex gcc gcc-c++ libxml2-devel make openmotif
         openmotif-devel python-devel perl swig zlib-devel llvm llvm-devel llvm-static
         clang clang-devel perl-Text-Balanced perl-Digest-MD5 udunits2 udunits2-devel
-        java-1.8.0-openjdk-devel ncurses-devel which
+        java-1.8.0-openjdk-devel ncurses-devel maven which
     
     - name: Install gtest
       run:  dnf install -y gtest-devel

.gitignore

@@ -31,4 +31,4 @@ include/mongoose/
 trick_source/web/HttpServer/mongoose.c
 trick_source/web/HttpServer/mongoose.h
 trick_source/web/HttpServer/obj/
-
+trick-offline

CMakeLists.txt

@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.1)
 project(trick)
 set(TRICK_MAJOR 19)
-set(TRICK_MINOR 1)
+set(TRICK_MINOR 0)
-set(TRICK_TINY dev)
+set(TRICK_TINY 1)
-
+#set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -32,6 +32,7 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
 include(UseJava)
 find_package(Java REQUIRED)
+find_package(Maven REQUIRED)
 find_package(BISON REQUIRED)
 find_package(FLEX REQUIRED)
 find_package(LLVM 3.4 REQUIRED)
@@ -385,5 +386,5 @@ add_subdirectory(trick_source/codegen/Interface_Code_Gen)
 add_subdirectory(trick_source/er7_utils)
 add_subdirectory(trick_source/sim_services)
 add_subdirectory(trick_source/trick_utils)
-add_subdirectory(trick_source/java/src)
+add_subdirectory(trick_source/java)
 add_subdirectory(trick_source/data_products)

CMakeModules/FindMaven.cmake

@@ -0,0 +1,16 @@
+
+# FindMaven
+# --------
+#
+# Find mvn
+#
+# This module looks for mvn.  This module defines the following values:
+#
+# ::
+#
+#   MAVEN_EXECUTABLE: the full path to the tee tool.
+#   MAVEN_FOUND: True if tee has been found.
+
+find_program(MAVEN_EXECUTABLE mvn)
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MAVEN REQUIRED_VARS MAVEN_EXECUTABLE)

Makefile

@@ -142,13 +142,18 @@ ICG_EXE := ${TRICK_HOME}/bin/trick-ICG
 ################################################################################
 # DEFAULT TARGET
 # 1 Build Trick-core and Trick Data-products.
-all: no_dp webserver dp
+all: no_dp dp
 	@ echo ; echo "Trick compilation complete:" ; date
 
 ifeq ($(USE_JAVA), 1)
 all: java
 endif
 
+ifeq ($(TRICK_MONGOOSE), 1)
+all: webserver
+icg_sim_serv: ${TRICK_HOME}/include/mongoose/mongoose.h
+ICG: ${TRICK_HOME}/include/mongoose/mongoose.h
+endif
 #-------------------------------------------------------------------------------
 # 1.1 Build Trick-core
 no_dp: $(TRICK_LIB) $(TRICK_SWIG_LIB)
@@ -185,7 +190,7 @@ $(ER7_UTILS_DIRS): icg_sim_serv
 # 1.1.1.4 Generate interface code (using ICG) for the specified sim_services
 # header files.
 .PHONY: icg_sim_serv
-icg_sim_serv: $(ICG_EXE) ${TRICK_HOME}/include/mongoose/mongoose.h
+icg_sim_serv: $(ICG_EXE)
 	${ICG_EXE} -sim_services -m ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh
 
 # 1.1.1.4.1 Build the Interface Code Generator (ICG) executable.
@@ -214,10 +219,9 @@ dp: ${TRICK_HOME}/trick_source/trick_utils/units
 #
 .PHONY: webserver
 webserver: ${TRICK_LIB_DIR}/libmongoose.a ${TRICK_HOME}/include/mongoose/mongoose.h
-	@ $(MAKE) -C ${TRICK_HOME}/trick_source/web/HttpServer
+	$(MAKE) -C ${TRICK_HOME}/trick_source/web/HttpServer
 
 #-------------------------------------------------------------------------------
-TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/mongoose
 
 mongoose.h:
 	curl --retry 4 -O https://raw.githubusercontent.com/cesanta/mongoose/6.16/mongoose.h
@@ -225,30 +229,67 @@ mongoose.h:
 mongoose.c:
 	curl --retry 4 -O https://raw.githubusercontent.com/cesanta/mongoose/6.16/mongoose.c
 
+${TRICK_LIB_DIR}/libmongoose.a: ${TRICK_HOME}/include/mongoose/mongoose.h | mongoose.o $(TRICK_LIB_DIR)
+	ar crs $@ mongoose.o
+	@ rm mongoose.o
+	@ rm -f mongoose.h
+	@ echo ; echo "Mongoose library compiled:" ; date
+
+ifeq (${TRICK_OFFLINE}, 0)
+
 mongoose.o: mongoose.h mongoose.c
 	$(CC) $(TRICK_CFLAGS) -c -o mongoose.o mongoose.c
-	rm mongoose.c
+	@ rm mongoose.c
-
-${TRICK_LIB_DIR}/libmongoose.a: mongoose.o ${TRICK_HOME}/include/mongoose/mongoose.h | $(TRICK_LIB_DIR)
-	ar crs $@ mongoose.o
-	rm mongoose.o
-	rm mongoose.h
-	@ echo ; echo "Mongoose library compiled:" ; date
 
 ${TRICK_HOME}/include/mongoose/mongoose.h: mongoose.h | ${TRICK_HOME}/include/mongoose
 	@ cp mongoose.h $@
 
+else
+
+# if trick-offline gets updated, we should rebuild libmongoose
+${TRICK_LIB_DIR}/libmongoose.a: ${TRICK_HOME}/trick-offline/mongoose.h ${TRICK_HOME}/trick-offline/mongoose.c
+
+mongoose.o: ${TRICK_HOME}/trick-offline/mongoose.h ${TRICK_HOME}/trick-offline/mongoose.c
+	$(CC) $(TRICK_CFLAGS) -c -I${TRICK_HOME}/trick-offline -o mongoose.o ${TRICK_HOME}/trick-offline/mongoose.c
+
+${TRICK_HOME}/include/mongoose/mongoose.h: ${TRICK_HOME}/trick-offline/mongoose.h | ${TRICK_HOME}/include/mongoose
+	@ cp ${TRICK_HOME}/trick-offline/mongoose.h $@
+endif
+
 ${TRICK_HOME}/include/mongoose: 
 	@ mkdir $@
 
 #-------------------------------------------------------------------------------
 # 1.3 Build Trick's Java Tools
+
+ifeq (${TRICK_OFFLINE}, 0)
 java:
 	@ $(MAKE) -C ${TRICK_HOME}/trick_source/java
 
 .PHONY: javadoc
 javadoc:
 	@ $(MAKE) -C ${TRICK_HOME}/trick_source/java $@
+else
+JAVA_BUILD_DIR = ${TRICK_HOME}/libexec/trick/java/build
+JAVA_SOURCE_DIR = ${TRICK_HOME}/trick-offline
+JARS = DP Dre JXPlot MM MTV QP Sie SimControl SimSniffer TrickView trick-java-${TRICK_VERSION}
+JAR_TARGETS = $(foreach JAR, $(JARS), ${JAVA_BUILD_DIR}/$(JAR).jar)
+
+define JAR_FUN
+$${JAVA_BUILD_DIR}/$(1).jar: $${JAVA_SOURCE_DIR}/$(1).jar | $${JAVA_BUILD_DIR}
+	cp $$< $$@
+
+endef
+
+$(foreach JAR,$(JARS),$(eval $(call JAR_FUN,$(JAR))))
+
+${JAVA_BUILD_DIR}: 
+	mkdir -p ${TRICK_HOME}/libexec/trick/java/build
+
+java: ${JAR_TARGETS} 
+	@echo offline mode: java code copied successfully
+
+endif
 
 #-------------------------------------------------------------------------------
 # 1.4 This target builds the Trick Documentation.
@@ -425,7 +466,7 @@ uninstall:
 ################################################################################
 # ICG all sim_services files (for testing and debugging ICG).
 # The -f flag forces io_src files to be regenerated whether or not they need to be.
-ICG: $(ICG_EXE) ${TRICK_HOME}/include/mongoose/mongoose.h
+ICG: $(ICG_EXE)
 	$(ICG_EXE) -f -s -m -n ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh
 
 # This builds a tricklib share library.

autoconf/configure.ac

@@ -167,6 +167,10 @@ AC_DEFUN([AX_JAVA],[
          [AC_MSG_RESULT([no])
           AC_MSG_ERROR([Trick requires javac version >= 1.8])
          ])
+        AS_IF([test "$TRICK_OFFLINE" = "0"], [
+          AC_PATH_PROG(MVN, mvn, nomvn)
+          AS_IF([test "$ac_cv_path_MVN" = "nomvn"],AC_MSG_ERROR([could not find maven]),[])
+        ], [])
      ],[])
 ])
 
@@ -283,6 +287,44 @@ AC_ARG_ENABLE([32bit],
 )
 AC_SUBST([TRICK_FORCE_32BIT])
 
+# If offline is specified, set some compilation flags
+AC_ARG_ENABLE([offline],
+  AS_HELP_STRING([--enable-offline], [Compile Trick in offline mode. Un-tar the trick-offline directory in TRICK_HOME to use this feature]),
+  AS_IF([test "x$enable_offline" = xyes],
+    [TRICK_OFFLINE="1"], 
+    [TRICK_OFFLINE="0"]
+  ),
+  [TRICK_OFFLINE="0"]
+)
+AC_SUBST([TRICK_OFFLINE])
+
+# If offline is specified, set some compilation flags
+AC_ARG_ENABLE([mongoose],
+  AS_HELP_STRING([--enable-mongoose], [Compile Trick with webserver capabilites.]),
+  AS_IF([test "x$enable_mongoose" = xyes],
+    [
+    TRICK_MONGOOSE="1"
+    AC_MSG_WARN($(tput setaf 1) --enable-mongoose Mongoose is released under GPLv2 and Trick is \
+released under NASA Open Source Agreement 1.3. Distribution must comply with \
+these agreements$(tput sgr0))
+    ], 
+    [TRICK_MONGOOSE="0"]
+  ),
+  [TRICK_MONGOOSE="0"]
+)
+AC_SUBST([TRICK_MONGOOSE])
+
+# If offline is specified, set some compilation flags
+AC_ARG_ENABLE([offline],
+  AS_HELP_STRING([--enable-offline], [Compile Trick in offline mode. Un-tar the trick-offline directory in TRICK_HOME to use this feature]),
+  AS_IF([test "x$enable_offline" = xyes],
+    [TRICK_OFFLINE="1"], 
+    [TRICK_OFFLINE="0"]
+  ),
+  [TRICK_OFFLINE="0"]
+)
+AC_SUBST([TRICK_OFFLINE])
+
 dnl look for programs we need to compile and run
 AC_PROG_AWK
 AC_PROG_CC

bin/trick-dp

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Trick DP", "trick.dataproducts.trickdp.TrickDPApplication") ;
+launch_java("Trick DP", "DP") ;
 

bin/trick-dre

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Data Recording Editor", "trick.dre.DreApplication") ;
+launch_java("Data Recording Editor", "Dre") ;
 

bin/trick-jxplot

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Trick Plot", "trick.dataproducts.plot.JXPlotApplication") ;
+launch_java("Trick Plot", "JXPlot") ;
 

bin/trick-mm

@@ -4,6 +4,6 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Monte Monitor", "trick.montemonitor.MonteMonitorApplication") ;
+launch_java("Monte Monitor", "MM") ;
 
 

bin/trick-mtv

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Event/Malvunction Trick View", "trick.mtv.MtvApp") ;
+launch_java("Event/Malvunction Trick View", "MTV") ;
 

bin/trick-qp

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Trick QP", "trick.dataproducts.trickqp.TrickQPApplication") ;
+launch_java("Trick QP", "QP") ;
 

bin/trick-sie

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("SIE", "trick.sie.SieApplication") ;
+launch_java("SIE", "Sie") ;
 

bin/trick-simcontrol

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Sim Control", "trick.simcontrol.SimControlApplication") ;
+launch_java("Sim Control", "SimControl") ;
 

bin/trick-sniffer

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Sim Sniffer", "trick.sniffer.SimSnifferApplication") ;
+launch_java("Sim Sniffer", "SimSniffer") ;
 

bin/trick-tv

@@ -4,5 +4,5 @@ use FindBin qw($RealBin);
 use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
 use launch_java ;
 
-launch_java("Trick View", "trick.tv.TVApplication") ;
+launch_java("Trick View", "TrickView") ;
 

configure

@@ -640,6 +640,7 @@ PTHREAD_LIBS
 PTHREAD_CC
 ax_pthread_config
 CPP
+MVN
 JAVA_CC_OPTS
 GCJ_OPTS
 ac_ct_JAVA_CC
@@ -650,8 +651,8 @@ SWIG_LIB
 SWIG
 SWIG_BIN
 GNUPLOT
-PYTHON_EXTRA_LIBS
 PYTHON_EXTRA_LDFLAGS
+PYTHON_EXTRA_LIBS
 PYTHON_SITE_PKG
 PYTHON_LIBS
 PYTHON_CPPFLAGS
@@ -673,6 +674,8 @@ ac_ct_CC
 CFLAGS
 CC
 AWK
+TRICK_MONGOOSE
+TRICK_OFFLINE
 TRICK_FORCE_32BIT
 LIBXML
 X_LIB_DIR
@@ -717,6 +720,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -741,6 +745,8 @@ ac_user_opts='
 enable_option_checking
 with_x
 enable_32bit
+enable_offline
+enable_mongoose
 with_swig
 enable_java
 with_llvm
@@ -809,6 +815,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1061,6 +1068,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1198,7 +1214,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1351,6 +1367,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1389,6 +1406,10 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-32bit          Force Trick and sims to compile 32bit
+  --enable-offline        Compile Trick in offline mode. Un-tar the
+                          trick-offline directory in TRICK_HOME to use this
+                          feature
+  --enable-mongoose       Compile Trick with webserver capabilites.
   --enable-java           use java (default is yes)
   --enable-er7utils       use er7_utils (default is yes)
 
@@ -3822,6 +3843,62 @@ fi
 
 
 
+# If offline is specified, set some compilation flags
+# Check whether --enable-offline was given.
+if test "${enable_offline+set}" = set; then :
+  enableval=$enable_offline; if test "x$enable_offline" = xyes; then :
+  TRICK_OFFLINE="1"
+else
+  TRICK_OFFLINE="0"
+
+fi
+else
+  TRICK_OFFLINE="0"
+
+fi
+
+
+
+# If offline is specified, set some compilation flags
+# Check whether --enable-mongoose was given.
+if test "${enable_mongoose+set}" = set; then :
+  enableval=$enable_mongoose; if test "x$enable_mongoose" = xyes; then :
+
+    TRICK_MONGOOSE="1"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $(tput setaf 1) --enable-mongoose Mongoose is released under GPLv2 and Trick is \
+released under NASA Open Source Agreement 1.3. Distribution must comply with \
+these agreements$(tput sgr0)" >&5
+$as_echo "$as_me: WARNING: $(tput setaf 1) --enable-mongoose Mongoose is released under GPLv2 and Trick is \
+released under NASA Open Source Agreement 1.3. Distribution must comply with \
+these agreements$(tput sgr0)" >&2;}
+
+else
+  TRICK_MONGOOSE="0"
+
+fi
+else
+  TRICK_MONGOOSE="0"
+
+fi
+
+
+
+# If offline is specified, set some compilation flags
+# Check whether --enable-offline was given.
+if test "${enable_offline+set}" = set; then :
+  enableval=$enable_offline; if test "x$enable_offline" = xyes; then :
+  TRICK_OFFLINE="1"
+else
+  TRICK_OFFLINE="0"
+
+fi
+else
+  TRICK_OFFLINE="0"
+
+fi
+
+
+
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5612,13 +5689,13 @@ $as_echo "$PYTHON_SITE_PKG" >&6; }
 	#
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5
 $as_echo_n "checking python extra libraries... " >&6; }
-	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+	if test -z "$PYTHON_EXTRA_LIBS"; then
-	   PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
                 conf = distutils.sysconfig.get_config_var; \
                 print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5
-$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
+$as_echo "$PYTHON_EXTRA_LIBS" >&6; }
 
 
 	#
@@ -5626,13 +5703,13 @@ $as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
 	#
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5
 $as_echo_n "checking python extra linking flags... " >&6; }
-	if test -z "$PYTHON_EXTRA_LIBS"; then
+	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-		PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
 			conf = distutils.sysconfig.get_config_var; \
 			print (conf('LINKFORSHARED'))"`
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
-$as_echo "$PYTHON_EXTRA_LIBS" >&6; }
+$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
 
 
 	#
@@ -6097,6 +6174,54 @@ $as_echo "no" >&6; }
 
   fi
 
+        if test "$TRICK_OFFLINE" = "0"; then :
+
+          # Extract the first word of "mvn", so it can be a program name with args.
+set dummy mvn; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MVN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MVN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MVN="$MVN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_MVN="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_MVN" && ac_cv_path_MVN="nomvn"
+  ;;
+esac
+fi
+MVN=$ac_cv_path_MVN
+if test -n "$MVN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MVN" >&5
+$as_echo "$MVN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+          if test "$ac_cv_path_MVN" = "nomvn"; then :
+  as_fn_error $? "could not find maven" "$LINENO" 5
+fi
+
+fi
 
 fi
 

docs/documentation/install_guide/Install-Guide.md

@@ -29,6 +29,7 @@ Trick requires various free third party utilities in order to function. All the
 [make]: https://www.gnu.org/software/make/
 [openmotif]: http://www.opengroup.org/openmotif/
 [udunits]: https://www.unidata.ucar.edu/software/udunits/
+[maven]: https://maven.apache.org/
 
 ## Notes
 ### Clang/LLVM compiler and libraries
@@ -78,7 +79,7 @@ Trick also requires development packages from the base and epel repositories
 ```bash
 # From the base repository
 yum install bison flex gcc gcc-c++ libxml2-devel make ncurses-devel \
- openmotif openmotif-devel python-devel perl perl-Digest-MD5 swig zlib-devel 
+ openmotif openmotif-devel python-devel perl perl-Digest-MD5 swig maven zlib-devel 
 #UDUnits is required and is in the EPEL repository
 yum install udunits2 udunits2-devel
 ```
@@ -124,7 +125,7 @@ Trick also requires development packages from the base and epel repositories
 ```bash
 # From the base repository
 yum install bison flex gcc gcc-c++ libxml2-devel make \
- openmotif openmotif-devel python-devel perl swig zlib-devel
+ openmotif openmotif-devel python-devel perl swig maven zlib-devel
 #UDUnits is required and is in the EPEL repository
 yum install udunits2 udunits2-devel
 ```
@@ -152,7 +153,7 @@ Trick requires development packages from the base repositories.
 
 ```bash
 dnf install bison flex gcc gcc-c++ libxml2-devel make openmotif \
- openmotif-devel python-devel perl swig zlib-devel llvm llvm-devel \
+ openmotif-devel python-devel perl swig maven zlib-devel llvm llvm-devel \
  llvm-static clang clang-devel perl-Text-Balanced perl-Digest-MD5 \
  udunits2 udunits2-devel ncurses-devel
 ```
@@ -176,7 +177,7 @@ All packages required for Trick may be installed through apt-get.
 
 ```bash
 sudo apt-get install bison curl flex g++ libx11-dev libxml2-dev libxt-dev \
- libmotif-common libmotif-dev make openjdk-8-jdk python2.7-dev swig \
+ libmotif-common libmotif-dev make openjdk-8-jdk python2.7-dev swig maven \
  zlib1g-dev llvm llvm-dev clang libclang-dev libudunits2-dev
 ```
 
@@ -234,7 +235,7 @@ brew cask install java xquartz
 6. Finally, install the remaining dependencies.
 
 ```bash
-brew install llvm swig udunits openmotif  
+brew install llvm swig maven udunits openmotif  
 ```
 
 Openmotif may install dependent packages that conflict with other installations, fontconfig and freetype.  Use the following command to skip installing these packages if you encounter conflicts.
@@ -279,7 +280,7 @@ brew cask install java xquartz
 5. Finally, install the remaining dependencies.
 
 ```bash
-brew install llvm swig udunits openmotif  
+brew install llvm swig maven udunits openmotif  
 ```
 
 Openmotif may install dependent packages that conflict with other installations, fontconfig and freetype.  Use the following command to skip installing these packages if you encounter conflicts.
@@ -306,7 +307,7 @@ brew install llvm@5
 sudo apt-get update
 sudo apt install bison curl flex g++ libx11-dev libxml2-dev \
  libxt-dev libxtst6 libxi6 libmotif-common libmotif-dev make python2.7-dev \
- swig zlib1g-dev llvm-6.0-dev llvm clang libclang-dev libudunits2-dev
+ swig maven zlib1g-dev llvm-6.0-dev llvm clang libclang-dev libudunits2-dev
 ```
 
 *Note This will install about 150 dependent packages on a new machine.
@@ -353,7 +354,7 @@ Add the following text to ${HOME}/.gitconfig
 ```bash
 sudo apt install bison curl flex g++ libx11-dev libxml2-dev \
  libxt-dev libmotif-common libmotif-dev make python2.7-dev \
- swig zlib1g-dev llvm llvm-dev clang libclang-dev libudunits2-dev
+ swig maven zlib1g-dev llvm llvm-dev clang libclang-dev libudunits2-dev
 ```
 
 3.  Install Java JDK 8 through the ppa repository

include/trick/WebServer.hh

@@ -4,6 +4,8 @@ PURPOSE: (Represent the state and initial conditions of an http server.)
 #ifndef WEB_SERVER_H
 #define WEB_SERVER_H
 
+#ifdef USE_MONGOOSE
+
 #include <string>
 #include <map>
 #include <pthread.h>
@@ -62,4 +64,6 @@ class WebServer {
         void handleHTTPGETrequest(struct mg_connection *nc, http_message *hm, std::string handlerName);
         void marshallWebSocketSessionData();
 };
+
+#endif
 #endif

include/trick/WebSocketSession.hh

@@ -4,6 +4,7 @@ PURPOSE: (Represent Websocket connection.)
 #ifndef WEB_SOCKET_SESSION_HH
 #define WEB_SOCKET_SESSION_HH
 
+#ifdef USE_MONGOOSE
 #include <string>
 #ifndef SWIG
 #include "mongoose/mongoose.h"
@@ -25,4 +26,6 @@ class WebSocketSession {
 
         struct mg_connection* connection;
 };
+
+#endif
 #endif

include/trick/files_to_ICG.hh

@@ -36,8 +36,7 @@
 #include "trick/RealtimeSync.hh"
 #include "trick/ITimer.hh"
 #include "trick/VariableServer.hh"
-#include "trick/WebServer.hh"
+
-#include "trick/WebSocketSession.hh"
 #include "trick/regula_falsi.h"
 #include "trick/Integrator.hh"
 #include "trick/IntegAlgorithms.hh"
@@ -100,4 +99,9 @@
 #include "trick/lqueue.h"
 #include "trick/lstack.h"
 
+#ifdef USE_MONGOOSE
+#include "trick/WebServer.hh"
+#include "trick/WebSocketSession.hh"
+#endif
+
 #endif

libexec/trick/java/.gitignore

@@ -1,2 +1,3 @@
 dist
 resources
+build

libexec/trick/java/lib/CatalogManager.properties

@@ -1,9 +0,0 @@
-# Catalogs are relative to this properties file
-relative-catalogs=false
-#Catalog list
-catalogs=./../../../trick_source/data_products/DPX/XML/catalog.xml
-
-# Make the verbosity bigger to get more debug information
-verbosity=0
-
-

libexec/trick/java/lib/Makefile

@@ -1,67 +0,0 @@
-# Downloads the external java packages Trick uses.  We use the maven repository to
-# get the jar file.  Currently we fix the version of the jar files we download.
-# I wonder how long the links stay unchanged and active (Alex 1/22/15)
-
-EXTERNAL_JARS = \
-    bsaf-1.9.2.jar \
-    jcommon-1.0.23.jar \
-    jfreechart-1.0.19.jar \
-    jfreesvg-2.1.jar \
-    jopt-simple-4.8.jar \
-    junit-4.12.jar \
-    swingx-1.6.1.jar \
-    hamcrest-core-1.3.jar \
-    pdfbox-2.0.11.jar \
-    fontbox-2.0.11.jar \
-    commons-logging-1.2.jar \
-    jaxb-runtime-2.4.0-b180830.0438.jar \
-    jaxb-xjc-2.4.0-b180830.0438.jar \
-    jaxb-jxc-2.4.0-b180830.0438.jar \
-    jaxb-impl-2.4.0-b180830.0438.jar \
-    jaxb-api-2.4.0-b180725.0427.jar \
-    jaxb-core-2.3.0.1.jar \
-    javax.activation-1.2.0.jar
-
-curl := curl --retry 4 -O -s -S
-
-.PHONY: external_jars
-external_jars : ${EXTERNAL_JARS}
-
-bsaf-1.9.2.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/jdesktop/bsaf/bsaf/1.9.2/bsaf-1.9.2.jar
-jcommon-1.0.23.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar
-jfreechart-1.0.19.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar
-jfreesvg-2.1.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/jfree/jfreesvg/2.1/jfreesvg-2.1.jar
-jopt-simple-4.8.jar:
-	$(curl) https://repo.maven.apache.org/maven2/net/sf/jopt-simple/jopt-simple/4.8/jopt-simple-4.8.jar
-junit-4.12.jar:
-	$(curl) https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar
-swingx-1.6.1.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/swinglabs/swingx/1.6.1/swingx-1.6.1.jar
-hamcrest-core-1.3.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
-pdfbox-2.0.11.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/apache/pdfbox/pdfbox/2.0.11/pdfbox-2.0.11.jar
-fontbox-2.0.11.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/apache/pdfbox/fontbox/2.0.11/fontbox-2.0.11.jar
-commons-logging-1.2.jar :
-	$(curl) https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
-jaxb-runtime-2.4.0-b180830.0438.jar:
-	$(curl) https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.4.0-b180830.0438/jaxb-runtime-2.4.0-b180830.0438.jar
-jaxb-xjc-2.4.0-b180830.0438.jar:
-	$(curl) https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-xjc/2.4.0-b180830.0438/jaxb-xjc-2.4.0-b180830.0438.jar
-jaxb-jxc-2.4.0-b180830.0438.jar:
-	$(curl) https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-jxc/2.4.0-b180830.0438/jaxb-jxc-2.4.0-b180830.0438.jar
-jaxb-impl-2.4.0-b180830.0438.jar:
-	$(curl) https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-impl/2.4.0-b180830.0438/jaxb-impl-2.4.0-b180830.0438.jar
-jaxb-core-2.3.0.1.jar:
-	$(curl) https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1.jar
-jaxb-api-2.4.0-b180725.0427.jar:
-	$(curl) https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180725.0427/jaxb-api-2.4.0-b180725.0427.jar
-javax.activation-1.2.0.jar:
-	$(curl) https://repo.maven.apache.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar
-clean:
-	rm -f ${EXTERNAL_JARS}

libexec/trick/pm/launch_java.pm

@@ -31,20 +31,19 @@ sub launch_java($$) {
     chomp($host_cpu) ;
     $ENV{TRICK_HOST_CPU} = $host_cpu ;
 
+    $command = "java -jar ";
+
     if ( $^O eq "darwin" ) {
-        $command = "java -classpath $java_dir/dist/*:$java_dir/lib/*:$java_dir/lib/ \\
+        $command .= "\\
              -Xdock:name=\"$name\" \\
-             -Xdock:icon=$java_dir/resources/trick_icon.png \\
+             -Xdock:icon=$java_dir/build/classes/common/resources/trick_icon.png \\
              -Djava.net.preferIPv4Stack=true \\" ;        
-    } else {
-        $command = "java -cp $java_dir/dist/*:$java_dir/lib/*:$java_dir/lib/ \\" ;
     }
 
-    $command .= "
+    $command .= "$java_dir/build/$application.jar ";
-             $application" ;
 
     foreach (@ARGV) {
-       $command .= " $_" ;
+       $command .= "$_ ";
     }
 
     system $command ;

libexec/trick/vc

@@ -16,7 +16,7 @@ if ( ! exists $ENV{TRICK_HOME} ) {
 if ( $^O eq "darwin" ) {
     $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\
          -Xdock:name=\"Variable Counter\" \\
-         -Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\
+         -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/build/classes/common/resources/trick_icon.png \\
          trick.vc.VariableCounter " . join (" " , @ARGV) ;
 } else {
     $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.vc.VariableCounter " . join (" " , @ARGV) ;

share/trick/makefiles/Makefile.common

@@ -65,7 +65,7 @@ export TRICK_PYTHON_PATH := $(TRICK_PYTHON_PATH)
 export TRICK_GTE_EXT := $(TRICK_GTE_EXT)
 export TRICK_HOST_CPU := $(shell TRICK_FORCE_32BIT=$(TRICK_FORCE_32BIT) $(TRICK_HOME)/bin/trick-gte TRICK_HOST_CPU)
 export TRICK_EXEC_LINK_LIBS := ${PTHREAD_LIBS} $(PYTHON_LIB) $(UDUNITS_LDFLAGS) $(PLATFORM_LIBS) -lm -ldl
-export TRICK_LIBS := ${RPATH} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units -ltrick_mm -ltrickHTTP ${TRICK_LIB_DIR}/libmongoose.a
+export TRICK_LIBS := ${RPATH} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units -ltrick_mm
 export TRICK_SYSTEM_LDFLAGS := $(TRICK_SYSTEM_LDFLAGS)
 export TRICK_SWIG_FLAGS := $(TRICK_SWIG_FLAGS)
 export TRICK_SWIG_CFLAGS := $(TRICK_SWIG_CFLAGS)
@@ -171,6 +171,13 @@ ifneq ($(GSL_HOME),)
     TRICK_SYSTEM_CXXFLAGS += -D_HAVE_GSL
 endif
 
+ifeq (${TRICK_MONGOOSE},1)
+	TRICK_LIBS += -ltrickHTTP ${TRICK_LIB_DIR}/libmongoose.a
+	TRICK_SWIG_FLAGS += -DUSE_MONGOOSE
+	TRICK_SYSTEM_CXXFLAGS += -DUSE_MONGOOSE
+	TRICK_ICG_EXCLUDE += ${TRICK_HOME}/include/mongoose
+endif
+
 # We pipe the output of compiler through tee.  If the user wanted gcc color, make sure they get it.
 ifdef GCC_COLORS
     TRICK_SYSTEM_CXXFLAGS += -fdiagnostics-color=always

share/trick/makefiles/config_user.mk.in

@@ -11,17 +11,21 @@ SWIG   = @SWIG@
 PYTHON = @PYTHON@
 CLANG  = @CLANG@
 TEE    = @TEE@
+MVN    = @MVN@
 
 USE_JAVA = @USE_JAVA@
 JAVAC  = @JAVA_CC@
 
+TRICK_OFFLINE = @TRICK_OFFLINE@
+TRICK_MONGOOSE = @TRICK_MONGOOSE@
+
 USE_X_WINDOWS = @USE_X_WINDOWS@
 
 LLVM_HOME = @LLVM_HOME@
 
 PYTHON_INCLUDES = @PYTHON_CPPFLAGS@
-PYTHON_LIB = @PYTHON_LIBS@ @PYTHON_EXTRA_LDFLAGS@
+PYTHON_LIB = @PYTHON_LIBS@ @PYTHON_EXTRA_LIBS@
-# @PYTHON_EXTRA_LIBS@
+# @PYTHON_EXTRA_LDFLAGS@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 

trick_sims/Cannon/SIM_cannon_numeric/RUN_test/input.py

@@ -1,2 +1,3 @@
+
 exec(open("Modified_data/realtime.py").read())
 exec(open("Modified_data/cannon.dr").read())

trick_sims/Cannon/SIM_cannon_numeric/S_define

@@ -9,7 +9,7 @@ LIBRARY DEPENDENCIES:
 *************************************************************/
 
 #include "sim_objects/default_trick_sys.sm"
-#include "sim_objects/WebServer.sm"
+// #include "sim_objects/WebServer.sm"
 ##include "cannon/gravity/include/cannon_numeric.h"
 
 class CannonSimObject : public Trick::SimObject {

trick_sims/SIM_msd/RUN_test/input.py

@@ -7,9 +7,7 @@ exec(open("Modified_data/realtime.py").read())
 #==========================================
 varServerPort = trick.var_server_get_port();
 trick.set_var_server_info_msg_on()
-web.server.enable=True
 
-print(varServerPort)
 MsdGui_path = "models/graphics/dist/MsdGui.jar"
 
 if (os.path.isfile(MsdGui_path)) :

trick_sims/SIM_msd/S_define

@@ -13,7 +13,7 @@ LIBRARY DEPENDENCIES:
 *************************************************************/
 
 #include "sim_objects/default_trick_sys.sm"
-#include "sim_objects/WebServer.sm"
+// #include "sim_objects/WebServer.sm"
 ##include "msd/include/msd.hh"
 
 

trick_sims/SIM_msd/S_overrides.mk

@@ -1,2 +1,2 @@
 TRICK_CFLAGS += -Imodels
-TRICK_CXXFLAGS += -Imodels
+TRICK_CXXFLAGS += -Imodels

trick_source/java/.gitignore

@@ -1,2 +0,0 @@
-build
-

trick_source/java/CMakeLists.txt

@@ -0,0 +1,6 @@
+
+###############################################################
+# Build Java
+###############################################################
+
+add_custom_target(java COMMAND ${MAVEN_EXECUTABLE} -q package -Dcmake=true -DbuildDirectory=${CMAKE_BINARY_DIR}/libexec/trick/java/build -DTRICK_VERSION="${TRICK_MAJOR}.${TRICK_MINOR}.${TRICK_TINY}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

trick_source/java/Makefile

@@ -0,0 +1,16 @@
+TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..)
+JAVA_BUILD_DIR = ${TRICK_HOME}/libexec/trick/java/build
+
+
+include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+
+all:
+	@echo "Building java application..."
+	@${MVN} package -q -Dcmake=false
+
+javadoc:
+	${MVN} javadoc:javadoc
+
+clean:
+	rm -rf ${JAVA_BUILD_DIR}
+	@echo java build directory cleaned.

trick_source/java/build_trick

@@ -1,140 +0,0 @@
-#!/bin/sh
-#=================================================================
-#
-#       Name: build_trick
-#
-#   Synopsis: build_trick [option]
-#      no option: creates build directory and compiles src/java
-#                 to build directory
-#                 creates distribution directory and builds trick.jar
-#          clean: deletes the build and dist directory trees
-#        javadoc: builds Trick java api documentation at docs/api
-#       doccheck: runs Sun's doccheck tool and generates reports
-#                 at docs/api/doccheck
-#     clean_docs: deletes all files and folders in docs/api
-#
-#   Examples:   build_trick
-#               build_trick clean
-#               build_trick javadoc
-#
-#=================================================================
-
-# Get the relative path to where this file is located
-BUILD_TRICK_DIR=`dirname $0`
-
-getabsPath() {
-    ABSPATH=""
-    if [ "`echo $@`" != "" ] ; then
-        cwd=`pwd`
-        TARGET=`ls -l $@ 2>/dev/null | sed -e 's/.*->\\s*//' `
-        cd `dirname $TARGET 2>/dev/null`
-        ABSPATH="`pwd -P`/`basename $TARGET 2>/dev/null`"
-        cd $cwd
-    fi
-    echo "$ABSPATH"  #return value
-}
-
-printJavaHomeError() {
-    echo "JAVA_HOME environment variable is not set correctly"
-    echo "JAVA_HOME must be set to a valid jdk directory (not jre)"
-    JAVAC=`readlink -f \`which javac 2>/dev/null\` 2>/dev/null `
-    # when "readlink -f" command doesn't work, try to find javac manually
-    if [ "$JAVAC" = "" ] ; then
-        JAVAC=`getabsPath \`which javac 2>/dev/null\` `
-    fi
-    # the jdk directory should be 2 levels up from the javac path
-    JDK_DIR=`dirname \`dirname $JAVAC 2>/dev/null\` 2>/dev/null `
-    if [ "$JDK_DIR" != "" ] && [ "$JDK_DIR" != "$JAVA_HOME" ] ; then
-        echo "try setting JAVA_HOME to: \"$JDK_DIR\""
-    fi
-    exit -1
-}
-
-setJavaCmd(){
-    JAVACMD="${JAVA_HOME}/bin/java"
-    if [ `uname -s` = "Darwin" ] && [ ! -e "${JAVA_HOME}/bin/java" ] ; then
-        JAVACMD="${JAVA_HOME}/Commands/java"
-    fi
-    echo `java -version`
-}
-
-# Test if JAVA_HOME is good.
-if [ "$JAVA_HOME" = "" ] ||
-   ( [ ! -e "${JAVA_HOME}/bin/java" ] &&
-     [ ! -e "${JAVA_HOME}/Commands/java" ] ) ; then
-    printJavaHomeError
-else
-    setJavaCmd
-fi
-
-# Test if we are using a 64-bit java executable on a 32-bit computer
-WRONG_ARCHITECTURE=`echo \`$JAVACMD? -version 2>&1\` | grep \
-                -e 'cannot execute' \
-                -e 'format error' \
-                -e 'Wrong Architecture' `
-if [ ${#WRONG_ARCHITECTURE} -ne 0 ]  ; then
-    echo "Error: Cannot run 64 bit java in 32 bit mode."
-    printJavaHomeError
-fi
-
-
-# Run "Ant" via the java command to build Java applications.
-# When run, Ant looks for a build.xml file in the current directory and
-# uses that file as the build file. If no target (i.e. $1) is specified
-# by the user, Ant runs the target specified in the 'default' attribute
-# of the <project> tag. To find out what targets are available for use,
-# search for "<target name=" in the build file.
-ANTCALL="$JAVACMD \
-         -classpath ${BUILD_TRICK_DIR}:${TRICK_HOME}/bin/java/lib/ant-launcher.jar \
-          org.apache.tools.ant.launch.Launcher \
-         -emacs \
-         -keep-going \
-         -buildfile ${BUILD_TRICK_DIR}/build.xml"
-
-if [ "$1" = "" ] ; then
-    # No option given; build.xml will build the default target
-    echo
-    echo "Building Trick GUIs..."
-    # Execute ${ANTCALL} and save the standard output
-    STDOUT=`$ANTCALL 2>&1` # Also redirect std error msgs to standard output
-
-    # Viewing "BUILD SUCCESSFUL" while running compile_trick may be confusing.
-    # Replace/remove "BUILD SUCCESSFUL" / "BUILD FAILED" / "Total time" from stdout.
-    OUTPUT=`echo "$STDOUT" \
-                | sed -e 's/BUILD FAILED/Java build failed/g' \
-                | sed -e 's/BUILD SUCCESSFUL/Java build successful/g' \
-                | sed -e 's/ warning/ warning/g' \
-                | sed -e 's/Total time/Java build total time/g'  `
-    # Send new output to the screen.
-    echo "${OUTPUT}" # use quotes to preserve embedded newlines characters
-
-    # Test for errors...
-    ERRORS=`echo $OUTPUT | grep "error"`
-    if [ ${#ERRORS} = 0 ] ; then
-        echo "=== Trick GUI compilation complete ==="
-        date
-    fi
-elif [ "$1" = "-help" ] || [ "$1" = "-h" ] || \
-     [ "$1" = "help" ] || [ "$1" = "--help" ] ; then
-    # Note "-help" and "-h" are reserved for Ant
-    if [ "$1" = "-help" ] || [ "$1" = "-h" ] ; then
-        # Prepend ant Options before listing build_trick options
-        $ANTCALL $1
-        echo
-    fi
-    echo
-    echo "build_trick [option]"
-    echo "Options:"
-    echo -e "   (no option)\t\t Builds the default target given in \"build.xml\""
-    # Display every target name (+description) listed in the build file.
-    grep "<target\ name=" ${BUILD_TRICK_DIR}/build.xml \
-        | sed -e 's/\s*<target name=\s*"/   /g' \
-        | sed -e 's/"\s*.*description=\s*"/ \t\t /g' -e 's/"\s*.*>//g'
-    echo -e "   help, --help\t\t print this message"
-else
-    echo
-    if [ "$1" = "clean" ] ; then
-        echo 'Cleaning Trick GUIs...'
-    fi
-    $ANTCALL $1
-fi

trick_source/java/makefile

@@ -1,69 +0,0 @@
-TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..)
-
-# Get JAVAC definition
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
-
-JAVAC ?= javac
-JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation
-# delineate 'javac -version' for version number 
-JAVAC_VERSION := $(shell ${JAVAC} -version 2>&1 | perl -ne 'print /(\d+)/')
-
-SRC_DIR   = src
-SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java)
-BUILD_DIR = build
-DEST_DIR  = ${BUILD_DIR}/classes
-LIB_DIR   = ${TRICK_HOME}/$(LIBEXEC)/trick/java/lib
-DIST_DIR  = ${TRICK_HOME}/$(LIBEXEC)/trick/java/dist
-RESOURCES_DIR  = ${TRICK_HOME}/$(LIBEXEC)/trick/java/resources
-DOCS_API_DIR   = ${TRICK_HOME}/share/doc/trick/java
-TEST_REPORTS_DIR = test/reports
-
-empty :=
-space := $(empty) $(empty)
-CLASS_PATH = $(subst $(space),:,$(wildcard ${LIB_DIR}/*.jar))
-
-RESOURCES = $(subst src/,,$(shell find src/trick -name resources))
-RESOURCES += $(subst src/,,$(shell find src/trick -name jaxb.index))
-
-all: ${DIST_DIR}/trick.jar resources
-	@echo "Java build successful"
-
-${DEST_DIR} ${DIST_DIR} ${RESOURCES_DIR} ${DOCS_API_DIR}:
-	mkdir -p $@
-
-${DIST_DIR}/trick.jar: compile ${DIST_DIR}
-	@echo "Creating jar file..."
-	@jar cf ${DIST_DIR}/trick.jar -C ${DEST_DIR} .
-	@cd ${SRC_DIR} && jar uf ${DIST_DIR}/trick.jar ${RESOURCES}
-
-external_jars:
-	@ $(MAKE) -C  $(LIB_DIR)
-
-compile: ${DEST_DIR} external_jars
-	@echo "Building Trick GUIs..."
-	@${JAVAC} ${JAVAC_FLAGS} -classpath ${CLASS_PATH} -d ${DEST_DIR} -sourcepath ${SRC_DIR} ${SRC_FILES}
-
-resources: ${RESOURCES_DIR}/trick_icon.png
-
-${RESOURCES_DIR}/trick_icon.png: ${SRC_DIR}/trick/common/resources/trick_icon.png ${RESOURCES_DIR}
-	@cp $< $@
-
-JAVA_DOC_LINKS = \
- -link "http://docs.oracle.com/javase/6/docs/api/" \
- -link "http://www.jfree.org/jfreechart/api/javadoc/" \
- -link "http://junit.sourceforge.net/javadoc/"
-
-javadoc: ${DOCS_API_DIR}
-	javadoc -d ${DOCS_API_DIR} -classpath ${CLASS_PATH} -sourcepath ${SRC_DIR} -windowtitle "Trick GUI API" ${JAVA_DOC_LINKS} trick ${SRC_FILES}
-
-clean:
-	rm -rf ${BUILD_DIR}
-	rm -rf ${DIST_DIR}
-	rm -rf ${RESOURCES_DIR}
-	rm -rf ${TEST_REPORTS_DIR}
-
-clean_obj:
-	rm -rf ${BUILD_DIR}
-
-clean_docs:
-	rm -rf ${DOCS_API_DIR}

trick_source/java/pom.xml

@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>trick-java</groupId>
+  <artifactId>trick-java</artifactId>
+  <version>${trick_version}</version>
+
+  <name>trick-java</name>
+
+  <url>https://github.com/nasa/trick</url>
+
+  <profiles>
+    <profile>
+      <id>cmake</id>
+      <build>
+        <directory>${buildDirectory}</directory>
+      </build>
+      <properties>
+          <trick_version>${TRICK_VERSION}</trick_version>
+      </properties>
+      <activation>
+        <property>
+          <name>cmake</name>
+          <value>true</value>
+        </property>
+      </activation>
+    </profile>
+    <profile>
+      <id>makefile</id>
+        <properties>
+          <trick_version>${env.TRICK_VERSION}</trick_version>
+        </properties>
+      <activation>
+        <property>
+          <name>cmake</name>
+          <value>false</value>
+        </property>
+      </activation>
+    </profile>
+  </profiles>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <trick_version>dev</trick_version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jdesktop.bsaf</groupId>
+      <artifactId>bsaf</artifactId>
+      <version>1.9.2</version>
+        <exclusions>
+        <exclusion>
+          <groupId>javax.jnlp</groupId>
+          <artifactId>jnlp</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jfree</groupId>
+      <artifactId>jfreechart</artifactId>
+      <version>1.0.19</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jfree</groupId>
+      <artifactId>jfreesvg</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.jopt-simple</groupId>
+      <artifactId>jopt-simple</artifactId>
+      <version>4.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.swinglabs</groupId>
+      <artifactId>swingx</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pdfbox</groupId>
+      <artifactId>pdfbox</artifactId>
+      <version>2.0.11</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-jxc</artifactId>
+      <version>2.4.0-b180830.0438</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.3.0.1</version>
+    </dependency>
+  </dependencies>
+  <build>
+
+    <directory>../../libexec/trick/java/build</directory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.1.1</version>
+        <configuration>
+          <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+          <destDir>../../share/doc/trick/java</destDir>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+
+          <execution>
+            <id>tv</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.tv.TVApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>TrickView</finalName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>simcontrol</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.simcontrol.SimControlApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>SimControl</finalName>
+            </configuration>
+            </execution>
+            
+            <execution>
+            <id>sniffer</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.sniffer.SimSnifferApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>SimSniffer</finalName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>mtv</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.mtv.MtvApp</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>MTV</finalName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>trickqp</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.dataproducts.trickqp.TrickQPApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>QP</finalName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>trickdp</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.dataproducts.trickdp.TrickDPApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>DP</finalName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>dre</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.dre.DreApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>Dre</finalName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>Sie</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.sie.SieApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>Sie</finalName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>plot</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.dataproducts.plot.JXPlotApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>JXPlot</finalName>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>montemonitor</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.montemonitor.MonteMonitorApplication</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>MM</finalName>
+            </configuration>
+          </execution>
+
+        </executions>
+      </plugin> 
+    </plugins>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+   
+
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+          <configuration>
+            <compilerArgs>
+              <arg>-g</arg>
+              <arg>-Xlint:unchecked</arg>
+              <arg>-Xlint:deprecation</arg>
+            </compilerArgs>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

trick_source/java/src/CMakeLists.txt

@@ -1,408 +0,0 @@
-
-###############################################################
-# External Java libraries
-###############################################################
-
-set( JAVA_LIBS
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/bsaf-1.9.2.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jcommon-1.0.23.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jfreechart-1.0.19.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jfreesvg-2.1.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jopt-simple-4.8.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/junit-4.12.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/swingx-1.6.1.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/hamcrest-core-1.3.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/pdfbox-2.0.11.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/fontbox-2.0.11.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/commons-logging-1.2.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-runtime-2.4.0-b180830.0438.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-xjc-2.4.0-b180830.0438.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-jxc-2.4.0-b180830.0438.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-impl-2.4.0-b180830.0438.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-api-2.4.0-b180725.0427.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-core-2.3.0.1.jar
- ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/javax.activation-1.2.0.jar
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/bsaf-1.9.2.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/jdesktop/bsaf/bsaf/1.9.2/bsaf-1.9.2.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jcommon-1.0.23.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jfreechart-1.0.19.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jfreesvg-2.1.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/jfree/jfreesvg/2.1/jfreesvg-2.1.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jopt-simple-4.8.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/net/sf/jopt-simple/jopt-simple/4.8/jopt-simple-4.8.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/junit-4.12.jar
-  COMMAND curl --retry 4 -O -s -S https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/swingx-1.6.1.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/swinglabs/swingx/1.6.1/swingx-1.6.1.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/hamcrest-core-1.3.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/pdfbox-2.0.11.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/apache/pdfbox/pdfbox/2.0.11/pdfbox-2.0.11.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/fontbox-2.0.11.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/apache/pdfbox/fontbox/2.0.11/fontbox-2.0.11.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/commons-logging-1.2.jar
-  COMMAND curl --retry 4 -O -s -S https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-runtime-2.4.0-b180830.0438.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.4.0-b180830.0438/jaxb-runtime-2.4.0-b180830.0438.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-xjc-2.4.0-b180830.0438.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-xjc/2.4.0-b180830.0438/jaxb-xjc-2.4.0-b180830.0438.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-jxc-2.4.0-b180830.0438.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-jxc/2.4.0-b180830.0438/jaxb-jxc-2.4.0-b180830.0438.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-impl-2.4.0-b180830.0438.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-impl/2.4.0-b180830.0438/jaxb-impl-2.4.0-b180830.0438.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-api-2.4.0-b180725.0427.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-core-2.3.0.1.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180725.0427/jaxb-api-2.4.0-b180725.0427.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/javax.activation-1.2.0.jar
-  COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib
-)
-
-###############################################################
-# Trick Java libraries
-###############################################################
-
-set( JAVA_SRC
-  trick/common/ui/components/CommonTreeNode.java
-  trick/common/ui/components/DoubleJSlider.java
-  trick/common/ui/components/NumberTextField.java
-  trick/common/ui/components/FontChooser.java
-  trick/common/ui/panels/AnimationPlayer.java
-  trick/common/ui/panels/ConnectionStatusBar.java
-  trick/common/ui/panels/DataPanel.java
-  trick/common/ui/panels/DynamicTree.java
-  trick/common/ui/panels/FindBar.java
-  trick/common/ui/panels/ListPanel.java
-  trick/common/ui/panels/SmallTrickIconLabel.java
-  trick/common/ui/TrickFileFilter.java
-  trick/common/ui/UIUtils.java
-  trick/common/utils/vs/VSBoolean.java
-  trick/common/utils/vs/VSByte.java
-  trick/common/utils/vs/VSDouble.java
-  trick/common/utils/vs/VSFloat.java
-  trick/common/utils/vs/VSInteger.java
-  trick/common/utils/vs/VSLong.java
-  trick/common/utils/vs/VSShort.java
-  trick/common/utils/vs/VSString.java
-  trick/common/utils/vs/VSValue.java
-  trick/common/utils/vs/Variable.java
-  trick/common/utils/vs/VariableListener.java
-  trick/common/utils/vs/VariableServerFluent.java
-  trick/common/utils/vs/VariableTracker.java
-  trick/common/utils/BinaryDataReader.java
-  trick/common/utils/CSVDataReader.java
-  trick/common/utils/ErrorChecker.java
-  trick/common/utils/LogHeaderReader.java
-  trick/common/utils/LogVar.java
-  trick/common/utils/SortedListModel.java
-  trick/common/utils/TrickColors.java
-  trick/common/utils/UnitInfixExpression.java
-  trick/common/utils/UnitType.java
-  trick/common/utils/VariableServerConnection.java
-  trick/common/utils/XMLCreator.java
-  trick/common/utils/DataReader.java
-  trick/common/RunTimeTrickApplication.java
-  trick/common/TrickApplication.java
-  trick/dataproducts/plot/utils/editor/DefaultLogAxisEditor.java
-  trick/dataproducts/plot/utils/editor/TrickAxisEditor.java
-  trick/dataproducts/plot/utils/editor/TrickChartEditor.java
-  trick/dataproducts/plot/utils/editor/TrickChartEditorFactory.java
-  trick/dataproducts/plot/utils/editor/TrickChartEditorManager.java
-  trick/dataproducts/plot/utils/editor/TrickNumberAxisEditor.java
-  trick/dataproducts/plot/utils/editor/TrickPlotEditor.java
-  trick/dataproducts/plot/utils/editor/TrickPolarPlotEditor.java
-  trick/dataproducts/plot/utils/editor/TrickTitleEditor.java
-  trick/dataproducts/plot/utils/editor/TrickValueAxisEditor.java
-  trick/dataproducts/plot/utils/PlotUtils.java
-  trick/dataproducts/plot/utils/TrickChart.java
-  trick/dataproducts/plot/utils/TrickChartControlPanel.java
-  trick/dataproducts/plot/utils/TrickChartPanel.java
-  trick/dataproducts/plot/utils/TrickChartTheme.java
-  trick/dataproducts/plot/utils/TrickFrame.java
-  trick/dataproducts/plot/utils/TrickTableFrame.java
-  trick/dataproducts/plot/utils/TrickXYLineAndShapeRenderer.java
-  trick/dataproducts/plot/utils/TrickXYSeries.java
-  trick/dataproducts/plot/utils/TrickChartFrame.java
-  trick/dataproducts/plot/utils/TrickXYPlot.java
-  trick/dataproducts/plot/JXPlotApplication.java
-  trick/dataproducts/trickdp/utils/DPRemoteCallInterface.java
-  trick/dataproducts/trickdp/utils/DPRemoteCallInterfaceImpl.java
-  trick/dataproducts/trickdp/utils/PDFBooklet.java
-  trick/dataproducts/trickdp/utils/TrickDPActionController.java
-  trick/dataproducts/trickdp/TrickDPApplication.java
-  trick/dataproducts/trickqp/utils/DataTransferHandler.java
-  trick/dataproducts/trickqp/utils/Product.java
-  trick/dataproducts/trickqp/utils/ProductAxis.java
-  trick/dataproducts/trickqp/utils/ProductCurve.java
-  trick/dataproducts/trickqp/utils/ProductDataPanel.java
-  trick/dataproducts/trickqp/utils/ProductDomParser.java
-  trick/dataproducts/trickqp/utils/ProductExternalFunction.java
-  trick/dataproducts/trickqp/utils/ProductTable.java
-  trick/dataproducts/trickqp/utils/ProductTree.java
-  trick/dataproducts/trickqp/utils/ProductVarcase.java
-  trick/dataproducts/trickqp/utils/QPRemoteCallInterface.java
-  trick/dataproducts/trickqp/utils/QPRemoteCallInterfaceImpl.java
-  trick/dataproducts/trickqp/utils/VarListPanel.java
-  trick/dataproducts/trickqp/utils/CommonProduct.java
-  trick/dataproducts/trickqp/utils/ProductPage.java
-  trick/dataproducts/trickqp/utils/ProductPlot.java
-  trick/dataproducts/trickqp/utils/ProductColumn.java
-  trick/dataproducts/trickqp/utils/ProductMeasurement.java
-  trick/dataproducts/trickqp/utils/ProductVar.java
-  trick/dataproducts/trickqp/utils/ProductXMLCreator.java
-  trick/dataproducts/trickqp/utils/TrickQPActionController.java
-  trick/dataproducts/trickqp/TrickQPApplication.java
-  trick/dataproducts/utils/FileTreeNode.java
-  trick/dataproducts/utils/FileTreePanel.java
-  trick/dataproducts/utils/Session.java
-  trick/dataproducts/utils/SessionDomParser.java
-  trick/dataproducts/utils/SessionRun.java
-  trick/dataproducts/utils/SessionRunTransferHandler.java
-  trick/dataproducts/utils/SessionXMLCreator.java
-  trick/dataproducts/utils/SimDPTree.java
-  trick/dataproducts/utils/SimRunDPTree.java
-  trick/dataproducts/utils/SimRunTree.java
-  trick/dataproducts/DataProductsApplication.java
-  trick/dre/DreApplication.java
-  trick/montemonitor/MonteMonitorApplication.java
-  trick/montemonitor/Slave.java
-  trick/mtv/MtvApp.java
-  trick/mtv/MtvView.java
-  trick/sie/utils/SearchListener.java
-  trick/sie/utils/SearchPanel.java
-  trick/sie/utils/Searcher.java
-  trick/sie/utils/SieResourceDomParser.java
-  trick/sie/utils/SieTemplate.java
-  trick/sie/utils/SieTree.java
-  trick/sie/utils/SieTreeModel.java
-  trick/sie/utils/SieVariableTree.java
-  trick/sie/utils/TreeModelExclusionFilter.java
-  trick/sie/utils/TreeModelFilter.java
-  trick/sie/utils/TreeModelSortingFilter.java
-  trick/sie/utils/VariableList.java
-  trick/sie/utils/SieEnumeration.java
-  trick/sie/SieApplication.java
-  trick/simcontrol/utils/SimControlActionController.java
-  trick/simcontrol/utils/SimState.java
-  trick/simcontrol/SimControlApplication.java
-  trick/sniffer/SimSnifferApplication.java
-  trick/sniffer/SimulationInformation.java
-  trick/sniffer/SimulationListener.java
-  trick/sniffer/SimulationSniffer.java
-  trick/test/Client.java
-  trick/tv/StripChart.java
-  trick/tv/TVApplication.java
-  trick/tv/TVBean.java
-  trick/tv/TVBoolean.java
-  trick/tv/TVDouble.java
-  trick/tv/TVEnumeration.java
-  trick/tv/TVFloat.java
-  trick/tv/TVString.java
-  trick/tv/TVVariableTree.java
-  trick/tv/TrickViewFluent.java
-  trick/tv/VariableTable.java
-  trick/tv/DoubleComboBox.java
-  trick/tv/StripChartManager.java
-  trick/tv/TVByte.java
-  trick/tv/TVLong.java
-  trick/tv/TVShort.java
-  trick/tv/TVInteger.java
-  trick/vc/VariableCounter.java
-  trick/Template.java
-)
-
-set( JAVA_RESOURCES
-  trick/common/resources/RunTimeTrickApplication.properties
-  trick/common/resources/TrickApplication.properties
-  trick/common/resources/filenew.gif
-  trick/common/resources/fileopen.gif
-  trick/common/resources/filesave.gif
-  trick/common/resources/firefox_folder_closed.gif
-  trick/common/resources/firefox_folder_open.gif
-  trick/common/resources/gnome-fs-regular.gif
-  trick/common/resources/page2.gif
-  trick/common/resources/plot.gif
-  trick/common/resources/program.gif
-  trick/common/resources/program_in.gif
-  trick/common/resources/program_out.gif
-  trick/common/resources/table_small.gif
-  trick/common/resources/toplevel.gif
-  trick/common/resources/trick.gif
-  trick/common/resources/trick_icon.png
-  trick/common/resources/trick_small.gif
-  trick/common/resources/variable.gif
-  trick/common/resources/x_variable.gif
-  trick/common/resources/y_variable.gif
-  trick/dataproducts/plot/resources/JXPlotApplication.properties
-  trick/dataproducts/resources/DataProductsApplication.properties
-  trick/dataproducts/resources/gnuplot_off.gif
-  trick/dataproducts/resources/gnuplot_on.gif
-  trick/dataproducts/resources/plot_contrast.gif
-  trick/dataproducts/resources/plot_coplot.gif
-  trick/dataproducts/resources/plot_error.gif
-  trick/dataproducts/resources/plot_single.gif
-  trick/dataproducts/resources/table_callback1.gif
-  trick/dataproducts/resources/table_error_callback.gif
-  trick/dataproducts/trickdp/resources/TrickDPApplication.properties
-  trick/dataproducts/trickdp/resources/adobe_pdf.gif
-  trick/dataproducts/trickdp/resources/help/Help.hs
-  trick/dataproducts/trickdp/resources/help/HelpTOC.xml
-  trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS
-  trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS.TAB
-  trick/dataproducts/trickdp/resources/help/JavaHelpSearch/OFFSETS
-  trick/dataproducts/trickdp/resources/help/JavaHelpSearch/POSITIONS
-  trick/dataproducts/trickdp/resources/help/JavaHelpSearch/SCHEMA
-  trick/dataproducts/trickdp/resources/help/JavaHelpSearch/TMAP
-  trick/dataproducts/trickdp/resources/help/Map.jhm
-  trick/dataproducts/trickdp/resources/help/html/faq.html
-  trick/dataproducts/trickdp/resources/help/html/generalusage.html
-  trick/dataproducts/trickdp/resources/help/html/howtoorganize.html
-  trick/dataproducts/trickdp/resources/help/html/importingdata.html
-  trick/dataproducts/trickdp/resources/help/html/intro.html
-  trick/dataproducts/trickdp/resources/help/html/quickplot.html
-  trick/dataproducts/trickdp/resources/help/html/usinggnuplot.html
-  trick/dataproducts/trickdp/resources/ps_coplot.gif
-  trick/dataproducts/trickdp/resources/ps_error.gif
-  trick/dataproducts/trickdp/resources/ps_single.gif
-  trick/dataproducts/trickdp/resources/quickplot.gif
-  trick/dataproducts/trickqp/resources/TrickQPApplication.properties
-  trick/dataproducts/trickqp/resources/function.gif
-  trick/dataproducts/trickqp/resources/help/Help.hs
-  trick/dataproducts/trickqp/resources/help/HelpTOC.xml
-  trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS
-  trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS.TAB
-  trick/dataproducts/trickqp/resources/help/JavaHelpSearch/OFFSETS
-  trick/dataproducts/trickqp/resources/help/JavaHelpSearch/POSITIONS
-  trick/dataproducts/trickqp/resources/help/JavaHelpSearch/SCHEMA
-  trick/dataproducts/trickqp/resources/help/JavaHelpSearch/TMAP
-  trick/dataproducts/trickqp/resources/help/Map.jhm
-  trick/dataproducts/trickqp/resources/help/html/anatomyofaplot.html
-  trick/dataproducts/trickqp/resources/help/html/general.html
-  trick/dataproducts/trickqp/resources/help/html/guilayout.html
-  trick/dataproducts/trickqp/resources/help/html/intro.html
-  trick/dataproducts/trickqp/resources/help/html/leftovers.html
-  trick/dataproducts/trickqp/resources/help/html/minitutorial.html
-  trick/dre/resources/DreApplication.properties
-  trick/montemonitor/resources/MonteMonitorApplication.properties
-  trick/montemonitor/resources/dice.gif
-  trick/montemonitor/resources/disconnected.png
-  trick/montemonitor/resources/finished.png
-  trick/montemonitor/resources/initializing.png
-  trick/montemonitor/resources/killed.png
-  trick/montemonitor/resources/ready.png
-  trick/montemonitor/resources/running.png
-  trick/montemonitor/resources/stopped.png
-  trick/montemonitor/resources/stopping.png
-  trick/montemonitor/resources/uninitialized.png
-  trick/montemonitor/resources/unknown.png
-  trick/montemonitor/resources/unresponsive-running.png
-  trick/montemonitor/resources/unresponsive-stopping.png
-  trick/montemonitor/resources/unresponsive.png
-  trick/mtv/resources/MtvAboutBox.properties
-  trick/mtv/resources/MtvApp.properties
-  trick/mtv/resources/MtvView.properties
-  trick/mtv/resources/busyicons/busy-icon0.png
-  trick/mtv/resources/busyicons/busy-icon1.png
-  trick/mtv/resources/busyicons/busy-icon10.png
-  trick/mtv/resources/busyicons/busy-icon11.png
-  trick/mtv/resources/busyicons/busy-icon12.png
-  trick/mtv/resources/busyicons/busy-icon13.png
-  trick/mtv/resources/busyicons/busy-icon14.png
-  trick/mtv/resources/busyicons/busy-icon2.png
-  trick/mtv/resources/busyicons/busy-icon3.png
-  trick/mtv/resources/busyicons/busy-icon4.png
-  trick/mtv/resources/busyicons/busy-icon5.png
-  trick/mtv/resources/busyicons/busy-icon6.png
-  trick/mtv/resources/busyicons/busy-icon7.png
-  trick/mtv/resources/busyicons/busy-icon8.png
-  trick/mtv/resources/busyicons/busy-icon9.png
-  trick/mtv/resources/busyicons/idle-icon.png
-  trick/mtv/resources/delete_22x22.gif
-  trick/mtv/resources/fileopen.gif
-  trick/mtv/resources/filesave.gif
-  trick/mtv/resources/trick4.gif
-  trick/mtv/resources/trick_icon.png
-  trick/sie/resources/SieApplication.properties
-  trick/simcontrol/resources/SimControlApplication.properties
-  trick/simcontrol/resources/mtv_22x22.png
-  trick/simcontrol/resources/throttle_22x22.png
-  trick/simcontrol/resources/tv_22x22.png
-  trick/sniffer/resources/SimSnifferApplication.properties
-  trick/sniffer/resources/nose.gif
-  trick/tv/jaxb.index
-  trick/tv/resources/CP.gif
-  trick/tv/resources/TVApplication.properties
-  trick/tv/resources/delete_22x22.gif
-  trick/tv/resources/fileimport.gif
-  trick/tv/resources/kmplot.gif
-  trick/tv/resources/trickView.xsd
-  trick/tv/resources/tv.xsd
-  trick/tv/resources/tv_32x32.gif
-  trick/tv/resources/tv_off.png
-  trick/tv/resources/tv_on.png
-)
-
-add_jar( trick_jar
-  SOURCES ${JAVA_SRC} ${JAVA_RESOURCES}
-  INCLUDE_JARS ${JAVA_LIBS}
-  OUTPUT_NAME trick
-  OUTPUT_DIR ${CMAKE_BINARY_DIR}/libexec/trick/java/dist
-)
-
-file(COPY trick/common/resources/trick_icon.png DESTINATION ${CMAKE_BINARY_DIR}/libexec/trick/java/resources)