You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/01/04 19:02:23 UTC
svn commit: r1227241 - in
/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src:
java/org/apache/lucene/analysis/kuromoji/dict/
java/org/apache/lucene/analysis/kuromoji/trie/ resources/ resources/org/
resources/org/apache/ resources/org/apache/...
Author: uschindler
Date: Wed Jan 4 18:02:20 2012
New Revision: 1227241
URL: http://svn.apache.org/viewvc?rev=1227241&view=rev
Log:
LUCENE-3305: Move dictionary files to correct resource folder with package name, fix DoubleTrieTest to work on windows where File.length() for directories always returns 0
Added:
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/cc.dat
- copied unchanged from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/cc.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/cd.dat
- copied unchanged from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/cd.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/tid.dat
- copied, changed from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/tid.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/tid_map.dat
- copied, changed from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/tid_map.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/unk.dat
- copied unchanged from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/unk.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/unk_map.dat
- copied unchanged from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/unk_map.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/trie/
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/trie/dat.dat
- copied, changed from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/dat.dat
Removed:
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/cc.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/cd.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/dat.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/tid.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/tid_map.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/unk.dat
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/unk_map.dat
Modified:
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/Dictionaries.java
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/UnknownDictionary.java
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrie.java
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrieTest.java
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/kuromoji/util/DictionaryBuilder.java
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java?rev=1227241&r1=1227240&r2=1227241&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java Wed Jan 4 18:02:20 2012
@@ -66,7 +66,7 @@ public class ConnectionCosts implements
}
public static ConnectionCosts getInstance() throws IOException, ClassNotFoundException {
- InputStream is = ConnectionCosts.class.getClassLoader().getResourceAsStream(FILENAME);
+ InputStream is = ConnectionCosts.class.getResourceAsStream(FILENAME);
return read(is);
}
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/Dictionaries.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/Dictionaries.java?rev=1227241&r1=1227240&r2=1227241&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/Dictionaries.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/Dictionaries.java Wed Jan 4 18:02:20 2012
@@ -29,26 +29,14 @@ public final class Dictionaries {
private static DoubleArrayTrie trie;
- private static boolean initialized = false;
-
static {
- load();
- }
-
- private static synchronized void load() {
-
- if (Dictionaries.initialized) {
- return;
- }
-
try {
Dictionaries.dictionary = TokenInfoDictionary.getInstance();
Dictionaries.unknownDictionary = UnknownDictionary.getInstance();
Dictionaries.costs = ConnectionCosts.getInstance();
Dictionaries.trie = DoubleArrayTrie.getInstance();
- Dictionaries.initialized = true;
} catch (Exception ex) {
- throw new RuntimeException("Could not load dictionaries! Ouch, ouch, ouch...", ex);
+ throw new RuntimeException("Could not load dictionaries!", ex);
}
}
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java?rev=1227241&r1=1227240&r2=1227241&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/TokenInfoDictionary.java Wed Jan 4 18:02:20 2012
@@ -219,9 +219,8 @@ public class TokenInfoDictionary impleme
*/
public static TokenInfoDictionary getInstance() throws IOException, ClassNotFoundException {
TokenInfoDictionary dictionary = new TokenInfoDictionary();
- ClassLoader loader = dictionary.getClass().getClassLoader();
- dictionary.loadDictionary(loader.getResourceAsStream(FILENAME));
- dictionary.loadTargetMap(loader.getResourceAsStream(TARGETMAP_FILENAME));
+ dictionary.loadDictionary(TokenInfoDictionary.class.getResourceAsStream(FILENAME));
+ dictionary.loadTargetMap(TokenInfoDictionary.class.getResourceAsStream(TARGETMAP_FILENAME));
return dictionary;
}
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/UnknownDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/UnknownDictionary.java?rev=1227241&r1=1227240&r2=1227241&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/UnknownDictionary.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/UnknownDictionary.java Wed Jan 4 18:02:20 2012
@@ -121,10 +121,9 @@ public class UnknownDictionary extends T
public static UnknownDictionary getInstance() throws IOException, ClassNotFoundException {
UnknownDictionary dictionary = new UnknownDictionary();
- ClassLoader loader = dictionary.getClass().getClassLoader();
- dictionary.loadDictionary(loader.getResourceAsStream(FILENAME));
- dictionary.loadTargetMap(loader.getResourceAsStream(TARGETMAP_FILENAME));
- dictionary.loadCharDef(loader.getResourceAsStream(CHARDEF_FILENAME));
+ dictionary.loadDictionary(UnknownDictionary.class.getResourceAsStream(FILENAME));
+ dictionary.loadTargetMap(UnknownDictionary.class.getResourceAsStream(TARGETMAP_FILENAME));
+ dictionary.loadCharDef(UnknownDictionary.class.getResourceAsStream(CHARDEF_FILENAME));
return dictionary;
}
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrie.java?rev=1227241&r1=1227240&r2=1227241&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrie.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrie.java Wed Jan 4 18:02:20 2012
@@ -99,7 +99,7 @@ public class DoubleArrayTrie {
}
public static DoubleArrayTrie getInstance() throws IOException {
- InputStream is = DoubleArrayTrie.class.getClassLoader().getResourceAsStream(FILENAME);
+ InputStream is = DoubleArrayTrie.class.getResourceAsStream(FILENAME);
return read(is);
}
Copied: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/tid.dat (from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/tid.dat)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/tid.dat?p2=lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/tid.dat&p1=lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/tid.dat&r1=1227225&r2=1227241&rev=1227241&view=diff
==============================================================================
Binary files - no diff available.
Copied: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/tid_map.dat (from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/tid_map.dat)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/tid_map.dat?p2=lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/dict/tid_map.dat&p1=lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/tid_map.dat&r1=1227225&r2=1227241&rev=1227241&view=diff
==============================================================================
Binary files - no diff available.
Copied: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/trie/dat.dat (from r1227225, lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/dat.dat)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/trie/dat.dat?p2=lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/kuromoji/trie/dat.dat&p1=lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/resources/dat.dat&r1=1227225&r2=1227241&rev=1227241&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrieTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrieTest.java?rev=1227241&r1=1227240&r2=1227241&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrieTest.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/kuromoji/trie/DoubleArrayTrieTest.java Wed Jan 4 18:02:20 2012
@@ -54,7 +54,7 @@ public class DoubleArrayTrieTest extends
dir.mkdirs();
doubleArrayTrie.write(dir.getCanonicalPath());
- assertTrue(dir.length() > 0);
+ assertTrue(new File(dir, "dat.dat").exists());
}
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/kuromoji/util/DictionaryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/kuromoji/util/DictionaryBuilder.java?rev=1227241&r1=1227240&r2=1227241&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/kuromoji/util/DictionaryBuilder.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/kuromoji/util/DictionaryBuilder.java Wed Jan 4 18:02:20 2012
@@ -45,7 +45,7 @@ public class DictionaryBuilder {
System.out.print(" building double array trie...");
DoubleArrayTrie trie = DoubleArrayTrieBuilder.build(tokenInfoBuilder.entrySet());
- trie.write(outputDirname);
+ trie.write(outputDirname+File.separatorChar+DoubleArrayTrie.class.getPackage().getName().replace('.',File.separatorChar));
System.out.println(" done");
System.out.print(" processing target map...");
@@ -56,7 +56,7 @@ public class DictionaryBuilder {
assert doubleArrayId > 0;
tokenInfoDictionary.addMapping(doubleArrayId, tokenInfoId);
}
- tokenInfoDictionary.write(outputDirname);
+ tokenInfoDictionary.write(outputDirname+File.separatorChar+TokenInfoDictionary.class.getPackage().getName().replace('.',File.separatorChar));
trie = null;
tokenInfoBuilder = null;
@@ -66,13 +66,13 @@ public class DictionaryBuilder {
System.out.print("building unknown word dict...");
UnknownDictionaryBuilder unkBuilder = new UnknownDictionaryBuilder(encoding);
UnknownDictionary unkDictionary = unkBuilder.build(inputDirname);
- unkDictionary.write(outputDirname);
+ unkDictionary.write(outputDirname+File.separatorChar+UnknownDictionary.class.getPackage().getName().replace('.',File.separatorChar));
System.out.println("done");
System.out.print("building connection costs...");
ConnectionCosts connectionCosts
- = ConnectionCostsBuilder.build(inputDirname + File.separator + "matrix.def");
- connectionCosts.write(outputDirname);
+ = ConnectionCostsBuilder.build(inputDirname + File.separator + "matrix.def");
+ connectionCosts.write(outputDirname+File.separatorChar+ConnectionCosts.class.getPackage().getName().replace('.',File.separatorChar));
System.out.println("done");
}