Author: kmorin Date: 2009-11-10 17:30:50 +0100 (Tue, 10 Nov 2009) New Revision: 316 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/test/resources/log4j.properties Log: config solr Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-11-06 18:01:21 UTC (rev 315) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-11-10 16:30:50 UTC (rev 316) @@ -54,7 +54,7 @@ /** * Abstract class that new implementation must extends. * New implementation only have three method to implement: - * <li>getSearchEngin + * <li>getSearchEngine * <li>getExtensionStorage * <li>getWikittyStorage * @@ -85,7 +85,7 @@ protected Map<String, Future<String>> importExportTask = new HashMap<String, Future<String>>(); - abstract protected WikittySearchEngin getSearchEngin(); + abstract protected WikittySearchEngine getSearchEngine(); abstract protected WikittyExtensionStorage getExtensionStorage(); abstract protected WikittyStorage getWikittyStorage(); @@ -136,8 +136,8 @@ getWikittyStorage().prepare(transaction, wikitties, disableAutoVersionIncrement); // create solr wikitty document for solr - List<WikittySearchEngin.Command> wikittyIndexationCommandList = - getSearchEngin().prepare(transaction, wikitties); + List<WikittySearchEngine.Command> wikittyIndexationCommandList = + getSearchEngine().prepare(transaction, wikitties); // All prepare (store and index) are good // try to commit command @@ -145,7 +145,7 @@ extensionStorageCommandList); UpdateResponse wikUpdate = getWikittyStorage().commit(transaction, wikittyStorageCommandList); - UpdateResponse indexUpdate = getSearchEngin().commit(transaction, + UpdateResponse indexUpdate = getSearchEngine().commit(transaction, wikittyIndexationCommandList); UpdateResponse result = new UpdateResponse(); @@ -245,16 +245,16 @@ WikittyTransaction transaction = new WikittyTransaction(); List<WikittyStorage.Command> storeCommands = getWikittyStorage().delete(idList); - List<WikittySearchEngin.Command> indexCommands = - getSearchEngin().delete(transaction, idList); + List<WikittySearchEngine.Command> indexCommands = + getSearchEngine().delete(transaction, idList); getWikittyStorage().commit(transaction, storeCommands); - getSearchEngin().commit(transaction, indexCommands); + getSearchEngine().commit(transaction, indexCommands); } public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { - PagedResult<String> resultId = getSearchEngin().findAllByCriteria(criteria); + PagedResult<String> resultId = getSearchEngine().findAllByCriteria(criteria); PagedResult<Wikitty> result = resultId.cast(getWikittyStorage()); return result; } @@ -355,7 +355,7 @@ Map<TreeNode, Integer> result = new LinkedHashMap<TreeNode, Integer>(); - Map<String, Integer> search = getSearchEngin().findAllChildren(w); + Map<String, Integer> search = getSearchEngine().findAllChildren(w); Set<Entry<String, Integer>> children = search.entrySet(); for (Entry<String, Integer> child : children) { Integer count = child.getValue(); @@ -678,4 +678,14 @@ } } + /** + * Changes the data directory + * @param newDataDir the new data directory path + * @param oldDataDir the old data directory path. + * If null, the data in the old directory will not be copied. + */ + public void changeDataDir(String newDataDir, String oldDataDir) { + getSearchEngine().changeDataDir(newDataDir, oldDataDir); + } + } Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2009-11-06 18:01:21 UTC (rev 315) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2009-11-10 16:30:50 UTC (rev 316) @@ -410,5 +410,7 @@ wikittyService.freeJobResource(jobId); } - + public void changeDataDir(String newDataDir, String oldDataDir) { + wikittyService.changeDataDir(newDataDir, oldDataDir); + } } Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java 2009-11-06 18:01:21 UTC (rev 315) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java 2009-11-10 16:30:50 UTC (rev 316) @@ -264,4 +264,12 @@ */ void freeJobResource(String jobId); + /** + * Changes the data directory + * @param newDataDir the new data directory path + * @param oldDataDir the old data directory path. + * If null, the data in the old directory will not be copied. + */ + public void changeDataDir(String newDataDir, String oldDataDir); + } Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java 2009-11-06 18:01:21 UTC (rev 315) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java 2009-11-10 16:30:50 UTC (rev 316) @@ -37,10 +37,8 @@ import org.apache.commons.logging.LogFactory; import org.sharengo.wikitty.FieldType.TYPE; import org.sharengo.wikitty.search.And; -import org.sharengo.wikitty.search.Between; import org.sharengo.wikitty.search.BinaryOperator; import org.sharengo.wikitty.search.Element; -import org.sharengo.wikitty.search.Equals; import org.sharengo.wikitty.search.Restriction; /** @@ -221,11 +219,11 @@ } } - class WikittySearchEnginInMemory implements WikittySearchEngin { + class WikittySearchEngineInMemory implements WikittySearchEngine { WikittyStorageInMemory wikittyStorage; - public WikittySearchEnginInMemory(WikittyStorageInMemory wikittyStorage) { + public WikittySearchEngineInMemory(WikittyStorageInMemory wikittyStorage) { this.wikittyStorage = wikittyStorage; } @@ -233,6 +231,11 @@ // do nothing } + @Override + public void changeDataDir(String newDataDir, String oldDataDir) { + //Do nothing + } + public List<Command> prepare(WikittyTransaction transaction, Collection<Wikitty> wikitties) { // do nothing @@ -357,12 +360,12 @@ protected WikittyStorage wikittyStorage; protected WikittyExtensionStorage extensionStorage; - protected WikittySearchEngin searchEngin; + protected WikittySearchEngine searchEngine; public WikittyServiceInMemory() { extensionStorage = new WikittyExtensionStorageInMemory(); wikittyStorage = new WikittyStorageInMemory(); - searchEngin = new WikittySearchEnginInMemory((WikittyStorageInMemory)wikittyStorage); + searchEngine = new WikittySearchEngineInMemory((WikittyStorageInMemory)wikittyStorage); } public WikittyServiceInMemory(File persitenceFile) { @@ -392,8 +395,8 @@ } @Override - protected WikittySearchEngin getSearchEngin() { - return searchEngin; + protected WikittySearchEngine getSearchEngine() { + return searchEngine; } @Override Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/test/resources/log4j.properties =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/test/resources/log4j.properties 2009-11-06 18:01:21 UTC (rev 315) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/test/resources/log4j.properties 2009-11-10 16:30:50 UTC (rev 316) @@ -6,3 +6,4 @@ # Configuration by components log4j.rootLogger=ERROR, logConsole log4j.category.org.sharengo.wikitty=DEBUG +log4j.category.org.apache.solr=DEBUG