Author: sletellier Date: 2010-11-23 11:38:36 +0100 (Tue, 23 Nov 2010) New Revision: 500 Url: http://nuiton.org/repositories/revision/wikitty/500 Log: - Rename Option to WikittyOption - Rename Action to WikittyAction - Implement ActionDef for WikittyAction - Use loadDefaultOption to init appCoonfig - Use variable to define nuiton-utils used - Up to snapshot of nuiton-util - Use real variable for propagation class to use in properties Modified: trunk/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/pom.xml 2010-11-23 10:38:36 UTC (rev 500) @@ -184,7 +184,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.6-SNAPSHOT</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> @@ -520,6 +520,7 @@ <!-- common versions used in sub-poms --> <eugeneVersion>2.2</eugeneVersion> + <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> <springVersion>3.0.1.RELEASE</springVersion> <jettyMorbayVersion>6.1.22</jettyMorbayVersion> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-11-23 10:38:36 UTC (rev 500) @@ -91,7 +91,7 @@ */ public WikittyConfig(String configFilename) { this(); - setDefaultOption(Option.WIKITTY_CONFIG_FILE.getKey(), configFilename); + setDefaultOption(WikittyOption.WIKITTY_CONFIG_FILE.getKey(), configFilename); } /** @@ -110,24 +110,16 @@ protected void init() { // init configuration with default options - for (Option o : Option.values()) { - if (o.defaultValue != null) { - setDefaultOption(o.key, o.defaultValue); - } - } + loadDefaultOptions(WikittyOption.class); // init actions - for (Action a : Action.values()) { - for (String alias : a.aliases) { - addActionAlias(alias, a.action); - } - } + loadActions(WikittyAction.class); } /** * Configuration option for all modules */ - public static enum Option implements OptionDef { + public static enum WikittyOption implements OptionDef { WIKITTY_CONFIG_FILE( CONFIG_FILE_NAME, @@ -303,7 +295,7 @@ public boolean isTransient; public boolean isFinal; - private Option(String key, String description, String defaultValue, Class<?> type, boolean isTransient, boolean isFinal) { + private WikittyOption(String key, String description, String defaultValue, Class<?> type, boolean isTransient, boolean isFinal) { this.key = key; this.description = description; this.defaultValue = defaultValue; @@ -358,7 +350,7 @@ } } - public static enum Action { + public static enum WikittyAction implements ActionDef { HELP(_("Wikitty help"), WikittyConfig.class.getName() + "#help", "-h", "--help"); @@ -367,22 +359,48 @@ public String action; public String[] aliases; - private Action(String description, String action, String... aliases) { + private WikittyAction(String description, String action, String... aliases) { this.description = description; this.action = action; this.aliases = aliases; } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + @Override + public String[] getAliases() { + return aliases; + } + + public void setAliases(String[] aliases) { + this.aliases = aliases; + } } static public void help() { System.out.println("Wikitty configuration and action"); System.out.println("Options (set with --option <key> <value>:"); - for (WikittyConfig.Option o : WikittyConfig.Option.values()) { + for (WikittyOption o : WikittyOption.values()) { log.debug("\t" + o.key + "(" + o.defaultValue + "):" + o.description); } log.debug("Actions:"); - for (WikittyConfig.Action a : WikittyConfig.Action.values()) { + for (WikittyAction a : WikittyAction.values()) { log.debug("\t" + java.util.Arrays.toString(a.aliases) + "(" + a.action + "):" + a.description); } System.exit(0); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-11-23 10:38:36 UTC (rev 500) @@ -102,7 +102,7 @@ ApplicationConfig config, WikittyServiceNotifier notifier) { Class<WikittyServiceNotifier.RemoteNotifierTransporter> transporterClass = (Class<WikittyServiceNotifier.RemoteNotifierTransporter>)config.getOptionAsClass( - WikittyConfig.Option.WIKITTY_EVENT_TRANSPORTER.getKey()); + WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER.getKey()); MutablePicoContainer pico = new TransientPicoContainer(); pico.addComponent(config); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2010-11-23 10:38:36 UTC (rev 500) @@ -103,12 +103,12 @@ this.ws = ws; exportDirectory = config.getOption( - WikittyConfig.Option.WIKITTY_EXPORT_DIRECTORY.getKey()); + WikittyConfig.WikittyOption.WIKITTY_EXPORT_DIRECTORY.getKey()); exportPublicURL = config.getOption( - WikittyConfig.Option.WIKITTY_EXPORT_PUBLICURL.getKey()); + WikittyConfig.WikittyOption.WIKITTY_EXPORT_PUBLICURL.getKey()); int maxThread = config.getOptionAsInt( - WikittyConfig.Option.WIKITTY_EXPORT_THREADNUMBER.getKey()); + WikittyConfig.WikittyOption.WIKITTY_EXPORT_THREADNUMBER.getKey()); this.importExportExecutor = Executors.newFixedThreadPool(maxThread); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java 2010-11-23 10:38:36 UTC (rev 500) @@ -24,8 +24,6 @@ */ package org.nuiton.wikitty.services; -import org.nuiton.wikitty.services.WikittyServiceNotifier; -import org.nuiton.wikitty.services.WikittyEvent; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -67,7 +65,7 @@ // can be null according to default constructor if (config != null) { // add notifier as listener - String jgroupChannel = config.getOption(WikittyConfig.Option.WIKITTY_EVENT_TRANSPORTER_JGROUP_CHANNELNAME.getKey()); + String jgroupChannel = config.getOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_JGROUP_CHANNELNAME.getKey()); if (!StringUtils.isBlank(jgroupChannel)) { initChannel(jgroupChannel); } else { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-11-23 10:38:36 UTC (rev 500) @@ -100,7 +100,7 @@ if (config != null) { // reading configuration and set allwaysRestoreCopies accordingly allwaysRestoreCopies = - config.getOptionAsBoolean(WikittyConfig.Option.WIKITTY_CACHE_RESTORE_COPIES.getKey()); + config.getOptionAsBoolean(WikittyConfig.WikittyOption.WIKITTY_CACHE_RESTORE_COPIES.getKey()); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2010-11-23 10:38:36 UTC (rev 500) @@ -76,10 +76,10 @@ if (config != null) { boolean persist = config.getOptionAsBoolean( - WikittyConfig.Option.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey()); + WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey()); if (persist) { persistenceFile = config.getOptionAsFile( - WikittyConfig.Option.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey()); + WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey()); restoreFromPersistenceFile(persistenceFile); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2010-11-23 10:38:36 UTC (rev 500) @@ -26,15 +26,6 @@ package org.nuiton.wikitty.services; -import org.nuiton.wikitty.services.WikittyServiceNotifier; -import org.nuiton.wikitty.services.WikittyEvent; -import java.net.Inet4Address; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.Date; -import java.util.Enumeration; -import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jivesoftware.smack.PacketListener; @@ -91,9 +82,9 @@ * @param props */ public XMPPNotifierTransporter(ApplicationConfig config, WikittyServiceNotifier ws) { - propagateEvent = config.getOptionAsBoolean(WikittyConfig.Option. + propagateEvent = config.getOptionAsBoolean(WikittyConfig.WikittyOption. WIKITTY_EVENT_PROPAGATE.getKey()); - listenEvent = config.getOptionAsBoolean(WikittyConfig.Option. + listenEvent = config.getOptionAsBoolean(WikittyConfig.WikittyOption. WIKITTY_EVENT_LISTEN.getKey()); setWikittyServiceNotifier(ws); @@ -117,10 +108,10 @@ // on verifie qu'on a besoin reellement de faire l'init if (propagateEvent || listenEvent) { String server = config.getOption( - WikittyConfig.Option.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey()); + WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey()); // Keep them to verify that is not us notifications - room = config.getOption(WikittyConfig.Option. + room = config.getOption(WikittyConfig.WikittyOption. WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey()); pseudo = WikittyUtil.getUniqueLoginName(); try { Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties 2010-11-23 10:38:36 UTC (rev 500) @@ -29,7 +29,7 @@ wikitty.service.cache.allwaysRestoreCopies=false wikitty.service.event.propagate=false wikitty.service.event.listen=true -wikitty.service.event.transporter=org.nuiton.wikitty.services.XMPPNotifierTransporter +wikitty.service.event.propagate.transporter=org.nuiton.wikitty.services.XMPPNotifierTransporter wikitty.service.event.transporter.xmpp.server=im.codelutin.com wikitty.service.event.transporter.xmpp.room=master@conference.im.codelutin.com wikitty.service.server.url=http://services.codelutin.com/wikitty Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2010-11-23 10:38:36 UTC (rev 500) @@ -46,7 +46,7 @@ wikitty.service.cache.allwaysRestoreCopies=false wikitty.service.event.propagate=true wikitty.service.event.listen=false -wikitty.service.event.transporter=org.nuiton.wikitty.services.XMPPNotifierTransporter +wikitty.service.event.propagate.transporter=org.nuiton.wikitty.services.XMPPNotifierTransporter wikitty.service.event.transporter.xmpp.server=im.codelutin.com wikitty.service.event.transporter.xmpp.room=slave@conference.im.codelutin.com wikitty.service.slave.async.store=false Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2010-11-23 10:38:36 UTC (rev 500) @@ -46,7 +46,7 @@ wikitty.service.cache.allwaysRestoreCopies=false wikitty.service.event.propagate=true wikitty.service.event.listen=false -wikitty.service.event.transporter=org.nuiton.wikitty.services.XMPPNotifierTransporter +wikitty.service.event.propagate.transporter=org.nuiton.wikitty.services.XMPPNotifierTransporter wikitty.service.event.transporter.xmpp.server=im.codelutin.com wikitty.service.event.transporter.xmpp.room=master@conference.im.codelutin.com wikitty.addon.export.threadnumber=1 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2010-11-23 10:38:36 UTC (rev 500) @@ -93,7 +93,7 @@ WikittyConfig config = new WikittyConfig(); config.setOption( - WikittyConfig.Option.WIKITTY_CACHE_RESTORE_COPIES.getKey(), + WikittyConfig.WikittyOption.WIKITTY_CACHE_RESTORE_COPIES.getKey(), "true"); setService(new WikittyServiceCached(config, new WikittyServiceInMemory(config))); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-11-23 10:38:36 UTC (rev 500) @@ -74,10 +74,10 @@ WikittyConfig config = new WikittyConfig(); config.setOption( - WikittyConfig.Option.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey(), + WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey(), "true"); config.setOption( - WikittyConfig.Option.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey(), + WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey(), tempPersistFile.getPath()); wikittyService = new WikittyServiceInMemory(config); String extName = "MyExtName"; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2010-11-23 10:38:36 UTC (rev 500) @@ -57,8 +57,8 @@ String server = "im.codelutin.com"; String room = "test@conference.im.codelutin.com"; WikittyConfig config = new WikittyConfig(); - config.setOption(WikittyConfig.Option.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey(), server); - config.setOption(WikittyConfig.Option.WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey(), room); + config.setOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey(), server); + config.setOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey(), room); // Envoi d'un message avec le transporter normal Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2010-11-23 10:38:36 UTC (rev 500) @@ -49,7 +49,7 @@ @Test public void testBuild() throws Exception { Properties props = new Properties(); - props.setProperty(WikittyConfig.Option.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemory.class.getName() + "," + WikittyServiceNotifier.class.getName() + "," + WikittyServiceCached.class.getName()); Modified: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java 2010-11-23 10:38:36 UTC (rev 500) @@ -46,7 +46,7 @@ static private Log log = LogFactory.getLog(WikittyServiceHessianClient.class); public WikittyServiceHessianClient(ApplicationConfig config) { - String url = config.getOption(WikittyConfig.Option. + String url = config.getOption(WikittyConfig.WikittyOption. WIKITTY_SERVER_URL.getKey()); WikittyService ws = WikittyHessianFactory.getWikittyService(url); setDelegate(ws); Modified: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java 2010-11-23 10:38:36 UTC (rev 500) @@ -94,7 +94,7 @@ super(ws); this.config = config; - File file = config.getOptionAsFile(WikittyConfig.Option. + File file = config.getOptionAsFile(WikittyConfig.WikittyOption. WIKITTY_SLAVE_SYNC_STATE_FILE.getKey()); if (!file.exists()) { throw new WikittyException(String.format( @@ -108,10 +108,10 @@ throw new WikittyException("Can't create file to store slave state", eee); } - syncIntervale = config.getOptionAsInt(WikittyConfig.Option. + syncIntervale = config.getOptionAsInt(WikittyConfig.WikittyOption. WIKITTY_SLAVE_SYNC_STATE_INTERVALE.getKey()); - String masterURL = config.getOption(WikittyConfig.Option. + String masterURL = config.getOption(WikittyConfig.WikittyOption. WIKITTY_SLAVE_MASTER_URL.getKey()); // creation du WikittyService master @@ -163,11 +163,11 @@ * @param props */ protected void initXMPP(ApplicationConfig config) { - String server = config.getOption(WikittyConfig.Option. + String server = config.getOption(WikittyConfig.WikittyOption. WIKITTY_SLAVE_MASTER_XMPP_SERVER.getKey()); // Keep them to verify that is not us notifications - room = config.getOption(WikittyConfig.Option. + room = config.getOption(WikittyConfig.WikittyOption. WIKITTY_SLAVE_MASTER_XMPP_ROOM.getKey()); pseudo = WikittyUtil.getUniqueLoginName(); try { Modified: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java =================================================================== --- trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java 2010-11-23 10:38:36 UTC (rev 500) @@ -64,10 +64,10 @@ servlet.setHome(this); // create servlet container - String jettyConfig = config.getOption(WikittyConfig.Option. + String jettyConfig = config.getOption(WikittyConfig.WikittyOption. WIKITTY_SERVER_CONFIG.getKey()); // port and path from hessian server url in config - String urlString = config.getOption(WikittyConfig.Option. + String urlString = config.getOption(WikittyConfig.WikittyOption. WIKITTY_SERVER_URL.getKey()); int port = 80; Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-11-23 10:38:36 UTC (rev 500) @@ -174,7 +174,7 @@ try { String wikittyQueryFile = config.getOption( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_QUERY_FILE.getKey()); + WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_QUERY_FILE.getKey()); // queries URL url = ClassLoader.getSystemResource(wikittyQueryFile); if (url == null) { @@ -211,16 +211,16 @@ */ public static synchronized Connection getConnection(ApplicationConfig conf) { String driver = conf.getOption( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); + WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); String host = conf.getOption( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_URL.getKey()); + WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_URL.getKey()); String username = conf.getOption( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_LOGIN.getKey()); + WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_LOGIN.getKey()); String password = conf.getOption( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); + WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); String xaDataSourceClassName = conf.getOption( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); + WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); try { TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager(); @@ -244,10 +244,10 @@ for(Entry<Object, Object> properties : conf.getFlatOptions().entrySet()) { String propertyName = (String) properties.getKey(); if (propertyName.startsWith( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + "." + xaDataSourceClassName + ".")) { propertyName = propertyName.replaceFirst( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + "." + xaDataSourceClassName + ".", ""); if(fields.contains(propertyName)) { String propertyValue = (String) properties.getValue(); Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2010-11-23 10:38:36 UTC (rev 500) @@ -55,10 +55,10 @@ // WikittyServiceInMemoryJdbcSolr) String dbName = UUID.randomUUID().toString(); ApplicationConfig config = new WikittyConfig(); - config.setOption(WikittyConfig.Option. + config.setOption(WikittyConfig.WikittyOption. WIKITTY_STORAGE_JDBC_URL.getKey(), "jdbc:h2:mem:" + dbName); - config.setOption(WikittyConfig.Option. + config.setOption(WikittyConfig.WikittyOption. WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(), "org.nuiton.wikitty.solr.RAMDirectoryFactory"); // others defaults value in config normaly is correct Modified: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java =================================================================== --- trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2010-11-23 10:38:36 UTC (rev 500) @@ -46,7 +46,7 @@ @Override protected ApplicationConfig getConfig() { ApplicationConfig result = super.getConfig(); - result.setOption(WikittyConfig.Option. + result.setOption(WikittyConfig.WikittyOption. WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemoryJdbcSolr.class.getName()); return result; Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-11-23 10:35:55 UTC (rev 499) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-11-23 10:38:36 UTC (rev 500) @@ -488,7 +488,7 @@ if (config != null) { // choix du storage (file or Ram) String solrDirFactoryKey = - WikittyConfig.Option.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); + WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); String solrDirFactory = config.getOption(solrDirFactoryKey); if (solrDirFactory != null) { System.setProperty(solrDirFactoryKey, solrDirFactory); @@ -497,7 +497,7 @@ // on utilise le directory que si on est pas en Ram if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { String solrDataDirKey = - WikittyConfig.Option.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); + WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); String solrDataDir = config.getOption(solrDataDirKey); // make sure that dir exists if (solrDataDir != null) {