Merge pull request #931 from tfr42/removeObsolteJavaCheckerAndModule

Removed obsolete and outdated JavaCheck class

deegree-services/deegree-webservices-handbook/src/main/asciidoc/installation.adoc

@@ -8,17 +8,17 @@ installation, including:
 
 * Microsoft Windows
 * Linux
-* Mac OS X
-* Solaris
+* MacOS
 
 Supported Java SE 8 versions are
-http://www.oracle.com/technetwork/java/javase/downloads/index.html[Oracle
-JDK 8]footnote:[Oracle JDK 7 and earlier versions are not supported
+http://www.oracle.com/technetwork/java/javase/downloads/index.html[Oracle JDK 8]
+footnote:[Oracle JDK 7 and earlier versions are not supported
 anymore, be aware that those versions are out of maintenance and reached
-End-of-life.], http://openjdk.java.net[OpenJDK 8]footnote:[OpenJDK
-binaries are provided by https://www.azul.com/downloads/zulu/[Azul
-Systems] or https://adoptopenjdk.net[AdoptOpenJDK].]. Newer Java SE
-versions may work, but are not officially supported by the deegree
+End-of-life.] and http://openjdk.java.net[OpenJDK 8]
+footnote:[OpenJDK binaries are provided by https://www.azul.com/downloads/zulu/[Azul Systems]
+or https://adoptopenjdk.net[AdoptOpenJDK].].
+
+NOTE: Newer Java SE versions may work, but are not officially supported by the deegree
 development team.
 
 === Downloading
@@ -27,33 +27,32 @@ deegree webservices downloads are available on the
 http://www.deegree.org[deegree home page]. You have the choice between:
 
 * _Docker_ : Docker Image with deegree webservices on OpenJDK and Apache
-Tomcatfootnote:[Requires an installation of Docker Community or
+Tomcat footnote:[Requires an installation of Docker Community or
 Enterprise Edition, download Docker from
 https://www.docker.com/[www.docker.com].]
 * _WAR_: Generic Java Web Archive for deployment in an existing Java
-Servlet containerfootnote:[A Java Servlet 2.5 compliant container is
+Servlet container footnote:[A Java Servlet 2.5 compliant container is
 required. We recommend using the latest http://tomcat.apache.org/[Apache
 Tomcat 8] release.]
-* _ZIP_: Distribution bundle with Apache Tomcatfootnote:[As of deegree
+* _ZIP_: Distribution bundle with Apache Tomcat footnote:[As of deegree
 3.4.0 the ZIP distribution bundle is deprecated and the download links
 are removed from the website. Download the ZIP from the
-http://repo.deegree.org/content/groups/public/org/deegree/deegree-webservices-tomcat-bundle/[Nexus
-repository] instead.]
+http://repo.deegree.org/content/groups/public/org/deegree/deegree-webservices-tomcat-bundle/[Nexus repository]
+instead.]
 
-TIP: If you are confused by the two options and unsure which version to pick,
-use the ZIP. Both variants contain exactly the same deegree software,
+TIP: If you are confused by the options and unsure which version to pick,
+use the ZIP All variants contain exactly the same deegree webservices webapp,
 they only differ in packaging.
 
 === Starting and stopping
 
-In order to run the ZIP version, extract it into a directory of your
-choice. Afterwards, fire up the included start script for your operating
-system:
+In order to run the ZIP version, extract it into a local directory of your
+choice. Afterwards, change to the directory ``deegree-webservices-tomcat-bundle-3.4.x/apache-tomcat-8.x.y/bin`` and
+fire up the included start script for your operating system:
 
-* Microsoft Windows: _start-deegree-windows_
-* Linux/Solaris: _start-deegree-linux.sh_ (when starting via a Desktop
-Environment such as Gnome, choose "Run in terminal")
-* Mac OS X: _start-deegree-osx.cmd_
+* Windows: _startup.bat_
+* Linux/MacOS: _startup.sh_ (when starting via a Desktop Environment, choose "Run in terminal",  and you may need to grant
+permission to execute the scripts with ``chmod a+x *.sh`` before)
 
 You should now see a terminal window on your screen with a lot of log
 messages:
@@ -83,8 +82,8 @@ consider installing http://tomcat.apache.org[Apache Tomcat 8] as a
 system service. Afterwards, download the WAR version of deegree
 webservices and deploy it into your Tomcat installation (e.g. by copying
 the WAR file into the _webapps_ folder). Consult the
-https://tomcat.apache.org/tomcat-8.5-doc/index.html[Tomcat
-documentation] for more information and options.
+https://tomcat.apache.org/tomcat-8.5-doc/index.html[Tomcat documentation]
+for more information and options.
 
 === Securing deegree
 
@@ -138,8 +137,5 @@ you must not operate the Java Servlet container as root user!
 Furthermore you should consider to enable the Java Security Manager and
 define restrictive file permissions.footnote:[How to run securely Java
 applications we recommend to follow the
-https://docs.oracle.com/javase/8/docs/technotes/guides/security/index.html[Java
-Security Guidelines] and for
-http://tomcat.apache.org/tomcat-8.5-doc/security-manager-howto.html[Apache
-
-Tomcat the Security Manager HowTo].]
+https://docs.oracle.com/javase/8/docs/technotes/guides/security/index.html[Java Security Guidelines] and for
+http://tomcat.apache.org/tomcat-8.5-doc/security-manager-howto.html[Apache Tomcat the Security Manager HowTo].]

deegree-services/deegree-webservices-tomcat-bundle/pom.xml

@@ -32,7 +32,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <!--artifactId: tomcat for 7.x and 8.x, apache-tomcat for 6.x -->
       <artifactId>tomcat</artifactId>
       <version>${tomcat-version}</version>
       <type>zip</type>
@@ -43,11 +42,6 @@
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
-    <dependency>
-      <groupId>org.deegree</groupId>
-      <artifactId>deegree-javacheck</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

deegree-services/deegree-webservices-tomcat-bundle/src/main/assembly/distribution-assembly.xml

@@ -4,18 +4,6 @@
   <formats>
     <format>zip</format>
   </formats>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/src/main/resources</directory>
-      <outputDirectory>apache-tomcat-${tomcat-version}/bin</outputDirectory>
-      <includes>
-        <include>*.bat</include>
-        <include>*.cmd</include>
-        <include>*.sh</include>
-      </includes>
-      <fileMode>0775</fileMode>
-    </fileSet>
-  </fileSets>
   <dependencySets>
     <dependencySet>
       <outputDirectory>/</outputDirectory>
@@ -33,13 +21,6 @@
       </unpackOptions>
       <unpack>true</unpack>
     </dependencySet>
-    <dependencySet>
-      <outputDirectory>apache-tomcat-${tomcat-version}/bin/</outputDirectory>
-      <includes>
-        <include>org.deegree:deegree-javacheck:*</include>
-      </includes>
-      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-    </dependencySet>
     <dependencySet>
       <outputDirectory>apache-tomcat-${tomcat-version}/webapps/ROOT</outputDirectory>
       <includes>