[mb-commits] r13730 - in search_server/trunk: . index index/src/main index/src/main/java/org/musicbrainz/search/index

Author: ijabz
Date: 2014-04-24 09:43:14 +0000 (Thu, 24 Apr 2014)
New Revision: 13730

Removed:
   search_server/trunk/index/src/main/libs/
   search_server/trunk/makeinstall.sh
Modified:
   search_server/trunk/index/pom.xml
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/UrlIndexField.java
Log:
Get UniversalCharDet from central Maven Repo, no need to manually install.

Modified: search_server/trunk/index/pom.xml
===================================================================
--- search_server/trunk/index/pom.xml	2013-10-15 07:55:47 UTC (rev 13729)
+++ search_server/trunk/index/pom.xml	2014-04-24 09:43:14 UTC (rev 13730)
@@ -8,10 +8,6 @@
   <name>MusicBrainz Search Server's Index</name>
   <repositories>
     <repository>
-      <id>juniversalchardet-repository</id>
-      <url>http://projects.iplantc.org/archiva/repository/internal/</url>
-    </repository>
-    <repository>
       <id>java.net</id>
       <url>http://download.java.net/maven/2</url>
     </repository>
@@ -49,12 +45,12 @@
       <groupId>org.musicbrainz.mmd2</groupId>
       <artifactId>mmd2</artifactId>
       <version>2.0.0</version>
-    </dependency>  
+    </dependency>
     <dependency>
-      <groupId>org.mozilla.universalchardet</groupId>
-      <artifactId>juniversalcharset</artifactId>
-      <version>1.0.3</version>
-    </dependency>  
+          <groupId>com.googlecode.juniversalchardet</groupId>
+          <artifactId>juniversalchardet</artifactId>
+          <version>1.0.3</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/UrlIndexField.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/UrlIndexField.java	2013-10-15 07:55:47 UTC (rev 13729)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/UrlIndexField.java	2014-04-24 09:43:14 UTC (rev 13730)
@@ -43,9 +43,9 @@
 	ID		        ("_id",		        MusicBrainzFieldTypes.TEXT_STORED_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
     URL_ID          ("uid",		        MusicBrainzFieldTypes.TEXT_STORED_NOT_ANALYZED_NO_NORMS, new KeywordAnalyzer()),
     URL             ("url",             MusicBrainzFieldTypes.TEXT_STORED_NOT_ANALYZED_NO_NORMS,  new KeywordAnalyzer()),
-    RELATION_TYPE   ("relationtype",    MusicBrainzFieldTypes.TEXT_STORED_ANALYZED,  new MusicbrainzAnalyzer()),
+    RELATION_TYPE   ("relationtype",    MusicBrainzFieldTypes.TEXT_STORED_ANALYZED,  new CaseInsensitiveKeywordAnalyzer()),
     TARGET_ID       ("targetid",        MusicBrainzFieldTypes.TEXT_STORED_NOT_ANALYZED_NO_NORMS,  new KeywordAnalyzer()),
-    TARGET_TYPE     ("targettype",      MusicBrainzFieldTypes.TEXT_STORED_ANALYZED,  new MusicbrainzAnalyzer()),
+    TARGET_TYPE     ("targettype",      MusicBrainzFieldTypes.TEXT_STORED_ANALYZED,  new CaseInsensitiveKeywordAnalyzer()),
     URL_STORE       ("urlstore",        MusicBrainzFieldTypes.TEXT_STORED_NOT_INDEXED),
     ;