r814 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/synchro resources - Wikitty-commits

18 Apr 2011

Author: mfortun
Date: 2011-04-18 10:59:39 +0200 (Mon, 18 Apr 2011)
New Revision: 814

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

Log:
* need to debug store to see what going on and why two store on the wame wikitty by two different wikitty service won't work

Modified:
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java
   trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties
   trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties

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-04-15 15:54:11 UTC (rev 813)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java	2011-04-18 08:59:39 UTC (rev 814)
@@ -24,6 +24,8 @@
  */
 package org.nuiton.wikitty.publication.synchro;
 
+import gnu.cajo.Cajo;
+
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
@@ -39,10 +41,13 @@
 import org.nuiton.wikitty.entities.Wikitty;
 import org.nuiton.wikitty.entities.WikittyLabel;
 import org.nuiton.wikitty.entities.WikittyLabelHelper;
+import org.nuiton.wikitty.entities.WikittyUser;
+import org.nuiton.wikitty.entities.WikittyUserImpl;
 import org.nuiton.wikitty.publication.entities.WikittyPubData;
 import org.nuiton.wikitty.publication.entities.WikittyPubText;
 import org.nuiton.wikitty.search.Criteria;
 import org.nuiton.wikitty.search.Search;
+import org.nuiton.wikitty.services.WikittyServiceCajoClient;
 
 /**
  * Main class of the sync part of wikitty publication, this class is the entry
@@ -60,6 +65,8 @@
     final static private Log log = LogFactory.getLog(WikittyPublication.class);
 
     static protected ApplicationConfig applicationConfig;
+    
+   
 
     /*
      * static string for allias, wrong named attribut TODO mfortun-2011-04-06
@@ -124,6 +131,7 @@
 
         URI uriTarget = new URI(target);
 
+        
         boolean isDelete = applicationConfig
                 .getOptionAsBoolean(IS_DELETE_OPTION);
         boolean isExisting = applicationConfig
@@ -136,17 +144,30 @@
          * the correct implementation of the wikitty service
          */
         // once on the service origin
-        setUpApplicationConfigServerConnector(uriOrigin);
+        ApplicationConfig temp1 =setUpApplicationConfigServerConnector(uriOrigin);
 
         WikittyProxy proxyOrigin = new WikittyProxy(
-                WikittyServiceFactory.buildWikittyService(applicationConfig));
+                WikittyServiceFactory.buildWikittyService(temp1));
 
         // once on the service target
-        setUpApplicationConfigServerConnector(uriTarget);
+        ApplicationConfig temp2 = setUpApplicationConfigServerConnector(uriTarget);
 
         WikittyProxy proxyTarget = new WikittyProxy(
-                WikittyServiceFactory.buildWikittyService(applicationConfig));
-
+                WikittyServiceFactory.buildWikittyService(temp2));
+        
+        
+        WikittyUser test1= new WikittyUserImpl();
+        test1.setLogin("chaussetteé");
+        
+        WikittyUser test2= new WikittyUserImpl();
+        test2.setLogin("chaussette");
+        
+        proxyOrigin.store(test1);
+        System.out.println(test1.getWikittyVersion());
+        test1.setLogin("ponay");
+        proxyTarget.store(test1);
+        //proxyTarget.st
+        
         /*
          * TODO mfortun-2011-04-14 voir comment on fait quand les deux uris
          * déclare des labels en fragment, si on les composent ensemble ou un
@@ -158,6 +179,8 @@
         Criteria critOrigin = constructCriteriaLabelRecur(labelOrigin, isRecur);
         Criteria critTarget = constructCriteriaLabelRecur(labelTarget, isRecur);
 
+       
+        
         List<String> listOrigin = proxyOrigin.findAllIdByCriteria(critOrigin)
                 .getAll();
         List<String> listTarget = proxyTarget.findAllIdByCriteria(critTarget)
@@ -178,12 +201,12 @@
         existOnlyOnTarget.addAll(listTarget);
         existOnlyOnTarget.removeAll(listOrigin);
 
+
+
         /*
          * if option is update send wikitty that are not in the target.
          */
         if (isUpdate) {
-
-            //FIXME mfortun-2011-04-15 something wrong it does not works
             
             List<Wikitty> newWikitties = proxyOrigin.restore(existOnlyOnOrigin);
             proxyTarget.storeWikitty(newWikitties);
@@ -274,28 +297,41 @@
      * @param uri
      *            of the targeted wikitty service
      */
-    static protected void setUpApplicationConfigServerConnector(URI uri) {
+    static protected ApplicationConfig setUpApplicationConfigServerConnector(URI uri) {
 
+        
+        
+        
+        ApplicationConfig result = new ApplicationConfig();
+        
+        
+        result.setOptions(applicationConfig.getFlatOptions());
         if (uri.getScheme().equals("file")) {
-            applicationConfig
+            result
                     .setOption("wikitty.WikittyService.components",
                             "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem");
         }
 
         if (uri.getScheme().equals("cajo")) {
-            applicationConfig.setOption("wikitty.WikittyService.components",
+            result.setOption("wikitty.WikittyService.components",
                     "org.nuiton.wikitty.services.WikittyServiceCajoClient");
         }
 
         if (uri.getScheme().equals("hessian")) {
-            applicationConfig.setOption("wikitty.WikittyService.components",
+            result.setOption("wikitty.WikittyService.components",
                     "org.nuiton.wikitty.services.WikittyServiceHessianClient");
         }
 
         
+        String url= uri.toASCIIString().replace("#wp", "");
+        
         //FIXME mfortun-2011-04-15 correct url by removing fragment 
-        applicationConfig.setOption("wikitty.service.server.url",
-                uri.toASCIIString());
+        result.setOption("wikitty.service.server.url",
+                url);
+        
+        return result;
+        
+        
 
     }
 }

Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties
===================================================================
--- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties	2011-04-15 15:54:11 UTC (rev 813)
+++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties	2011-04-18 08:59:39 UTC (rev 814)
@@ -22,4 +22,4 @@
 # <http://www.gnu.org/licenses/lgpl-3.0.html>.
 # #L%
 ###
-wikitty.data.directory=/var/lib/wikitty-publication/codelutin
+wikitty.data.directory=/var/lib/wikitty-publication/codelutin2

Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties
===================================================================
--- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties	2011-04-15 15:54:11 UTC (rev 813)
+++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties	2011-04-18 08:59:39 UTC (rev 814)
@@ -22,7 +22,7 @@
 # <http://www.gnu.org/licenses/lgpl-3.0.html>.
 # #L%
 ###
-wikitty.data.directory=./target/data
+wikitty.data.directory=./target2/data
 wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties
 wikitty.storage.jdbc.driver=org.h2.Driver
 wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db

    

r814 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/synchro resources

mfortun＠users.nuiton.org

tags

participants (1)