Author: echatellier Date: 2010-05-28 18:47:31 +0200 (Fri, 28 May 2010) New Revision: 62 Url: http://nuiton.org/repositories/revision/wikitty/62 Log: Fix compilation problem (abstract / impl replacement) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyServiceHBase.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyServiceJPA.java trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyServiceMultiStorage.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-05-28 16:21:57 UTC (rev 61) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-05-28 16:47:31 UTC (rev 62) @@ -59,6 +59,14 @@ protected WikittyExtensionStorage extensionStorage; protected WikittyStorage wikittyStorage; + /** + * @deprecated since 2.0 will be removed soon (leave {@link #searchEngin}, {@link #extensionStorage} , {@link #wikittyStorage} uninitialized + */ + @Deprecated + protected WikittyServiceImpl() { + + } + public WikittyServiceImpl(WikittyExtensionStorage extensionStorage, WikittyStorage wikittyStorage, WikittySearchEngin searchEngin) { Modified: trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyServiceHBase.java =================================================================== --- trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyServiceHBase.java 2010-05-28 16:21:57 UTC (rev 61) +++ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyServiceHBase.java 2010-05-28 16:47:31 UTC (rev 62) @@ -20,10 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.AbstractWikittyService; -import org.nuiton.wikitty.WikittyExtensionStorage; -import org.nuiton.wikitty.WikittySearchEngin; -import org.nuiton.wikitty.WikittyStorage; +import org.nuiton.wikitty.WikittyServiceImpl; import org.nuiton.wikitty.solr.WikittySearchEnginSolr; /** Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2010-05-28 16:21:57 UTC (rev 61) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2010-05-28 16:47:31 UTC (rev 62) @@ -19,11 +19,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.AbstractWikittyService; -import org.nuiton.wikitty.WikittyExtensionStorage; -import org.nuiton.wikitty.WikittySearchEngin; -import org.nuiton.wikitty.WikittyServiceInMemory; -import org.nuiton.wikitty.WikittyStorage; +import org.nuiton.wikitty.WikittyServiceImpl; import org.nuiton.wikitty.solr.WikittySearchEnginSolr; /** Modified: trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyServiceJPA.java =================================================================== --- trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyServiceJPA.java 2010-05-28 16:21:57 UTC (rev 61) +++ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyServiceJPA.java 2010-05-28 16:47:31 UTC (rev 62) @@ -19,9 +19,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.AbstractWikittyService; import org.nuiton.wikitty.WikittyExtensionStorage; import org.nuiton.wikitty.WikittySearchEngin; +import org.nuiton.wikitty.WikittyServiceImpl; import org.nuiton.wikitty.WikittyStorage; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +32,7 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittyServiceJPA extends AbstractWikittyService { +public class WikittyServiceJPA extends WikittyServiceImpl { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceJPA.class); @@ -46,6 +46,12 @@ @Autowired protected WikittyStorage wikittyStorage; + /** + * FIXME EC20100528 super searchEngin, extensionStorage, wikittyStorage + * need to be intialized + * + * Mit de coté temporairement a cause des @Autowired + */ public WikittyServiceJPA() { } Modified: trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyServiceMultiStorage.java =================================================================== --- trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyServiceMultiStorage.java 2010-05-28 16:21:57 UTC (rev 61) +++ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyServiceMultiStorage.java 2010-05-28 16:47:31 UTC (rev 62) @@ -17,7 +17,7 @@ package org.nuiton.wikitty.multistorage; -import org.nuiton.wikitty.AbstractWikittyService; +import org.nuiton.wikitty.WikittyServiceImpl; import org.nuiton.wikitty.WikittyExtensionStorage; import org.nuiton.wikitty.WikittySearchEngin; import org.nuiton.wikitty.WikittyStorage; @@ -33,10 +33,6 @@ */ public class WikittyServiceMultiStorage extends WikittyServiceImpl { - protected WikittySearchEngin searchEngin; - protected WikittyExtensionStorage extensionStorage; - protected WikittyStorage wikittyStorage; - protected MultiStorageConfiguration configuration; public WikittyServiceMultiStorage(MultiStorageConfiguration configuration) { @@ -50,12 +46,4 @@ this(new MultiStorageConfiguration.BasicConfiguration()); } - public WikittyExtensionStorage getExtensionMultiStorage() { - return extensionStorage; - } - - public WikittyStorage getWikittyMultiStorage() { - return wikittyStorage; - } - } Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java 2010-05-28 16:21:57 UTC (rev 61) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java 2010-05-28 16:47:31 UTC (rev 62) @@ -17,13 +17,8 @@ package org.nuiton.wikitty.solr.test; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.AbstractWikittyService; -import org.nuiton.wikitty.WikittyExtensionStorage; -import org.nuiton.wikitty.WikittySearchEngin; +import org.nuiton.wikitty.WikittyServiceImpl; import org.nuiton.wikitty.WikittyServiceInMemory; -import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.solr.WikittySearchEnginSolr; /** @@ -34,33 +29,11 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittyServiceSolr extends AbstractWikittyService { +public class WikittyServiceSolr extends WikittyServiceImpl { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyServiceSolr.class); - - protected WikittySearchEngin searchEngin; - protected WikittyExtensionStorage extensionStorage; - protected WikittyStorage wikittyStorage; - public WikittyServiceSolr() { extensionStorage = new WikittyServiceInMemory.WikittyExtensionStorageInMemory(); wikittyStorage = new WikittyServiceInMemory.WikittyStorageInMemory(); searchEngin = new WikittySearchEnginSolr(extensionStorage); } - - @Override - protected WikittySearchEngin getSearchEngin() { - return searchEngin; - } - - @Override - protected WikittyExtensionStorage getExtensionStorage() { - return extensionStorage; - } - - @Override - protected WikittyStorage getWikittyStorage() { - return wikittyStorage; - } }