Patch from Don:

This patch changes the openmap.bat and openmap scripts to use the Main
class instead of OpenMap class.  openmap.iml is removed from the
repository (it's a netbeans file).  The README has been updated to
include information about code dependencies.  The MapBean version
number is 5.0 (without the beta designation).

git-svn-id: svn+ssh://src.dsl.bbn.com/svn/openmap/trunk@2258 f68c23cc-7f87-4fbc-acfa-d9760b90acc1

Author: krogers

README

@@ -149,6 +149,21 @@ changes will not be reflected in the application unless:
 The second option is usually the easiest, but your needs may require
 one of the other options.
 
+External Dependencies
+---------------------
+
+The source code has been broken out into separate directories for code 
+that depends on other packages.
+
+- src/openmap and src/ext:  This code should compile without any special packages.
+- src/corba: The missing classes can be generated by building with ant.  The idl files
+    are used to create the generated class files.
+- src/j3d: This code will compile if the Java 3D package is installed.
+- src/svg: This code will compile if Batik (v 1.7) is installed.
+
+If you check OpenMap out from svn (instructions on the download page on the website), these 
+external packages are included.
+
 Bug Tracking Software
 ---------------------
 BBN maintains a Bugzilla site for tracking bugs and suggestions for

bin/openmap

@@ -119,10 +119,10 @@ done
 
 if [ "$VISIBROKER_HOME" = "" ] ; then
 #    echo $JAVACMD -Xmx256m -classpath "$LOCALCLASSPATH" -Dopenmap.configDir=$OPENMAP_HOME/share $JAVA_ARGS com.bbn.openmap.app.OpenMap $OPENMAP_ARGS
-    $JAVACMD -Xmx512m -classpath "$LOCALCLASSPATH" -Dopenmap.configDir=$OPENMAP_HOME/share -Ddebug.showprogress $JAVA_ARGS com.bbn.openmap.app.OpenMap $OPENMAP_ARGS
+    $JAVACMD -Xmx512m -classpath "$LOCALCLASSPATH" -Dopenmap.configDir=$OPENMAP_HOME/share -Ddebug.showprogress $JAVA_ARGS com.bbn.openmap.app.Main $OPENMAP_ARGS
 else
 #    echo $JAVACMD -Xmx256m -Xbootclasspath:"$LOCALCLASSPATH" -Dopenmap.configDir=$OPENMAP_HOME/share $JAVA_ARGS com.bbn.openmap.app.OpenMap $OPENMAP_ARGS
-    $JAVACMD -Xmx512m -Xbootclasspath:"$LOCALCLASSPATH" -Dopenmap.configDir=$OPENMAP_HOME/share -Ddebug.showprogress $JAVA_ARGS com.bbn.openmap.app.OpenMap $OPENMAP_ARGS
+    $JAVACMD -Xmx512m -Xbootclasspath:"$LOCALCLASSPATH" -Dopenmap.configDir=$OPENMAP_HOME/share -Ddebug.showprogress $JAVA_ARGS com.bbn.openmap.app.Main $OPENMAP_ARGS
 fi
 
 

bin/openmap.bat

@@ -17,4 +17,4 @@ rem subdirectory.  Add other jar files as available.
 set CLASSPATH=%OPENMAP_HOME%;%OPENMAP_HOME%\classes\openmap;%OPENMAP_HOME%\share;%OPENMAP_HOME%\lib\milStd2525_png.jar;%OPENMAP_HOME%\lib\openmap.jar;%OPENMAP_HOME%\lib\omsvg.jar;%OPENMAP_HOME%\lib\omj3d.jar;%OPENMAP_HOME%\lib\omcorba_vb.jar;
 
 rem OK, now run OpenMap
-%JAVABIN% -Xmx64m -Dopenmap.configDir=%OPENMAP_HOME%\share -Ddebug.showprogress com.bbn.openmap.app.OpenMap
+%JAVABIN% -Xmx64m -Dopenmap.configDir=%OPENMAP_HOME%\share -Ddebug.showprogress com.bbn.openmap.app.Main

src/openmap/com/bbn/openmap/MapBean.java

@@ -148,11 +148,10 @@ public class MapBean
    /**
     * OpenMap version.
     */
-   public static final String version = "5.0b";
+   public static final String version = "5.0";
 
    /**
-    * Suppress the copyright message on initialization. But remember, the
-    * OpenMap License says you can't do this!
+    * Suppress the copyright message on initialization.
     */
    public static boolean suppressCopyright = false;