Skip to content

Commit 686556f

Browse files
ahornaceahornace
committed
Fix issues with indexer package renaming
1 parent eeb87f0 commit 686556f

36 files changed

+154
-154
lines changed

‎OpenGrok

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -401,16 +401,16 @@ DefaultInstanceConfiguration()
401401
# OPTIONAL: Override Built-in Properties
402402
# Assumption: We should not set properties to the empty string
403403
PROPERTIES="\
404-
${BK:+-Dorg.opengrok.history.BitKeeper=$BK} \
405-
${HG:+-Dorg.opengrok.history.Mercurial=$HG} \
406-
${CVS:+-Dorg.opengrok.history.cvs=$CVS} \
407-
${SVN:+-Dorg.opengrok.history.Subversion=$SVN} \
408-
${SCCS:+-Dorg.opengrok.history.SCCS=$SCCS} \
409-
${CLEARCASE:+-Dorg.opengrok.history.ClearCase=$CLEARCASE} \
410-
${GIT:+-Dorg.opengrok.history.git=$GIT} \
411-
${P4:+-Dorg.opengrok.history.Perforce=$P4} \
412-
${MTN:+-Dorg.opengrok.history.Monotone=$MTN} \
413-
${BZR:+-Dorg.opengrok.history.Bazaar=$BZR} \
404+
${BK:+-Dorg.opengrok.indexer.history.BitKeeper=$BK} \
405+
${HG:+-Dorg.opengrok.indexer.history.Mercurial=$HG} \
406+
${CVS:+-Dorg.opengrok.indexer.history.cvs=$CVS} \
407+
${SVN:+-Dorg.opengrok.indexer.history.Subversion=$SVN} \
408+
${SCCS:+-Dorg.opengrok.indexer.history.SCCS=$SCCS} \
409+
${CLEARCASE:+-Dorg.opengrok.indexer.history.ClearCase=$CLEARCASE} \
410+
${GIT:+-Dorg.opengrok.indexer.history.git=$GIT} \
411+
${P4:+-Dorg.opengrok.indexer.history.Perforce=$P4} \
412+
${MTN:+-Dorg.opengrok.indexer.history.Monotone=$MTN} \
413+
${BZR:+-Dorg.opengrok.indexer.history.Bazaar=$BZR} \
414414
"
415415

416416
# OPTIONAL: Show revision tags in History view.
@@ -424,7 +424,7 @@ ${BZR:+-Dorg.opengrok.history.Bazaar=$BZR} \
424424
# DELIVERED: An update program for EftarFile
425425
# Usage: <class> inputFile [inputFile ...] outputFile
426426
# EftarFile == An Extremely Fast Tagged Attribute Read-only File System
427-
EFTAR_UPDATE="org.opengrok.web.EftarFile"
427+
EFTAR_UPDATE="org.opengrok.indexer.web.EftarFile"
428428

429429
# HARDCODED: Generated EftarFile (See web/*.jsp)
430430
EFTAR_OUTPUT_FILE="${DATA_ROOT}/index/dtags.eftar"

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ Usually to `StdInvocation()` function after line `-jar ${OPENGROK_JAR}`.
366366
It would look like this:
367367

368368
```
369-
-A cs:org.opengrok.analysis.PlainAnalyzer
369+
-A cs:org.opengrok.indexer.analysis.PlainAnalyzer
370370
```
371371

372372
(this will map extension `.cs` to `PlainAnalyzer`)
@@ -395,13 +395,13 @@ for fulltext search for project with above generated `configuration.xml` you'd
395395
do:
396396

397397
```bash
398-
java -cp ./opengrok.jar org.opengrok.search.Search -R \
398+
java -cp ./opengrok.jar org.opengrok.indexer.search.Search -R \
399399
/var/opengrok/etc/configuration.xml -f fulltext_search_string
400400
```
401401
For quick help run:
402402

403403
```bash
404-
java -cp ./opengrok.jar org.opengrok.search.Search
404+
java -cp ./opengrok.jar org.opengrok.indexer.search.Search
405405
```
406406

407407
## 7. Change web application properties or name

‎doc/authorization_howto.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ Restrictions
104104
Custom classloader restricts the plugin to load only this classes from org.opengrok package:
105105

106106
private final static String[] classWhitelist = new String[]{
107-
"org.opengrok.configuration.Group",
108-
"org.opengrok.configuration.Project",
109-
"org.opengrok.authorization.IAuthorizationPlugin",
110-
"org.opengrok.util.*",
111-
"org.opengrok.logger.*",
107+
"org.opengrok.indexer.configuration.Group",
108+
"org.opengrok.indexer.configuration.Project",
109+
"org.opengrok.indexer.authorization.IAuthorizationPlugin",
110+
"org.opengrok.indexer.util.*",
111+
"org.opengrok.indexer.logger.*",
112112
};
113113

114114
And explicitly forbids these packages to be extended.

‎doc/groups_howto.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ Configuration for this structure could look like this:
4545

4646
<?xml version="1.0" encoding="UTF-8"?>
4747
<java version="1.8.0_65" class="java.beans.XMLDecoder">
48-
<object class="org.opengrok.configuration.Configuration" id="Configuration0">
48+
<object class="org.opengrok.indexer.configuration.Configuration" id="Configuration0">
4949
<void method="addGroup">
50-
<object class="org.opengrok.configuration.Group">
50+
<object class="org.opengrok.indexer.configuration.Group">
5151
<void property="name">
5252
<string>ctags</string>
5353
</void>
5454
<void property="pattern">
5555
<string></string>
5656
</void>
5757
<void method="addGroup">
58-
<object class="org.opengrok.configuration.Group">
58+
<object class="org.opengrok.indexer.configuration.Group">
5959
<void property="name">
6060
<string>ctags 5.6</string>
6161
</void>
@@ -65,7 +65,7 @@ Configuration for this structure could look like this:
6565
</object>
6666
</void>
6767
<void method="addGroup">
68-
<object class="org.opengrok.configuration.Group">
68+
<object class="org.opengrok.indexer.configuration.Group">
6969
<void property="name">
7070
<string>ctags 5.7</string>
7171
</void>
@@ -75,7 +75,7 @@ Configuration for this structure could look like this:
7575
</object>
7676
</void>
7777
<void method="addGroup">
78-
<object class="org.opengrok.configuration.Group">
78+
<object class="org.opengrok.indexer.configuration.Group">
7979
<void property="name">
8080
<string>ctags 5.8</string>
8181
</void>
@@ -87,7 +87,7 @@ Configuration for this structure could look like this:
8787
</object>
8888
</void>
8989
<void method="addGroup">
90-
<object class="org.opengrok.configuration.Group">
90+
<object class="org.opengrok.indexer.configuration.Group">
9191
<void property="name">
9292
<string>apache</string>
9393
</void>
@@ -97,7 +97,7 @@ Configuration for this structure could look like this:
9797
</object>
9898
</void>
9999
<void method="addGroup">
100-
<object class="org.opengrok.configuration.Group">
100+
<object class="org.opengrok.indexer.configuration.Group">
101101
<void property="name">
102102
<string>opengrok</string>
103103
</void>
@@ -198,17 +198,17 @@ with configuration like this:
198198

199199
<?xml version="1.0" encoding="UTF-8"?>
200200
<java version="1.8.0_65" class="java.beans.XMLDecoder">
201-
<object class="org.opengrok.configuration.Configuration" id="Configuration0">
201+
<object class="org.opengrok.indexer.configuration.Configuration" id="Configuration0">
202202
<void method="addGroup">
203-
<object class="org.opengrok.configuration.Group">
203+
<object class="org.opengrok.indexer.configuration.Group">
204204
<void property="name">
205205
<string>ctags</string>
206206
</void>
207207
<void property="pattern">
208208
<string></string>
209209
</void>
210210
<void method="addGroup">
211-
<object class="org.opengrok.configuration.Group">
211+
<object class="org.opengrok.indexer.configuration.Group">
212212
<void property="name">
213213
<string>ctags 5.6</string>
214214
</void>
@@ -218,7 +218,7 @@ with configuration like this:
218218
</object>
219219
</void>
220220
<void method="addGroup">
221-
<object class="org.opengrok.configuration.Group">
221+
<object class="org.opengrok.indexer.configuration.Group">
222222
<void property="name">
223223
<string>ctags 5.7</string>
224224
</void>
@@ -228,7 +228,7 @@ with configuration like this:
228228
</object>
229229
</void>
230230
<void method="addGroup">
231-
<object class="org.opengrok.configuration.Group">
231+
<object class="org.opengrok.indexer.configuration.Group">
232232
<void property="name">
233233
<string>ctags 5.8</string>
234234
</void>
@@ -240,7 +240,7 @@ with configuration like this:
240240
</object>
241241
</void>
242242
<void method="addGroup">
243-
<object class="org.opengrok.configuration.Group">
243+
<object class="org.opengrok.indexer.configuration.Group">
244244
<void property="name">
245245
<string>apache</string>
246246
</void>
@@ -250,7 +250,7 @@ with configuration like this:
250250
</object>
251251
</void>
252252
<void method="addGroup">
253-
<object class="org.opengrok.configuration.Group">
253+
<object class="org.opengrok.indexer.configuration.Group">
254254
<void property="name">
255255
<string>opengrok</string>
256256
</void>
@@ -260,7 +260,7 @@ with configuration like this:
260260
</object>
261261
</void>
262262
<void method="addGroup">
263-
<object class="org.opengrok.configuration.Group">
263+
<object class="org.opengrok.indexer.configuration.Group">
264264
<void property="name">
265265
<string>java</string>
266266
</void>
@@ -270,7 +270,7 @@ with configuration like this:
270270
</object>
271271
</void>
272272
<void method="addGroup">
273-
<object class="org.opengrok.configuration.Group">
273+
<object class="org.opengrok.indexer.configuration.Group">
274274
<void property="name">
275275
<string>C language</string>
276276
</void>

‎logging.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ java.util.logging.FileHandler.limit = 52428800
4444
java.util.logging.FileHandler.count = 3
4545
java.util.logging.FileHandler.level = ALL
4646
#java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
47-
java.util.logging.FileHandler.formatter = org.opengrok.logger.formatter.SimpleFileLogFormatter
47+
java.util.logging.FileHandler.formatter = org.opengrok.indexer.logger.formatter.SimpleFileLogFormatter
4848

4949
# Limit the message that are printed on the console to WARNING and above (default "quiet" mode).
5050
# if verbose is set, then log INFO and above
5151
java.util.logging.ConsoleHandler.level = WARNING
52-
java.util.logging.ConsoleHandler.formatter = org.opengrok.logger.formatter.SimpleConsoleFormatter
52+
java.util.logging.ConsoleHandler.formatter = org.opengrok.indexer.logger.formatter.SimpleConsoleFormatter
5353

5454

5555
############################################################

‎opengrok-indexer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
115115
<configuration>
116116
<archive>
117117
<manifest>
118-
<mainClass>org.opengrok.index.Indexer</mainClass>
118+
<mainClass>org.opengrok.indexer.index.Indexer</mainClass>
119119
<addClasspath>true</addClasspath>
120120
<classpathPrefix>lib/</classpathPrefix>
121121
</manifest>

‎opengrok-indexer/src/main/java/org/opengrok/indexer/index/PendingFileCompleter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
* be executed.
5050
* <p>
5151
* {@link PendingFileCompleter} is not generally thread-safe, as only
52-
* {@link #add(org.opengrok.index.PendingFileRenaming)} is expected
52+
* {@link #add(org.opengrok.indexer.index.PendingFileRenaming)} is expected
5353
* to be run in parallel; that method is thread-safe -- but only among other
5454
* callers of the same method.
5555
* <p>
@@ -58,13 +58,13 @@
5858
* additions of {@link PendingFileDeletion}s and {@link PendingFileRenaming}s
5959
* are indicated.
6060
* <p>
61-
* {@link #add(org.opengrok.index.PendingSymlinkage)} should only
61+
* {@link #add(org.opengrok.indexer.index.PendingSymlinkage)} should only
6262
* be called in serial from a single thread in an isolated stage.
6363
* <p>
64-
* {@link #add(org.opengrok.index.PendingFileDeletion)} should only
64+
* {@link #add(org.opengrok.indexer.index.PendingFileDeletion)} should only
6565
* be called in serial from a single thread in an isolated stage.
6666
* <p>
67-
* {@link #add(org.opengrok.index.PendingFileRenaming)}, as noted,
67+
* {@link #add(org.opengrok.indexer.index.PendingFileRenaming)}, as noted,
6868
* can be called in parallel in an isolated stage.
6969
*/
7070
class PendingFileCompleter {

‎opengrok-indexer/src/main/resources/analysis/CommonPath.lexh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*
25-
* See org.opengrok.util.StringUtils FNAME_CHARS_PAT where the
25+
* See org.opengrok.indexer.util.StringUtils FNAME_CHARS_PAT where the
2626
* following regex is mirrored.
2727
*/
2828
FNameChar = [a-zA-Z0-9_\-\.]

‎opengrok-indexer/src/main/resources/analysis/CommonURI.lexh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/*
2525
* From RFC-3986. See
26-
* org.opengrok.util.StringUtils URI_CHARS_PAT where a regex
26+
* org.opengrok.indexer.util.StringUtils URI_CHARS_PAT where a regex
2727
* in accordance with the following definition is maintained.
2828
*
2929
* URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]

‎opengrok-web/src/main/webapp/diff.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ org.apache.commons.jrcs.diff.Chunk,
3636
org.apache.commons.jrcs.diff.Delta,
3737
org.apache.commons.jrcs.diff.Diff,
3838
org.apache.commons.jrcs.diff.Revision,
39-
org.opengrok.analysis.AnalyzerGuru,
40-
org.opengrok.analysis.FileAnalyzer.Genre,
41-
org.opengrok.web.DiffData,
42-
org.opengrok.web.DiffType"
39+
org.opengrok.indexer.analysis.AnalyzerGuru,
40+
org.opengrok.indexer.analysis.FileAnalyzer.Genre,
41+
org.opengrok.indexer.web.DiffData,
42+
org.opengrok.indexer.web.DiffType"
4343
%><%!
4444
private String getAnnotateRevision(DiffData data) {
4545
if (data.type == DiffType.OLD || data.type == DiffType.NEW) {

0 commit comments

Comments
 (0)