Improved java doc generation for Java 7.

build.gradle

@@ -203,7 +203,7 @@ javadoc {
     doLast {
         copy {
             from  "${projectDir}/doc/javadoc/logos"
-            into "${buildDir}/docs/javadoc"
+            into "${buildDir}/docs/javadoc/logos"
         }
     }
     options.addStringOption("sourcepath", "")
@@ -219,7 +219,8 @@ javadoc {
         overview="${sourceSets.main.output.resourcesDir}/org/opencms/main/overview.html"
         docTitle="OpenCms Core API, version $version_number"
         windowTitle="OpenCms Core API, version $version_number"
-        header = "<script type=\"text/javascript\"> if (window.location.href.indexOf(\"overview-frame\") == -1) { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.alkacon.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logo_alkacon_100_t.gif\\\" /></a>\"); } else { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.opencms.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logo_opencms_100.gif\\\" /></a>\"); }</script>"
+        stylesheetFile= file("${projectDir}/doc/javadoc/stylesheet.css")
+        header = "<script type=\"text/javascript\"> if (window.location.href.indexOf(\"overview-frame\") == -1) { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.alkacon.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logos/Alkacon.png\\\" /></a>\"); } else { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.opencms.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logos/OpenCms.png\\\" /></a>\"); }</script>"
     }
 }
 
@@ -259,7 +260,7 @@ task javadocModules(type: Javadoc, dependsOn: jar) {
     doLast {
     copy {
         from  "${projectDir}/doc/javadoc/logos"
-        into "${buildDir}/docs/javadocModules"
+        into "${buildDir}/docs/javadocModules/logos"
     }
 }
 options.addStringOption("sourcepath", "")
@@ -274,7 +275,8 @@ project.configure(options) {
     noDeprecated="false"
     docTitle="OpenCms Workplace Modules API, version $version_number"
     windowTitle="OpenCms Workplace Modules API, version $version_number"
-    header = "<script type=\"text/javascript\"> if (window.location.href.indexOf(\"overview-frame\") == -1) { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.alkacon.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logo_alkacon_100_t.gif\\\" /></a>\"); } else { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.opencms.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logo_opencms_100.gif\\\" /></a>\"); }</script>"
+    stylesheetFile= file("${projectDir}/doc/javadoc/stylesheet.css")
+        header = "<script type=\"text/javascript\"> if (window.location.href.indexOf(\"overview-frame\") == -1) { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.alkacon.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logos/Alkacon.png\\\" /></a>\"); } else { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.opencms.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logos/OpenCms.png\\\" /></a>\"); }</script>"
 }
 source = sourceSets.modules.allJava
 classpath = project.sourceSets.modules.compileClasspath
@@ -285,7 +287,7 @@ task javadocGwt(type: Javadoc, dependsOn: jar) {
         doLast {
         copy {
             from  "${projectDir}/doc/javadoc/logos"
-            into "${buildDir}/docs/javadocGwt"
+            into "${buildDir}/docs/javadocGwt/logos"
         }
     }
     options.addStringOption("sourcepath", "")
@@ -300,7 +302,8 @@ task javadocGwt(type: Javadoc, dependsOn: jar) {
         noDeprecated="false"
         docTitle="OpenCms GWT Components API, version $version_number"
         windowTitle="OpenCms GWT Components API, version $version_number"
-        header = "<script type=\"text/javascript\"> if (window.location.href.indexOf(\"overview-frame\") == -1) { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.alkacon.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logo_alkacon_100_t.gif\\\" /></a>\"); } else { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.opencms.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logo_opencms_100.gif\\\" /></a>\"); }</script>"
+        stylesheetFile= file("${projectDir}/doc/javadoc/stylesheet.css")
+        header = "<script type=\"text/javascript\"> if (window.location.href.indexOf(\"overview-frame\") == -1) { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.alkacon.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logos/Alkacon.png\\\" /></a>\"); } else { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.opencms.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logos/OpenCms.png\\\" /></a>\"); }</script>"
     }
     source = sourceSets.gwt.allJava
     classpath = project.sourceSets.gwt.compileClasspath
@@ -345,7 +348,7 @@ task javadocSetup(type: Javadoc, dependsOn: jar) {
     doLast {
         copy {
             from  "${projectDir}/doc/javadoc/logos"
-            into "${buildDir}/docs/javadocSetup"
+            into "${buildDir}/docs/javadocSetup/logos"
         }
     }
     options.addStringOption("sourcepath", "")
@@ -360,7 +363,8 @@ task javadocSetup(type: Javadoc, dependsOn: jar) {
         noDeprecated="false"
         docTitle="OpenCms Setup API, version $version_number"
         windowTitle="OpenCms Setup API, version $version_number"
-        header = "<script type=\"text/javascript\"> if (window.location.href.indexOf(\"overview-frame\") == -1) { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.alkacon.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logo_alkacon_100_t.gif\\\" /></a>\"); } else { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.opencms.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logo_opencms_100.gif\\\" /></a>\"); }</script>"
+        stylesheetFile= file("${projectDir}/doc/javadoc/stylesheet.css")
+        header = "<script type=\"text/javascript\"> if (window.location.href.indexOf(\"overview-frame\") == -1) { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.alkacon.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logos/Alkacon.png\\\" /></a>\"); } else { document.write(\"<a id=\\\"brandingLink\\\" target=\\\"_blank\\\" href=\\\"http://www.opencms.com\\\"><img border=\\\"0\\\" id=\\\"brandingPic\\\" src=\\\"{@docRoot}/logos/OpenCms.png\\\" /></a>\"); }</script>"
     }
 }