r945 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro - Wikitty-commits

17 Jun 2011

Author: mfortun
Date: 2011-06-17 14:39:18 +0200 (Fri, 17 Jun 2011)
New Revision: 945

Url: http://nuiton.org/repositories/revision/wikitty/945

Log:
* remove static wikitty option from publication to use common property defined in wikitty 

Modified:
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java

Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java
===================================================================

--- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java	2011-06-16 15:57:53 UTC (rev 944)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java	2011-06-17 12:39:18 UTC (rev 945)
@@ -37,6 +37,7 @@
 import org.nuiton.util.ApplicationConfig;
 import org.nuiton.util.ArgumentsParserException;
 import org.nuiton.util.FileUtil;
+import org.nuiton.wikitty.WikittyConfigOption;
 import org.nuiton.wikitty.WikittyProxy;
 import org.nuiton.wikitty.WikittyServiceFactory;
 import org.nuiton.wikitty.WikittyUtil;
@@ -61,14 +62,7 @@
     /** to use log facility, just put in your code: log.info(\"...\"); */
     final static private Log log = LogFactory.getLog(WikittyPublication.class);
 
-    /**
-     * option for the url of a wikitty service
-     */
-    static public String WIKITTY_OPTION_URL = "wikitty.service.server.url";
-    /**
-     * option for the component class use to interract with the wikittyService
-     */
-    static public String WIKITTY_OPTION_COMPONENT = "wikitty.WikittyService.components";
+ 
 
     /**
      * Key for the other uri, usefull in the case of commit/update with a file
@@ -453,17 +447,23 @@
 
         if (uri.getScheme().equals("file")) {
 
-            result.setOption(WIKITTY_OPTION_COMPONENT,
+            result.setOption(
+                    WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS
+                            .getKey(),
                     "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem");
         } else if (uri.getScheme().equals("cajo")) {
-            result.setOption(WIKITTY_OPTION_COMPONENT,
+            result.setOption(
+                    WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS
+                            .getKey(),
                     "org.nuiton.wikitty.services.WikittyServiceCajoClient");
 
             // remove fragment from the uri.
             url = new String(url.replaceAll("\\#.*", ""));
 
         } else if (uri.getScheme().equals("hessian")) {
-            result.setOption(WIKITTY_OPTION_COMPONENT,
+            result.setOption(
+                    WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS
+                            .getKey(),
                     "org.nuiton.wikitty.services.WikittyServiceHessianClient");
             // remove fragment from the uri.
             url = new String(url.replaceAll("\\#.*", ""));
@@ -477,7 +477,7 @@
         log.info("set url " + url + " with component :"
                 + result.getOption("wikitty.WikittyService.components"));
 
-        result.setOption(WIKITTY_OPTION_URL, url);
+        result.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), url);
 
         log.debug("Application config: " + result.getFlatOptions());
 

Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java
===================================================================
--- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java	2011-06-16 15:57:53 UTC (rev 944)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java	2011-06-17 12:39:18 UTC (rev 945)
@@ -53,6 +53,7 @@
 import org.nuiton.util.FileUtil;
 import org.nuiton.util.MD5InputStream;
 import org.nuiton.util.StringUtil;
+import org.nuiton.wikitty.WikittyConfigOption;
 import org.nuiton.wikitty.WikittyException;
 import org.nuiton.wikitty.WikittyService;
 import org.nuiton.wikitty.WikittyUtil;
@@ -196,7 +197,8 @@
 
         this.mimeHelper = new MimeTypePubHelper();
 
-        String url = app.getOption(WikittyPublication.WIKITTY_OPTION_URL);
+        String url = app.getOption(WikittyConfigOption.WIKITTY_SERVER_URL
+                .getKey());
         URI uri = new URI(url);
 
         this.homeFile = new File(uri.getPath());
@@ -606,7 +608,7 @@
     }
 
     /*
-     * TODO mfortun-2011-04-29 see if method really needed ? 
+     * TODO mfortun-2011-04-29 see if method really needed ?
      */
     @Override
     public WikittyEvent delete(String securityToken, Collection<String> ids) {

    

r945 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro

mfortun＠users.nuiton.org

tags

participants (1)