Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
19
Issues
19
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
06861d32
Commit
06861d32
authored
Aug 19, 2014
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unused Lucene config references
parent
88fb9616
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
250 deletions
+6
-250
src/main/java/org/apache/lucene/util/Version.java
src/main/java/org/apache/lucene/util/Version.java
+0
-236
src/main/java/org/genesys2/server/service/worker/ElasticUpdaterProcessor.java
...nesys2/server/service/worker/ElasticUpdaterProcessor.java
+5
-5
src/main/java/org/genesys2/spring/config/SpringDataBaseConfig.java
...java/org/genesys2/spring/config/SpringDataBaseConfig.java
+0
-6
src/main/resources/content/language.properties
src/main/resources/content/language.properties
+1
-1
src/main/resources/spring/spring.properties
src/main/resources/spring/spring.properties
+0
-2
No files found.
src/main/java/org/apache/lucene/util/Version.java
deleted
100644 → 0
View file @
88fb9616
package
org.apache.lucene.util
;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import
java.util.Locale
;
/**
* Use by certain classes to match version compatibility across releases of
* Lucene.
*
* <p>
* <b>WARNING</b>: When changing the version parameter that you supply to
* components in Lucene, do not simply change the version at search-time, but
* instead also adjust your indexing code to match, and re-index.
*/
public
enum
Version
{
/**
* Match settings and bugs in Lucene's 2.0 release.
*
* @deprecated (3.1) Use latest
*/
@Deprecated
LUCENE_20
,
/**
* Match settings and bugs in Lucene's 2.1 release.
*
* @deprecated (3.1) Use latest
*/
@Deprecated
LUCENE_21
,
/**
* Match settings and bugs in Lucene's 2.2 release.
*
* @deprecated (3.1) Use latest
*/
@Deprecated
LUCENE_22
,
/**
* Match settings and bugs in Lucene's 2.3 release.
*
* @deprecated (3.1) Use latest
*/
@Deprecated
LUCENE_23
,
/**
* Match settings and bugs in Lucene's 2.4 release.
*
* @deprecated (3.1) Use latest
*/
@Deprecated
LUCENE_24
,
/**
* Match settings and bugs in Lucene's 2.9 release.
*
* @deprecated (3.1) Use latest
*/
@Deprecated
LUCENE_29
,
/**
* Match settings and bugs in Lucene's 3.0 release.
*
* @deprecated (4.0) Use latest
*/
@Deprecated
LUCENE_30
,
/**
* Match settings and bugs in Lucene's 3.1 release.
*
* @deprecated (4.0) Use latest
*/
@Deprecated
LUCENE_31
,
/**
* Match settings and bugs in Lucene's 3.2 release.
*
* @deprecated (4.0) Use latest
*/
@Deprecated
LUCENE_32
,
/**
* Match settings and bugs in Lucene's 3.3 release.
*
* @deprecated (4.0) Use latest
*/
@Deprecated
LUCENE_33
,
/**
* Match settings and bugs in Lucene's 3.4 release.
*
* @deprecated (4.0) Use latest
*/
@Deprecated
LUCENE_34
,
/**
* Match settings and bugs in Lucene's 3.5 release.
*
* @deprecated (4.0) Use latest
*/
@Deprecated
LUCENE_35
,
/**
* Match settings and bugs in Lucene's 3.6 release.
*
* @deprecated (4.0) Use latest
*/
@Deprecated
LUCENE_36
,
/**
* Match settings and bugs in Lucene's 3.6 release.
*
* @deprecated (4.1) Use latest
*/
@Deprecated
LUCENE_40
,
/**
* Match settings and bugs in Lucene's 4.1 release.
*
* @deprecated (4.2) Use latest
*/
@Deprecated
LUCENE_41
,
/**
* Match settings and bugs in Lucene's 4.2 release.
*
* @deprecated (4.3) Use latest
*/
@Deprecated
LUCENE_42
,
/**
* Match settings and bugs in Lucene's 4.3 release.
*
* @deprecated (4.4) Use latest
*/
@Deprecated
LUCENE_43
,
/**
* Match settings and bugs in Lucene's 4.4 release.
*
* @deprecated (4.5) Use latest
*/
@Deprecated
LUCENE_44
,
/**
* Match settings and bugs in Lucene's 4.5 release.
*
* @deprecated (4.6) Use latest
*/
@Deprecated
LUCENE_45
,
/**
* Match settings and bugs in Lucene's 4.6 release.
*
* @deprecated (4.7) Use latest
*/
@Deprecated
LUCENE_46
,
/**
* Match settings and bugs in Lucene's 4.7 release.
*
* @deprecated (4.8) Use latest
*/
@Deprecated
LUCENE_47
,
/**
* Match settings and bugs in Lucene's 4.8 release.
* <p>
* Use this to get the latest & greatest settings, bug fixes, etc, for
* Lucene.
*/
LUCENE_48
,
/* Add new constants for later versions **here** to respect order! */
/**
* <p>
* <b>WARNING</b>: if you use this setting, and then upgrade to a newer
* release of Lucene, sizable changes may happen. If backwards compatibility
* is important then you should instead explicitly specify an actual
* version.
* <p>
* If you use this constant then you may need to <b>re-index all of your
* documents</b> when upgrading Lucene, as the way text is indexed may have
* changed. Additionally, you may need to <b>re-test your entire
* application</b> to ensure it behaves as expected, as some defaults may
* have changed and may break functionality in your application.
*
* @deprecated Use an actual version instead.
*/
@Deprecated
LUCENE_CURRENT
;
public
boolean
onOrAfter
(
Version
other
)
{
return
compareTo
(
other
)
>=
0
;
}
public
static
Version
parseLeniently
(
String
version
)
{
String
parsedMatchVersion
=
version
.
toUpperCase
(
Locale
.
ROOT
);
return
Version
.
valueOf
(
parsedMatchVersion
.
replaceFirst
(
"^(\\d)\\.(\\d)$"
,
"LUCENE_$1$2"
));
}
}
src/main/java/org/genesys2/server/service/worker/ElasticUpdaterProcessor.java
View file @
06861d32
...
...
@@ -110,6 +110,10 @@ class ElasticUpdaterProcessor implements Runnable, InitializingBean, DisposableB
}
if
(!
buckets
.
isEmpty
())
{
if
(
LOG
.
isDebugEnabled
())
{
LOG
.
debug
(
"Queue size remove="
+
elasticRemoveQueue
.
size
()
+
" update="
+
elasticUpdateQueue
.
size
());
}
for
(
String
className
:
buckets
.
keySet
())
{
Set
<
Long
>
bucket
=
buckets
.
get
(
className
);
elasticService
.
updateAll
(
className
,
bucket
);
...
...
@@ -126,13 +130,9 @@ class ElasticUpdaterProcessor implements Runnable, InitializingBean, DisposableB
LOG
.
warn
(
"Hazelcast not active."
);
}
if
(
LOG
.
isDebugEnabled
())
{
LOG
.
debug
(
"Queue size remove="
+
elasticRemoveQueue
.
size
()
+
" update="
+
elasticUpdateQueue
.
size
());
}
try
{
// LOG.info("ES updater sleeping");
Thread
.
sleep
(
2
000
);
Thread
.
sleep
(
5
000
);
}
catch
(
InterruptedException
e
)
{
}
}
...
...
src/main/java/org/genesys2/spring/config/SpringDataBaseConfig.java
View file @
06861d32
...
...
@@ -57,9 +57,6 @@ public class SpringDataBaseConfig {
@Value
(
"${db.hbm2ddl}"
)
private
String
dbHbm2ddl
;
@Value
(
"${lucene.indexDir}"
)
private
String
luceneIndexDir
;
@Bean
public
DataSource
dataSource
()
{
final
DataSource
dataSource
=
new
DataSource
();
...
...
@@ -101,9 +98,6 @@ public class SpringDataBaseConfig {
properties
.
setProperty
(
"hibernate.connection.charSet"
,
"utf8"
);
properties
.
setProperty
(
"hibernate.connection.autocommit"
,
"false"
);
properties
.
setProperty
(
"hibernate.hbm2ddl.auto"
,
dbHbm2ddl
);
properties
.
setProperty
(
"hibernate.search.default.indexBase"
,
luceneIndexDir
);
properties
.
setProperty
(
"hibernate.search.default.exclusive_index_use"
,
"false"
);
properties
.
setProperty
(
"hibernate.search.default.worker.execution"
,
"async"
);
return
properties
;
}
...
...
src/main/resources/content/language.properties
View file @
06861d32
...
...
@@ -353,7 +353,7 @@ filter.apply=Apply
filter.close
=
Close
filter.remove
=
Remove filter
filter.autocomplete-placeholder
=
Type more than 3 characters...
filter.collMissId
=
Collecting mission ID
filter.coll
.coll
MissId
=
Collecting mission ID
filter.storage
=
Type of Germplasm storage
filter.string.equals
=
Equals
filter.string.like
=
Starts with
...
...
src/main/resources/spring/spring.properties
View file @
06861d32
...
...
@@ -34,8 +34,6 @@ c3p0.minPoolSize=1
c3p0.maxPoolSize
=
5
c3p0.maxIdleTime
=
10
lucene.indexDir
=
./lucene/
# reCAPTCHA API: These are our keys for localhost
captcha.privateKey
=
6Lf7oucSAAAAAExAgGEZeO2p1rCXfDmd9e
captcha.publicKey
=
6Lf7oucSAAAAAGaS7ObroY2bNgCqMTmpyFVu7wMW
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment