Fix SSL allow renegotiation take 2.

James Moger

2011-10-07 f2806358a5794ccc461de5e3c3019948462c7cc8

 src/com/gitblit/build/BuildSite.java

@@ -17,11 +17,9 @@


import java.io.BufferedReader;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileOutputStream;

import java.io.FileReader;

import java.io.FilenameFilter;

import java.io.InputStreamReader;

import java.io.OutputStreamWriter;

import java.nio.charset.Charset;

import java.text.MessageFormat;

@@ -57,11 +55,13 @@
 */

public class BuildSite {



   private final static String CASE_SENSITIVE = "CASE-SENSITIVE";

   private static final String SPACE_DELIMITED = "SPACE-DELIMITED";

	
   private static final String CASE_SENSITIVE = "CASE-SENSITIVE";



   private final static String RESTART_REQUIRED = "RESTART REQUIRED";

   private static final String RESTART_REQUIRED = "RESTART REQUIRED";



   private final static String SINCE = "SINCE";

   private static final String SINCE = "SINCE";



   public static void main(String... args) {

      Params params = new Params();

@@ -91,7 +91,7 @@


      System.out.println(MessageFormat.format("Generating site from {0} Markdown Docs in {1} ",

            markdownFiles.length, sourceFolder.getAbsolutePath()));

      String linkPattern = "<a href=''{0}''>{1}</a>";

      String linkPattern = "<li><a href=''{0}''>{1}</a></li>";

      StringBuilder sb = new StringBuilder();

      for (File file : markdownFiles) {

         String documentName = getDocumentName(file);

@@ -99,6 +99,8 @@
            String displayName = documentName;

            if (aliasMap.containsKey(documentName)) {

               displayName = aliasMap.get(documentName);

            } else {

               displayName = displayName.replace('_', ' ');

            }

            String fileName = documentName + ".html";

            sb.append(MessageFormat.format(linkPattern, fileName, displayName));

@@ -136,20 +138,72 @@
               String fileName = documentName + ".html";

               System.out.println(MessageFormat.format("  {0} => {1}", file.getName(),

                     fileName));

               InputStreamReader reader = new InputStreamReader(new FileInputStream(file),

                     Charset.forName("UTF-8"));

               String content = MarkdownUtils.transformMarkdown(reader);

               String rawContent = FileUtils.readContent(file, "\n");

               String markdownContent = rawContent;



               Map<String, List<String>> nomarkdownMap = new HashMap<String, List<String>>();



               // extract sections marked as no-markdown

               int nmd = 0;

               for (String token : params.nomarkdown) {

                  StringBuilder strippedContent = new StringBuilder();



                  String nomarkdownKey = "%NOMARKDOWN" + nmd + "%";

                  String[] kv = token.split(":", 2);

                  String beginToken = kv[0];

                  String endToken = kv[1];



                  // strip nomarkdown chunks from markdown and cache them

                  List<String> chunks = new Vector<String>();

                  int beginCode = 0;

                  int endCode = 0;

                  while ((beginCode = markdownContent.indexOf(beginToken, endCode)) > -1) {

                     if (endCode == 0) {

                        strippedContent.append(markdownContent.substring(0, beginCode));

                     } else {

                        strippedContent.append(markdownContent

                              .substring(endCode, beginCode));

                     }

                     strippedContent.append(nomarkdownKey);

                     endCode = markdownContent.indexOf(endToken, beginCode);

                     chunks.add(markdownContent.substring(beginCode, endCode));

                     nomarkdownMap.put(nomarkdownKey, chunks);

                  }



                  // get remainder of text

                  if (endCode < markdownContent.length()) {

                     strippedContent.append(markdownContent.substring(endCode,

                           markdownContent.length()));

                  }

                  markdownContent = strippedContent.toString();

                  nmd++;

               }



               // transform markdown to html

               String content = transformMarkdown(markdownContent.toString());



               // reinsert nomarkdown chunks

               for (Map.Entry<String, List<String>> nomarkdown : nomarkdownMap.entrySet()) {

                  for (String chunk : nomarkdown.getValue()) {

                     content = content.replaceFirst(nomarkdown.getKey(), chunk);

                  }

               }



               for (String token : params.substitutions) {

                  String[] kv = token.split("=");

                  String[] kv = token.split("=", 2);

                  content = content.replace(kv[0], kv[1]);

               }

               for (String token : params.regex) {

                  String[] kv = token.split("!!!", 2);

                  content = content.replaceAll(kv[0], kv[1]);

               }

               for (String alias : params.properties) {

                  String[] kv = alias.split("=");

                  String[] kv = alias.split("=", 2);

                  String loadedContent = generatePropertiesContent(new File(kv[1]));

                  content = content.replace(kv[0], loadedContent);

               }

               for (String alias : params.loads) {

                  String[] kv = alias.split("=");

                  String[] kv = alias.split("=", 2);

                  String loadedContent = FileUtils.readContent(new File(kv[1]), "\n");

                  loadedContent = StringUtils.escapeForHtml(loadedContent, false);

                  loadedContent = StringUtils.breakLinesForHtml(loadedContent);

@@ -163,7 +217,6 @@
               }

               writer.write(content);

               writer.write(footer);

               reader.close();

               writer.close();

            }

         } catch (Throwable t) {

@@ -214,22 +267,27 @@
      for (Setting setting : settings) {

         for (String comment : setting.comments) {

            if (comment.contains(SINCE) || comment.contains(RESTART_REQUIRED)

                  || comment.contains(CASE_SENSITIVE)) {

               sb.append(MessageFormat.format("<span style=\"color:#004000;\"># <i>{0}</i></span>", transformMarkdown(comment)));

                  || comment.contains(CASE_SENSITIVE) || comment.contains(SPACE_DELIMITED)) {

               sb.append(MessageFormat.format(

                     "<span style=\"color:#004000;\"># <i>{0}</i></span>",

                     transformMarkdown(comment)));

            } else {

               sb.append(MessageFormat.format("<span style=\"color:#004000;\"># {0}</span>", transformMarkdown(comment)));

               sb.append(MessageFormat.format("<span style=\"color:#004000;\"># {0}</span>",

                     transformMarkdown(comment)));

            }

            sb.append("<br/>\n");

         }

         if (!StringUtils.isEmpty(setting.name)) {

            sb.append(MessageFormat.format("<span style=\"color:#000080;\">{0}</span> = <span style=\"color:#800000;\">{1}</span>", setting.name, StringUtils.escapeForHtml(setting.value, false)));

            sb.append(MessageFormat

                  .format("<span style=\"color:#000080;\">{0}</span> = <span style=\"color:#800000;\">{1}</span>",

                        setting.name, StringUtils.escapeForHtml(setting.value, false)));

         }

         sb.append("<br/>\n");

      }



      return sb.toString();

   }

	


   private static String transformMarkdown(String comment) throws ParseException {

      String md = MarkdownUtils.transformMarkdown(comment);

      if (md.startsWith("<p>")) {

@@ -254,6 +312,9 @@
      System.exit(0);

   }



   /**

    * Setting represents a setting with its comments from the properties file.

    */

   private static class Setting {

      final String name;

      final String value;

@@ -266,6 +327,9 @@
      }

   }



   /**

    * JCommander Parameters class for BuildSite.

    */

   @Parameters(separators = " ")

   private static class Params {



@@ -302,5 +366,11 @@
      @Parameter(names = { "--properties" }, description = "%TOKEN%=filename", required = false)

      public List<String> properties = new ArrayList<String>();



      @Parameter(names = { "--nomarkdown" }, description = "%STARTTOKEN%:%ENDTOKEN%", required = false)

      public List<String> nomarkdown = new ArrayList<String>();



      @Parameter(names = { "--regex" }, description = "searchPattern!!!replacePattern", required = false)

      public List<String> regex = new ArrayList<String>();



   }

}