From 3e0be6bdaa239e1f9f6a95055faf520f2e7c7a86 Mon Sep 17 00:00:00 2001
From: Vladimir Kotal <Vladimir.Kotal@Oracle.COM>
Date: Fri, 3 Jan 2014 16:28:07 +0100
Subject: [PATCH] prepare for 0.12-rc6

---
 build.xml                                          |  2 +-
 .../opengrok/configuration/Configuration.java      | 14 +++++++-------
 src/org/opensolaris/opengrok/web/PageConfig.java   |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 9107e2c7d9c..ece2a40ad5d 100644
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,7 @@ Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 
     -->
 
-    <property name="version" value="0.12-rc5"/>
+    <property name="version" value="0.12-rc6"/>
     <property name="distname" value="opengrok"/>
     <property name="src.dir" location="src"/>
     <property name="src.generatedsrc.dir" location="generatedsrc"/>
diff --git a/src/org/opensolaris/opengrok/configuration/Configuration.java b/src/org/opensolaris/opengrok/configuration/Configuration.java
index 0b0c2676f03..26709c6f0fa 100644
--- a/src/org/opensolaris/opengrok/configuration/Configuration.java
+++ b/src/org/opensolaris/opengrok/configuration/Configuration.java
@@ -122,6 +122,13 @@ public final class Configuration {
     private int command_timeout;
     private static final Logger logger = Logger.getLogger(Configuration.class.getName());
 
+    /**
+     * The name of the eftar file relative to the <var>DATA_ROOT</var>, which
+     * contains definition tags.
+     */
+    public static final String EFTAR_DTAGS_FILE = "index/dtags.eftar";
+    private transient File dtagsEftar = null;
+
     /**
      * Get the default tab size (number of space characters per tab character)
      * to use for each project. If {@code <= 0} tabs are read/write as is.
@@ -652,13 +659,6 @@ public String getHeaderIncludeFileContent() {
         return header;
     }
 
-    /**
-     * The name of the eftar file relative to the <var>DATA_ROOT</var>, which
-     * contains definition tags.
-     */
-    public static final String EFTAR_DTAGS_FILE = "index/dtags.eftar";
-    private transient File dtagsEftar = null;
-
     /**
      * Get the eftar file, which contains definition tags.
      *
diff --git a/src/org/opensolaris/opengrok/web/PageConfig.java b/src/org/opensolaris/opengrok/web/PageConfig.java
index a4d19b1a1ba..18b6b4c4025 100644
--- a/src/org/opensolaris/opengrok/web/PageConfig.java
+++ b/src/org/opensolaris/opengrok/web/PageConfig.java
@@ -106,6 +106,9 @@ public final class PageConfig {
     private StringBuilder headLines;
     private static final Logger log = Logger.getLogger(PageConfig.class.getName());
 
+    private static final String ATTR_NAME = PageConfig.class.getCanonicalName();
+    private HttpServletRequest req;
+
     /**
      * Add the given data to the &lt;head&gt; section of the html page to
      * generate.
@@ -1204,9 +1207,6 @@ public static PageConfig get(HttpServletRequest request) {
         return pcfg;
     }
     
-    private static final String ATTR_NAME = PageConfig.class.getCanonicalName();
-    private HttpServletRequest req;
-
     private PageConfig(HttpServletRequest req) {
         this.req = req;
     }