Skip to content

Commit 406da52

Browse files
Robert FührichtRobert Führicht
Robert Führicht
authored and
Robert Führicht
committed
Merge branch 'upstream'
2 parents 6b76f4a + 2f74123 commit 406da52

34 files changed

+1037
-347
lines changed

‎.classpath

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<classpathentry kind="lib" path="ext/wicket-1.4.22.jar" sourcepath="ext/src/wicket-1.4.22.jar" />
2222
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.22.jar" sourcepath="ext/src/wicket-auth-roles-1.4.22.jar" />
2323
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.22.jar" sourcepath="ext/src/wicket-extensions-1.4.22.jar" />
24-
<classpathentry kind="lib" path="ext/lucene-core-4.10.4.jar" sourcepath="ext/src/lucene-core-4.10.4.jar" />
25-
<classpathentry kind="lib" path="ext/lucene-analyzers-common-4.10.4.jar" sourcepath="ext/src/lucene-analyzers-common-4.10.4.jar" />
26-
<classpathentry kind="lib" path="ext/lucene-highlighter-4.10.4.jar" sourcepath="ext/src/lucene-highlighter-4.10.4.jar" />
27-
<classpathentry kind="lib" path="ext/lucene-memory-4.10.4.jar" sourcepath="ext/src/lucene-memory-4.10.4.jar" />
28-
<classpathentry kind="lib" path="ext/lucene-queries-4.10.4.jar" sourcepath="ext/src/lucene-queries-4.10.4.jar" />
29-
<classpathentry kind="lib" path="ext/lucene-queryparser-4.10.4.jar" sourcepath="ext/src/lucene-queryparser-4.10.4.jar" />
30-
<classpathentry kind="lib" path="ext/lucene-sandbox-4.10.4.jar" sourcepath="ext/src/lucene-sandbox-4.10.4.jar" />
24+
<classpathentry kind="lib" path="ext/lucene-core-5.5.2.jar" sourcepath="ext/src/lucene-core-5.5.2.jar" />
25+
<classpathentry kind="lib" path="ext/lucene-analyzers-common-5.5.2.jar" sourcepath="ext/src/lucene-analyzers-common-5.5.2.jar" />
26+
<classpathentry kind="lib" path="ext/lucene-highlighter-5.5.2.jar" sourcepath="ext/src/lucene-highlighter-5.5.2.jar" />
27+
<classpathentry kind="lib" path="ext/lucene-memory-5.5.2.jar" sourcepath="ext/src/lucene-memory-5.5.2.jar" />
28+
<classpathentry kind="lib" path="ext/lucene-queries-5.5.2.jar" sourcepath="ext/src/lucene-queries-5.5.2.jar" />
29+
<classpathentry kind="lib" path="ext/lucene-queryparser-5.5.2.jar" sourcepath="ext/src/lucene-queryparser-5.5.2.jar" />
30+
<classpathentry kind="lib" path="ext/lucene-sandbox-5.5.2.jar" sourcepath="ext/src/lucene-sandbox-5.5.2.jar" />
3131
<classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
3232
<classpathentry kind="lib" path="ext/pegdown-1.5.0.jar" sourcepath="ext/src/pegdown-1.5.0.jar" />
3333
<classpathentry kind="lib" path="ext/parboiled-java-1.1.7.jar" sourcepath="ext/src/parboiled-java-1.1.7.jar" />

‎build.moxie

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ properties: {
106106
jetty.version : 9.2.13.v20150730
107107
slf4j.version : 1.7.12
108108
wicket.version : 1.4.22
109-
lucene.version : 4.10.4
109+
lucene.version : 5.5.2
110110
jgit.version : 4.1.1.201511131810-r
111111
groovy.version : 2.4.4
112112
bouncycastle.version : 1.52
@@ -146,9 +146,9 @@ dependencies:
146146
- compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
147147
- compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
148148
- compile 'org.apache.lucene:lucene-analyzers-common:${lucene.version}' :war :fedclient
149-
- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
149+
- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient !org.apache.lucene:lucene-join
150150
- compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
151-
- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient
151+
- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient !org.apache.lucene:lucene-spatial
152152
- compile 'org.pegdown:pegdown:1.5.0' :war
153153
- compile 'org.fusesource.wikitext:wikitext-core:${wikitext.version}' :war
154154
- compile 'org.fusesource.wikitext:twiki-core:${wikitext.version}' :war

‎gitblit.iml

+21-21
Original file line numberDiff line numberDiff line change
@@ -180,79 +180,79 @@
180180
</library>
181181
</orderEntry>
182182
<orderEntry type="module-library">
183-
<library name="lucene-core-4.10.4.jar">
183+
<library name="lucene-core-5.5.2.jar">
184184
<CLASSES>
185-
<root url="jar://$MODULE_DIR$/ext/lucene-core-4.10.4.jar!/" />
185+
<root url="jar://$MODULE_DIR$/ext/lucene-core-5.5.2.jar!/" />
186186
</CLASSES>
187187
<JAVADOC />
188188
<SOURCES>
189-
<root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.10.4.jar!/" />
189+
<root url="jar://$MODULE_DIR$/ext/src/lucene-core-5.5.2.jar!/" />
190190
</SOURCES>
191191
</library>
192192
</orderEntry>
193193
<orderEntry type="module-library">
194-
<library name="lucene-analyzers-common-4.10.4.jar">
194+
<library name="lucene-analyzers-common-5.5.2.jar">
195195
<CLASSES>
196-
<root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.10.4.jar!/" />
196+
<root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-5.5.2.jar!/" />
197197
</CLASSES>
198198
<JAVADOC />
199199
<SOURCES>
200-
<root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.10.4.jar!/" />
200+
<root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-5.5.2.jar!/" />
201201
</SOURCES>
202202
</library>
203203
</orderEntry>
204204
<orderEntry type="module-library">
205-
<library name="lucene-highlighter-4.10.4.jar">
205+
<library name="lucene-highlighter-5.5.2.jar">
206206
<CLASSES>
207-
<root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.10.4.jar!/" />
207+
<root url="jar://$MODULE_DIR$/ext/lucene-highlighter-5.5.2.jar!/" />
208208
</CLASSES>
209209
<JAVADOC />
210210
<SOURCES>
211-
<root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.10.4.jar!/" />
211+
<root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-5.5.2.jar!/" />
212212
</SOURCES>
213213
</library>
214214
</orderEntry>
215215
<orderEntry type="module-library">
216-
<library name="lucene-memory-4.10.4.jar">
216+
<library name="lucene-memory-5.5.2.jar">
217217
<CLASSES>
218-
<root url="jar://$MODULE_DIR$/ext/lucene-memory-4.10.4.jar!/" />
218+
<root url="jar://$MODULE_DIR$/ext/lucene-memory-5.5.2.jar!/" />
219219
</CLASSES>
220220
<JAVADOC />
221221
<SOURCES>
222-
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.10.4.jar!/" />
222+
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-5.5.2.jar!/" />
223223
</SOURCES>
224224
</library>
225225
</orderEntry>
226226
<orderEntry type="module-library">
227-
<library name="lucene-queries-4.10.4.jar">
227+
<library name="lucene-queries-5.5.2.jar">
228228
<CLASSES>
229-
<root url="jar://$MODULE_DIR$/ext/lucene-queries-4.10.4.jar!/" />
229+
<root url="jar://$MODULE_DIR$/ext/lucene-queries-5.5.2.jar!/" />
230230
</CLASSES>
231231
<JAVADOC />
232232
<SOURCES>
233-
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.10.4.jar!/" />
233+
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-5.5.2.jar!/" />
234234
</SOURCES>
235235
</library>
236236
</orderEntry>
237237
<orderEntry type="module-library">
238-
<library name="lucene-queryparser-4.10.4.jar">
238+
<library name="lucene-queryparser-5.5.2.jar">
239239
<CLASSES>
240-
<root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.10.4.jar!/" />
240+
<root url="jar://$MODULE_DIR$/ext/lucene-queryparser-5.5.2.jar!/" />
241241
</CLASSES>
242242
<JAVADOC />
243243
<SOURCES>
244-
<root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.10.4.jar!/" />
244+
<root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-5.5.2.jar!/" />
245245
</SOURCES>
246246
</library>
247247
</orderEntry>
248248
<orderEntry type="module-library">
249-
<library name="lucene-sandbox-4.10.4.jar">
249+
<library name="lucene-sandbox-5.5.2.jar">
250250
<CLASSES>
251-
<root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.10.4.jar!/" />
251+
<root url="jar://$MODULE_DIR$/ext/lucene-sandbox-5.5.2.jar!/" />
252252
</CLASSES>
253253
<JAVADOC />
254254
<SOURCES>
255-
<root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.10.4.jar!/" />
255+
<root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-5.5.2.jar!/" />
256256
</SOURCES>
257257
</library>
258258
</orderEntry>

‎src/main/java/com/gitblit/service/LuceneRepoIndexStore.java

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/*
2+
* Copyright 2017 gitblit.com.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.gitblit.service;
18+
19+
import java.io.File;
20+
21+
import com.gitblit.utils.LuceneIndexStore;
22+
23+
/**
24+
* @author Florian Zschocke
25+
*
26+
* @since 1.9.0
27+
*/
28+
class LuceneRepoIndexStore extends LuceneIndexStore
29+
{
30+
31+
private static final String LUCENE_DIR = "lucene";
32+
private static final String CONF_FILE = "gb_lucene.conf";
33+
34+
35+
/**
36+
* @param repositoryFolder
37+
* The directory of the repository for this index
38+
* @param indexVersion
39+
* Version of the index definition
40+
*/
41+
public LuceneRepoIndexStore(File repositoryFolder, int indexVersion) {
42+
super(new File(repositoryFolder, LUCENE_DIR), indexVersion);
43+
}
44+
45+
46+
/**
47+
* Get the index config File.
48+
*
49+
* @return The index config File
50+
*/
51+
public File getConfigFile() {
52+
return new File(this.indexFolder, CONF_FILE);
53+
}
54+
55+
}

0 commit comments

Comments
 (0)