HTML targets: Remove --jsp functionality (#609)

`daps html --jsp` was last needed for SUSE Manager 3.2 & will probably not be neede again.
openSUSE · May 27, 2021 · ee25a43 · ee25a43
1 parent 554a00e
commit ee25a43
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 216 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -125,7 +125,6 @@ xsltcontribdir   = $(xsltdir)/contrib
 xsltdesktopdir   = $(xsltdir)/desktop
 xsltepubdir      = $(xsltdir)/epub
 xsltindexdir     = $(xsltdir)/index
-xsltjspdir       = $(xsltdir)/jsp
 xsltlibdir       = $(xsltdir)/lib
 xsltmallarddir   = $(xsltdir)/mallard
 xsltmigratedir   = $(xsltdir)/migrate
@@ -169,7 +168,6 @@ dist_xsltcontrib_DATA   = $(wildcard daps-xslt/contrib/*.xsl)
 dist_xsltdesktop_DATA   = $(wildcard daps-xslt/desktop/*.xsl)
 dist_xsltepub_DATA      = $(wildcard daps-xslt/epub/*.xsl)
 dist_xsltindex_DATA     = $(wildcard daps-xslt/index/*.xsl)
-dist_xsltjsp_DATA       = $(wildcard daps-xslt/jsp/*.xsl)
 dist_xsltlib_DATA       = $(wildcard daps-xslt/lib/*.xsl)
 dist_xsltmallard_DATA   = $(wildcard daps-xslt/mallard/*.xsl)
 dist_xsltmigrate_DATA   = $(wildcard daps-xslt/migrate/*.xsl)

diff --git a/bin/daps.in b/bin/daps.in
@@ -119,7 +119,6 @@ VARLIST=(
     JING_JAVA_JARS
     JING_JAVA_OPTIONS
     JING_WRAPPER
-    JSP
     LEAN
     LIB_DIR
     LIBEXEC_DIR
@@ -351,7 +350,7 @@ HELP_SUBCOMMAND[epub-name]="Print the file name that would result when building
 SUBCOMMANDS[getimages]="getimages"
 HELP_SUBCOMMAND[getimages]="List and/or display images (in a viewer of your choice) referenced in an\nXML file or by rootid."
 
-SUBCOMMANDS[html]="build_html_jsp"
+SUBCOMMANDS[html]="build_html"
 HELP_SUBCOMMAND[html]="Build an HTML document from the XML sources."
 
 SUBCOMMANDS[html-dir-name]="show_names"
@@ -403,7 +402,7 @@ SUBCOMMANDS[optipng]="build_generic"
 HELP_SUBCOMMAND[optipng]="Reduce the size of the source PNG images using 'optipng'.\nNOTE: This command will directly alter your source images!"
 
 SUBCOMMANDS[package-html]="package-html"
-HELP_SUBCOMMAND[package-html]="Create all archives and files needed for packaging an\nHTML document (chunked HTML, single HTML, or JSP)."
+HELP_SUBCOMMAND[package-html]="Create all archives and files needed for packaging an\nHTML document (chunked HTML or single HTML)."
 
 SUBCOMMANDS[package-html-dir-name]="show_names"
 HELP_SUBCOMMAND[package-html-dir-name]="Print the directory name that would result when building\nan html package."
@@ -590,7 +589,7 @@ Subcommands:
 
   Generate Books:
     epub                      ePUB book
-    html                      HTML book (chunked or single file HTML, jsp)
+    html                      HTML book (chunked or single file HTML)
     man                       man pages
     mobi                      Amazon Kindle eBook
     pdf                       PDF book (color, grayscale, printable)
@@ -624,8 +623,8 @@ Subcommands:
     clean-all, real-clean     Remove everything generated by $ME.
 
   Packaging:
-    package-html              Provide an HTML tarball (chunked HTML,
-                              single HTML, or JSP), desktop, document,
+    package-html              Provide an HTML tarball (chunked HTML or
+                              single HTML), desktop, document,
                               and/or page files (for KDE and GNOME).
     package-pdf               Provide a PDF, desktop, document, and/or
                               page files (for KDE and GNOME).

diff --git a/daps-xslt/jsp/get.dbjsp.xsl b/daps-xslt/jsp/get.dbjsp.xsl
diff --git a/doc/xml/daps_table_output_formats_i.xml b/doc/xml/daps_table_output_formats_i.xml
@@ -214,47 +214,5 @@
         any duplicates will overwrite each other.-->
       </entry>
      </row>
-    <!--taroth 2013-01-15: commented jsp and mediawiki format on behalf of
-    toms&apos; feedback, too exotic for most users-->
-    <!-- <row>
-      <entry>
-       <para>
-         jsp
-        </para>
-      </entry>
-      <entry>
-       <para>
-         Creates Java Server Pages (JSP files). The generated
-         <filename>jsp</filename> subdirectory contains individual JSP files
-         for all chapters of a book (including also preface, glossary or
-         appendix files). The JSP files are named according to the ID of the
-         respective root element.
-       </para>
-       <para>
-         A JSP file is an HTML page containing a reference to Java servlets
-         or Java Server Side Applets.
-        </para>
-      </entry>
-     </row>
-     <row>
-      <entry>
-       <para>
-         wiki
-        </para>
-      </entry>
-      <entry>
-       <para>
-         Creates a MediaWiki output in a single file. Open the result in a
-         text or MediaWiki editor, and use it as raw input for a MediaWiki
-         article.
-        </para>
-        <para>
-         Experimental feature. The output is very basic: Section titles are
-         converted in headlines according to their hierarchy, itemized
-         lists, ordered lists and <sgmltag>screen</sgmltag> elements are
-         converted to the respective MediaWiki elements.
-        </para>
-      </entry>
-     </row>-->
     </tbody>
    </tgroup>
diff --git a/doc/xml/daps_user_concept.xml b/doc/xml/daps_user_concept.xml
@@ -212,8 +212,8 @@
     <listitem>
      <para>
       For deploying the documentation as RPM packages and integrating it
-      into KDE and GNOME desktop environments and into Web user
-      interfaces (via JSP), &dapsacr; offers a number of options to produce
+      into KDE and GNOME desktop environments, &dapsacr; offers a number of
+      options to produce
       the corresponding output. For example, you can create source packages,
       HTML TAR archives, color PDFs and desktop and document files with the
       <command>daps package-*</command> commands. For details refer to

diff --git a/doc/xml/daps_user_deploy.xml b/doc/xml/daps_user_deploy.xml
@@ -23,12 +23,6 @@
       Generating distributable HTML archives
      </para>
     </listitem>
-   <!-- <listitem>
-     <para>
-      how to generate JSP TAR archives to integrate your documentation
-      into Web user interfaces (via JSP),
-     </para>
-    </listitem>-->
     <listitem>
      <para>
       Generating page, desktop, or document files to integrate 
@@ -45,7 +39,7 @@
   directory structure when generating the TAR archives. </para>
 
  <para>
-  Create source packages, HTML TAR archives, color PDFs, or JSP TAR archives with
+  Create source packages, HTML or PDF TAR archives with
   the <command>daps package-*</command> commands. By adding the respective
   options, you can additionally create page files, document files or desktop
   files for GNOME or KDE desktop environments.
@@ -71,19 +65,8 @@
   </para>
 
 <screen>&prompt.user;&dapscmd; -d <replaceable>PATH_TO_DC_FILE</replaceable> package-html</screen>
- </sect1>
-
- <!--<sect1 id="sec.daps.user.deploy.jsp">
-  <title>Generating a JSP TAR Archive</title>
+  </sect1>
 
-  <para>
-   To create all archives and files needed for packaging a JSP document, use
-   the following command:
-  </para>
-
-<screen>&prompt.user;daps -d <replaceable>PATH_TO_DC_FILE</replaceable> package-jsp</screen>
-</sect1>-->
-
   <sect1 id="sec.daps.user.deploy.desktops">
   <title>Generating Desktop, Document, or Page Files</title>
 

diff --git a/lib/daps_functions b/lib/daps_functions
@@ -187,11 +187,6 @@ function parse_args {
                 P_LIST_IMG_ONLY=1
                 shift
                 ;;
-            --jsp)
-                # html/package-html/show-names: create JSP rather than HTML
-                export JSP=1
-                shift
-                ;;
             --lang)
                 # spellcheck: Language
                 # no need to export (not passed to make)
@@ -444,10 +439,6 @@ function parse_args {
         esac
     done
 
-    # sanity checks:
-    if [[ 1 -eq $HTMLSINGLE && 1 -eq $JSP ]]; then
-        exit_on_error "--single and --jsp are mutually exclusive"
-    fi
     P_REMAIN_ARGS="$*"
 
     # Deprecation warning if PDFNAME is still used (and does not
@@ -1043,7 +1034,7 @@ function show_names {
     shift
 
     SHORT_OPTS="h"
-    LONG_OPTS="cropmarks,draft,formatter:,grayscale,help,jsp,meta,name:,remarks,rootid:,single"
+    LONG_OPTS="cropmarks,draft,formatter:,grayscale,help,meta,name:,remarks,rootid:,single"
 
     parse_args "$SHORT_OPTS" "$LONG_OPTS" "$SUB_CMD" "$@"
     eval set -- "$P_REMAIN_ARGS"
@@ -1056,7 +1047,6 @@ function show_names {
                 [[ "pdf-name" = "$SUB_CMD" ]] && help_formatter
                 [[ "pdf-name" = "$SUB_CMD" ]] && help_grayscale_pdf
                 help_help
-                [[ "jsp-dir-name" =  "$SUB_CMD" ]] && help_jsp
                 help_meta
                 help_name
                 help_remarks
@@ -1372,14 +1362,6 @@ function help_imgonly {
                               Shortcut for --nodc --noent --noxml|--noadoc.
 EOF
 }
-function help_jsp {
-    cat <<EOF
-    --jsp                     Creates JSP output. Requires custom stylesheets
-                              (not available with the standard DocBook
-                              stylesheets).
-                              Default: off
-EOF
-}
 function help_lang {
     cat <<EOF
     --lang                    Specify a language to use for spellchecking.
@@ -1662,9 +1644,9 @@ EOF
 }
 function help_target {
     cat <<EOF
-    --target=TARGET           Specify a potential target (such as jsp or
-                              color-pdf) in order to retrieve correct values
-                              for target-specific values.
+    --target=TARGET           Specify a potential target (such as pdf)
+                              to retrieve correct values for target-specific
+                              values.
                               Default: same as daps subcommand
 EOF
 }

diff --git a/lib/html b/lib/html
@@ -7,18 +7,18 @@
 #
 ###########################################################################
 #
-# BUILD HTML and JSP
+# BUILD HTML
 #
 # Subcommands: html
 #
 ###########################################################################
-function build_html_jsp {
+function build_html {
     local SHORT_OPTS LONG_OPTS SUB_CMD
     SUB_CMD=$1
     shift
 
     SHORT_OPTS="h"
-    LONG_OPTS="clean,css:,draft,help,html5,jsp,name:,norefcheck,nostatic,meta,param:,remarks,rootid:,single,statdir:,static,stringparam:,xsltparam:"
+    LONG_OPTS="clean,css:,draft,help,html5,name:,norefcheck,nostatic,meta,param:,remarks,rootid:,single,statdir:,static,stringparam:,xsltparam:"
 
     parse_args "$SHORT_OPTS" "$LONG_OPTS" "$SUB_CMD" "$@"
     eval set -- "$P_REMAIN_ARGS"
@@ -31,7 +31,6 @@ function build_html_jsp {
         help_draft
         help_help
         help_html5
-        help_jsp
         help_meta
         help_name
         help_norefcheck

diff --git a/lib/package-html b/lib/package-html
@@ -18,7 +18,7 @@ function package-html {
     shift
 
     SHORT_OPTS="h"
-    LONG_OPTS="css:,desktopfiles,documentfiles,help,html5,jsp,name:,pagefiles,param:,rootid:,set-date:,single,statdir:,stringparam:,xsltparam:"
+    LONG_OPTS="css:,desktopfiles,documentfiles,help,html5,name:,pagefiles,param:,rootid:,set-date:,single,statdir:,stringparam:,xsltparam:"
 
     parse_args "$SHORT_OPTS" "$LONG_OPTS" "$SUB_CMD" "$@"
     eval set -- "$P_REMAIN_ARGS"
@@ -31,7 +31,6 @@ function package-html {
         help_documentfiles
         help_help
         help_html5
-        help_jsp
         help_name
         help_pagefiles
         help_param

diff --git a/make/common_variables.mk b/make/common_variables.mk
@@ -402,7 +402,7 @@ ifeq "$(DOCBOOK_VERSION)" "4"
 endif
 
 #-----
-# graphics for html, webhelp and jsp
+# graphics for html and webhelp
 #
 # By default graphics for the builds mentioned above are linked into the
 # result directory. However, when prodicing the --static option they are copied

diff --git a/make/debug.mk b/make/debug.mk
@@ -70,7 +70,7 @@ EPUB_CSS          = $(EPUB_CSS)\n\
 STYLEEPUB         = $(STYLEEPUB)\n\
 STYLEEPUB_BIGFILE = $(STYLEEPUB_BIGFILE)\n\
 \n\
-HTML / SINGLE-HTML / JSP\n\
+HTML / SINGLE-HTML\n\
 ------------------------\n\
 HTML_DIR  = $(HTML_DIR)\n\
 HTML_CSS  = $(HTML_CSS)\n\