Author: kmorin Date: 2009-11-10 17:30:58 +0100 (Tue, 10 Nov 2009) New Revision: 317 Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyServiceJDBC.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/JDBCStorageTest.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/TreeTest.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/WikittySearchEngineTest.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/test/util/GenTestData.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/resources/log4j.properties Log: config solr Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyServiceJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyServiceJDBC.java 2009-11-10 16:30:50 UTC (rev 316) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyServiceJDBC.java 2009-11-10 16:30:58 UTC (rev 317) @@ -56,19 +56,19 @@ */ static private Log log = LogFactory.getLog(WikittyServiceJDBC.class); - protected WikittySearchEngin searchEngin; + protected WikittySearchEngine searchEngine; protected WikittyExtensionStorage extensionStorage; protected WikittyStorage wikittyStorage; public WikittyServiceJDBC() { extensionStorage = new WikittyExtensionStorageJDBC(); wikittyStorage = new WikittyStorageJDBC(extensionStorage); - searchEngin = new WikittySearchEngineSolr(extensionStorage); + searchEngine = new WikittySearchEngineSolr(extensionStorage); } @Override - protected WikittySearchEngin getSearchEngin() { - return searchEngin; + protected WikittySearchEngine getSearchEngine() { + return searchEngine; } @Override Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/JDBCStorageTest.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/JDBCStorageTest.java 2009-11-10 16:30:50 UTC (rev 316) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/JDBCStorageTest.java 2009-11-10 16:30:58 UTC (rev 317) @@ -21,6 +21,7 @@ import org.sharengo.wikitty.Criteria; import org.sharengo.wikitty.Wikitty; import org.sharengo.wikitty.WikittyService; +import org.sharengo.wikitty.search.Element; import org.sharengo.wikitty.search.Search; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -36,7 +37,7 @@ public void testExport() throws Exception { final List<Wikitty> wikitties = createSampleWikitty(ws); - Criteria criteria = Search.query().eqExt(EXTNAME).criteria(); + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, EXTNAME).criteria(); String result = ws.syncExportAllByCriteria(criteria); log.debug("[XML] " + result); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/TreeTest.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/TreeTest.java 2009-11-10 16:30:50 UTC (rev 316) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/TreeTest.java 2009-11-10 16:30:58 UTC (rev 317) @@ -26,16 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.sharengo.internal.TreeNodeImpl; -import org.sharengo.wikitty.Criteria; -import org.sharengo.wikitty.ExtensionFactory; -import org.sharengo.wikitty.FacetTopic; -import org.sharengo.wikitty.PagedResult; -import org.sharengo.wikitty.Tree; -import org.sharengo.wikitty.TreeNode; -import org.sharengo.wikitty.Wikitty; -import org.sharengo.wikitty.WikittyExtension; -import org.sharengo.wikitty.WikittyService; +import org.sharengo.wikitty.*; import org.sharengo.wikitty.FieldType.TYPE; import org.sharengo.wikitty.search.Search; import org.sharengo.wikitty.solr.WikittySearchEngineSolr; @@ -96,8 +87,8 @@ Wikitty found = findNode(name); if(found == null) { TreeNodeImpl node = new TreeNodeImpl(); - node.setTreeNodeName(name); - node.setTreeNodeParent(parent); + node.setName(name); + node.setParent(parent); found = node.getWikitty(); log.debug("[Storing] " + name + " with id " + found.getId()); Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/WikittySearchEngineTest.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/WikittySearchEngineTest.java 2009-11-10 16:30:50 UTC (rev 316) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/WikittySearchEngineTest.java 2009-11-10 16:30:58 UTC (rev 317) @@ -110,7 +110,7 @@ public void setUp() throws Exception { // import data and prepare expected result ws = new WikittyServiceJDBC(); - ((WikittyServiceJDBC)ws).getSearchEngin().clear(); + ((WikittyServiceJDBC)ws).getSearchEngine().clear(); assertReference = new AssertReference(); GenTestData.importGeneratedFile( GenTestData.getDataFile("selected-data.txt"), ws, assertReference); Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/test/util/GenTestData.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/test/util/GenTestData.java 2009-11-10 16:30:50 UTC (rev 316) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/test/util/GenTestData.java 2009-11-10 16:30:58 UTC (rev 317) @@ -17,6 +17,9 @@ import org.sharengo.wikitty.WikittyExtension; import org.sharengo.wikitty.WikittyService; import org.sharengo.wikitty.WikittyUtil; +import org.sharengo.wikitty.jdbc.WikittyServiceJDBC; +import org.sharengo.wikitty.search.Element; +import org.sharengo.wikitty.search.Search; public class GenTestData { @@ -152,7 +155,11 @@ } public static void main(String[] args) throws Exception { - File file = getDataFile( "random-data.txt" ); - new GenTestData( file ); +// File file = getDataFile( "random-data.txt" ); +// new GenTestData( file ); + + WikittyService ws = new WikittyServiceJDBC(); + ws.findAllByCriteria(Search.query().eq("name","*test*").criteria()); + } } Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/resources/log4j.properties =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/resources/log4j.properties 2009-11-10 16:30:50 UTC (rev 316) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/test/resources/log4j.properties 2009-11-10 16:30:58 UTC (rev 317) @@ -6,4 +6,4 @@ # Configuration by components log4j.rootLogger=ERROR, logConsole log4j.category.org.sharengo.wikitty=DEBUG -#log4j.category.org.apache.solr=DEBUG +log4j.category.org.apache.solr=DEBUG