Merge pull request #247 from NASAWorldWind/develop

Version 2.2.1 Release Changes

README.md

@@ -2,9 +2,11 @@
 
 # WorldWind Java
 
-## New versions of WorldWind released
-Web WorldWind 0.10.0 and WorldWind Java 2.2.0 are now available on GitHub. The new version of Web WorldWind addresses potential vulnerabilities in the code and underlying packages.  The new version of WorldWind Java focuses on upgrading to Java 11 and JOGL 2.4 as well as a switch to Apache 2.0 license.  WorldWind's API remains largely unchanged in this release and we are committed to maintaining a consistent API in future releases.
-More information on the release can be found at these links: [Web WorldWind 0.10.0](https://github.com/NASAWorldWind/WebWorldWind/releases) and [WorldWind Java 2.2.0](https://github.com/NASAWorldWind/WorldWindJava/releases).
+## New version of WorldWind Java released
+WorldWind Java 2.2.1 is now available on GitHub. This version of WorldWind Java is a maintenance release that addresses small fixes (typos, bad references, etc.) to various areas of the code and removes references to services that are no longer supported by the WorldWind servers.
+
+WorldWind's API remains unchanged in this release and we are committed to maintaining a consistent API in future releases.
+More information on the release can be found at this link: [WorldWind Java 2.2.1](https://github.com/NASAWorldWind/WorldWindJava/releases).
 
 Please direct questions to our new email address: [email protected].
 
@@ -25,10 +27,11 @@ Official WorldWind Java releases have the latest stable features, enhancements a
 
 ## Run a Demo
 
-###### From a Web Browser
+The following options are available to run a WorldWind Java demo:
+
+###### From the Apache NetBeans IDE
 
-- [WorldWind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows WorldWind's basic capabilities
-- [Java Demos](https://goworldwind.org/demos) has a complete list of example apps
+Clone the SDK with git, open the WorldWind Java project with Apache Netbeans and run demos via the Netbeans interface. 
 
 ###### From a Windows Development Environment
 

RELEASE_NOTES.txt

@@ -0,0 +1,26 @@
+################### WorldWindJava 2.2.1
+
+This version of WorldWind Java is a maintenance release that addresses small fixes (updated formatting, typos, bad references, etc.) to various areas of the code and removes references to services that are no longer supported by the WorldWind servers.
+
+WorldWind's API remains unchanged in this release and we are committed to maintaining a consistent API in future releases.
+
+################### WorldWindJava 2.2.0
+
+The primary goal of the WorldWind Java (WWJ) v2.2.0 release is to modernize the SDK after a period of inactivity. During this process some defects were addressed as well. Highlights of v2.2.0:
+
+- Upgrade to Java 11
+- Upgrade to the OpenGL layer (JOGL) 2.4
+- Switch to the Apache 2.0 license
+- Deprecation of unsupported functionality such as Applets, WebStart and WebView.
+
+WorldWind's API remains largely unchanged in this release and we are committed to maintaining a consistent API in future releases.
+
+The prior release of WorldWind Java, v2.1.0, was compiled with Java 8. The decision was made to upgrade WWJ to Java 11 based on questionable support options for Java 8 at the time. This situation has evolved over time and we are evaluating whether a Java 8 version of WWJ is desirable. Your feedback is welcome. 
+
+Migrating to Java 11 and JOGL 2.4 went relatively smoothly. Primary areas of work:
+
+- The package names for JOGL have changed although the API remains relatively consistent.
+- Creating work alike code to replace the use of unpublished JRE APIs that now throw an access exception. For example, setting the java library path system property. Discussions around the types of changes that need to be made when moving from 8 to 11 are broadly available on the Web.
+- Removing deprecated functionality like WebStart, Applets and WebView.
+
+This release positions WorldWind Java to begin adding new functionality in the near future, please watch this repository for further updates.

nbproject/configs/ColladaViewer.properties

@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.ColladaViewer

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=6106e3d1
+build.xml.data.CRC32=ed839dc9
 build.xml.script.CRC32=b2ee8dee
-build.xml.stylesheet.CRC32=f85dc8f2@1.95.0.48
+build.xml.stylesheet.CRC32=f85dc8f2@1.102.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=6106e3d1
-nbproject/build-impl.xml.script.CRC32=f2cfd8e0
-nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.95.0.48
+nbproject/build-impl.xml.data.CRC32=ed839dc9
+nbproject/build-impl.xml.script.CRC32=2e7bce4f
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.102.0.48

nbproject/project.properties

@@ -104,7 +104,7 @@ manifest.custom.permissions=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
-platform.active=default_platform
+platform.active=JDK_11
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

nbproject/project.xml

@@ -4,6 +4,7 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>WorldWindJava</name>
+            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>

release-build.xml

@@ -381,24 +381,4 @@
             </manifest>
         </jar>
     </target>
-
-    <!-- Helper tasks for compiling and linking the WebView native library for the current platform. Output libraries
-         are placed in the WorldWind project root folder and overwrite any existing files of the same name.
-
-         On Mac OS X this compiles the Objective-C sources under the folder 'lib-external/webview/macosx' into
-         'libwebview.jnilib', and requires that the XCode and Java development toolkits for Mac are installed.
-
-         On Windows this compiles the C and C++ sources under 'lib-external/webview/windows' into 'WebView32.dll' and
-         'WebView64.dll', and requires that the Microsoft Visual C++ build tools are avialable on the path. -->
-
-    <target name="help.assembleWebviewLibrary">
-        <exec os="Mac OS X" dir="${basedir}/lib-external/webview/macosx" executable="/bin/sh" failonerror="true">
-            <arg value="build.sh"/>
-        </exec>
-        <exec osfamily="Windows" dir="${basedir}/lib-external/webview/windows" executable="nmake" failonerror="true">
-            <arg value="clean"/>
-            <arg value="all"/>
-        </exec>
-    </target>
-
 </project>