Skip to content

Commit 3e0be6b

Browse files
committed
prepare for 0.12-rc6
1 parent f96104b commit 3e0be6b

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
9191
9292
-->
9393

94-
<property name="version" value="0.12-rc5"/>
94+
<property name="version" value="0.12-rc6"/>
9595
<property name="distname" value="opengrok"/>
9696
<property name="src.dir" location="src"/>
9797
<property name="src.generatedsrc.dir" location="generatedsrc"/>

src/org/opensolaris/opengrok/configuration/Configuration.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,13 @@ public final class Configuration {
122122
private int command_timeout;
123123
private static final Logger logger = Logger.getLogger(Configuration.class.getName());
124124

125+
/**
126+
* The name of the eftar file relative to the <var>DATA_ROOT</var>, which
127+
* contains definition tags.
128+
*/
129+
public static final String EFTAR_DTAGS_FILE = "index/dtags.eftar";
130+
private transient File dtagsEftar = null;
131+
125132
/**
126133
* Get the default tab size (number of space characters per tab character)
127134
* to use for each project. If {@code <= 0} tabs are read/write as is.
@@ -652,13 +659,6 @@ public String getHeaderIncludeFileContent() {
652659
return header;
653660
}
654661

655-
/**
656-
* The name of the eftar file relative to the <var>DATA_ROOT</var>, which
657-
* contains definition tags.
658-
*/
659-
public static final String EFTAR_DTAGS_FILE = "index/dtags.eftar";
660-
private transient File dtagsEftar = null;
661-
662662
/**
663663
* Get the eftar file, which contains definition tags.
664664
*

src/org/opensolaris/opengrok/web/PageConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ public final class PageConfig {
106106
private StringBuilder headLines;
107107
private static final Logger log = Logger.getLogger(PageConfig.class.getName());
108108

109+
private static final String ATTR_NAME = PageConfig.class.getCanonicalName();
110+
private HttpServletRequest req;
111+
109112
/**
110113
* Add the given data to the &lt;head&gt; section of the html page to
111114
* generate.
@@ -1204,9 +1207,6 @@ public static PageConfig get(HttpServletRequest request) {
12041207
return pcfg;
12051208
}
12061209

1207-
private static final String ATTR_NAME = PageConfig.class.getCanonicalName();
1208-
private HttpServletRequest req;
1209-
12101210
private PageConfig(HttpServletRequest req) {
12111211
this.req = req;
12121212
}

0 commit comments

Comments
 (0)