- Wikitty-commits - mailman.cloud.codelutin.com

r796 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org April 13, 2011

April 13, 2011

Author: mfortun Date: 2011-04-13 09:41:02 +0200 (Wed, 13 Apr 2011) New Revision: 796 Url: http://nuiton.org/repositories/revision/wikitty/796 Log: * remove sub label property, no use finally. Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-12 16:19:00 UTC (rev 795) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-13 07:41:02 UTC (rev 796) @@ -51,7 +51,6 @@ 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 * point for sync operation : import, checkout, commit, delete, relocate and @@ -73,7 +72,7 @@ * static string for allias, wrong named attribut TODO mfortun-2011-04-06 * need to set better name */ - + /* * FIXME mfortun-2011-04-11 need to migrate static value to another class ? */ @@ -105,7 +104,6 @@ static public String META_SUFFIX_KEY_ID = "id"; static public String META_CURRENT_LABEL = "current.label"; - static public String META_SUB_LABEL = "sub.label"; /** * @param args @@ -304,15 +302,12 @@ applicationConfig.setOption("wikitty.WikittyService.components", "org.nuiton.wikitty.services.WikittyServiceCajoClient"); } - + WikittyProxy remoteWikittyService = new WikittyProxy( WikittyServiceFactory.buildWikittyService(applicationConfig)); WikittyPublicationFileSystem localWikittyService = new WikittyPublicationFileSystem( dir, !noRecur, label); - - - // Construct the criteria Criteria labelCriteria; Search mainRequest = Search.query(); @@ -335,18 +330,15 @@ .criteria(); } - - // request to the proxy - PagedResult<Wikitty> pageResult= remoteWikittyService.findAllByCriteria(labelCriteria); - + PagedResult<Wikitty> pageResult = remoteWikittyService + .findAllByCriteria(labelCriteria); + List<Wikitty> wikittiesToWrite = pageResult.getAll(); - - - + // write the proper properties file! writeHomePropertyFile(dir); - + // write the wikities localWikittyService.store("", wikittiesToWrite, true); @@ -355,8 +347,6 @@ * the appropriate wikittyservice ! */ - - /* * on va commencer par vérifier les arguments ''wp checkout * [--norecursion] [url du WikittyService] [Label à extraire] [directory @@ -701,21 +691,6 @@ result.putAll(deleteFile(child)); } } - // remove label from current label list - /* - * TODO mfortun-2011-04-07 it's ugly change this, if we keep the - * property linked - */ - String[] currents = StringUtil.split( - metaProperties.getProperty(META_SUB_LABEL), ","); - ArrayList<String> subLabel = new ArrayList<String>(); - for (String sub : currents) { - if (!sub.endsWith(toDelete.getName())) { - subLabel.add(sub); - } - } - String subLabelResult = StringUtil.join(subLabel, ",", true); - metaProperties.put(META_SUB_LABEL, subLabelResult); } else { @@ -743,19 +718,17 @@ } - - static protected void writeHomePropertyFile(File homeDir) throws Exception{ - - + static protected void writeHomePropertyFile(File homeDir) throws Exception { + if (homeDir.exists()) { File dir = applicationConfig.getOptionAsFile(DIRECTORY_KEY); String wikittyService = applicationConfig .getOption(WITTY_SERVICE_KEY); boolean hessianProtocole = applicationConfig .getOptionAsBoolean(HESSIAN_PROTOCOL_KEY); - - - //TODO mfortun-2011-04-11 find a better way to manage component property + + // TODO mfortun-2011-04-11 find a better way to manage component + // property String propertyCompo = applicationConfig .getOption("wikitty.WikittyService.components"); // write the proper properties file! @@ -767,43 +740,40 @@ // create the properties directory File wpDirectory = new File(homeDir.getCanonicalPath() + File.separator + PROPERTY_DIRECTORY + File.separator); - if (!wpDirectory.exists() ) { + if (!wpDirectory.exists()) { wpDirectory.mkdir(); } - File propertiesFiles = new File(wpDirectory.getCanonicalPath() + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE); - - props.store(new FileWriter(propertiesFiles), ""); } } - - + /** - * Method that create a list of the properties directory + * Method that create a list of the properties directory * * @param starts * harvested directory * @param recursivly * @return list of harvested file */ - static public List<File> harvestPropertyDirectory (File starts, boolean recursivly){ - - List<File> result = new ArrayList<File>(); - - for (File child : starts.listFiles()) { - - if (child.isDirectory() && child.getName().equals(PROPERTY_DIRECTORY)) { - result.add(child); - } else if (child.isDirectory() && recursivly){ - result.addAll(harvestPropertyDirectory(child, recursivly)); - } + static public List<File> harvestPropertyDirectory(File starts, + boolean recursivly) { + + List<File> result = new ArrayList<File>(); + + for (File child : starts.listFiles()) { + + if (child.isDirectory() + && child.getName().equals(PROPERTY_DIRECTORY)) { + result.add(child); + } else if (child.isDirectory() && recursivly) { + result.addAll(harvestPropertyDirectory(child, recursivly)); } - return result; - - + } + return result; + } }

1 0

r795 - trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by jcouteau＠users.nuiton.org April 12, 2011

April 12, 2011

Author: jcouteau Date: 2011-04-12 18:19:00 +0200 (Tue, 12 Apr 2011) New Revision: 795 Url: http://nuiton.org/repositories/revision/wikitty/795 Log: Put beforeclass in each test instead of abstract Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-12 16:08:25 UTC (rev 794) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-12 16:19:00 UTC (rev 795) @@ -51,12 +51,4 @@ ws.clear(null); } - @BeforeClass - public static void initTests() throws Exception { - - SolrTestHelper.initTests(instance); - - ws = new WikittyServiceEnhanced(new WikittyServiceSolr(instance)); - } - } Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-12 16:08:25 UTC (rev 794) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-04-12 16:19:00 UTC (rev 795) @@ -40,6 +40,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.util.CollectionUtil; import org.nuiton.wikitty.search.Criteria; @@ -57,6 +58,7 @@ import org.nuiton.wikitty.search.RestrictionHelper; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.operators.Like; +import org.nuiton.wikitty.services.WikittyServiceEnhanced; public class SolrSearchTest extends AbstractTestSolr { @@ -66,6 +68,14 @@ protected WikittyExtension extProduct; protected WikittyExtension extTest; + @BeforeClass + public static void initTests() throws Exception { + + SolrTestHelper.initTests(instance); + + ws = new WikittyServiceEnhanced(new WikittyServiceSolr(instance)); + } + @Before public void createTestData() throws Exception { extCategory = new WikittyExtension("Category", "1", null, Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2011-04-12 16:08:25 UTC (rev 794) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2011-04-12 16:19:00 UTC (rev 795) @@ -40,6 +40,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.ExtensionFactory; @@ -54,6 +55,7 @@ import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.TreeNodeResult; +import org.nuiton.wikitty.services.WikittyServiceEnhanced; /** * @@ -75,6 +77,14 @@ createTestData(); } + @BeforeClass + public static void initTests() throws Exception { + + SolrTestHelper.initTests(instance); + + ws = new WikittyServiceEnhanced(new WikittyServiceSolr(instance)); + } + /** * Create a extension, use to store element in tree */

1 0

r794 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by jcouteau＠users.nuiton.org April 12, 2011

April 12, 2011

Author: jcouteau Date: 2011-04-12 18:08:25 +0200 (Tue, 12 Apr 2011) New Revision: 794 Url: http://nuiton.org/repositories/revision/wikitty/794 Log: Fix search on Treenodes Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-04-12 15:31:01 UTC (rev 793) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-04-12 16:08:25 UTC (rev 794) @@ -828,13 +828,18 @@ // de construire l'arbre for (SolrDocument d : solrResults) { String id = (String) d.getFieldValue(SOLR_ID); - String parentId = (String) d.getFieldValue(SolrUtil.getSolrFieldName( + + List<String> parentIds = (List<String>) d.getFieldValue(SolrUtil.getSolrFieldName( WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, TYPE.WIKITTY)); int nb = counts.containsKey(id) ? counts.get(id) : 0; TreeNodeResult<String> child = new TreeNodeResult<String>(id, nb); allTreeNodeResult.put(id, child); - childParent.put(id, parentId); + if (parentIds != null) { + for (String parentId : parentIds) { + childParent.put(id, parentId); + } + } } // construction de l'arbre avant de le retourner for(Map.Entry<String, TreeNodeResult<String>> e : allTreeNodeResult.entrySet()) { @@ -843,7 +848,9 @@ if (allTreeNodeResult.containsKey(parentId)) { TreeNodeResult<String> child = e.getValue(); TreeNodeResult<String> parent = allTreeNodeResult.get(parentId); - parent.add(child); + if (parent != child) { + parent.add(child); + } } } result = allTreeNodeResult.get(wikittyId);

1 0

r793 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org April 12, 2011

April 12, 2011

Author: mfortun Date: 2011-04-12 17:31:01 +0200 (Tue, 12 Apr 2011) New Revision: 793 Url: http://nuiton.org/repositories/revision/wikitty/793 Log: * add a new class used as a value in a map when harvest for file as wikitty * complete the restore method within the wikittypublicationfilesystem * add some static method for file harvesting Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FileSystemWIkittyId.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FileSystemWIkittyId.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FileSystemWIkittyId.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FileSystemWIkittyId.java 2011-04-12 15:31:01 UTC (rev 793) @@ -0,0 +1,37 @@ +package org.nuiton.wikitty.publication; + +/** + * + * Class usefull to save location and file name of a wikitty on a file system + * + * @author mfortun + * + */ +public class FileSystemWIkittyId { + + protected String fileName; + protected String path; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public FileSystemWIkittyId(String fileName, String path) { + super(); + this.setFileName(fileName); + this.setPath(path); + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FileSystemWIkittyId.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-12 12:41:07 UTC (rev 792) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-12 15:31:01 UTC (rev 793) @@ -262,7 +262,7 @@ * @return list of harvested file */ static protected List<File> listFile(File starts, boolean recursivly) { - ArrayList<File> result = new ArrayList<File>(); + List<File> result = new ArrayList<File>(); if (!starts.isDirectory()) { result.add(starts); } @@ -780,4 +780,30 @@ props.store(new FileWriter(propertiesFiles), ""); } } + + + /** + * Method that create a list of the properties directory + * + * @param starts + * harvested directory + * @param recursivly + * @return list of harvested file + */ + static public List<File> harvestPropertyDirectory (File starts, boolean recursivly){ + + List<File> result = new ArrayList<File>(); + + for (File child : starts.listFiles()) { + + if (child.isDirectory() && child.getName().equals(PROPERTY_DIRECTORY)) { + result.add(child); + } else if (child.isDirectory() && recursivly){ + result.addAll(harvestPropertyDirectory(child, recursivly)); + } + } + return result; + + + } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java 2011-04-12 12:41:07 UTC (rev 792) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java 2011-04-12 15:31:01 UTC (rev 793) @@ -29,8 +29,11 @@ import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; +import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -217,19 +220,17 @@ } // create the directories from the label - boolean pathFilecreated = createFilesFromLabelPath(ourDir, - homeFile); + boolean pathFilecreated = createFilesFromLabelPath(ourDir); if (pathFilecreated) { // create the path with the label String path = homeFile.getCanonicalFile() + File.separator + ourDir.replace(".", File.separator); - - //correct the pb with directory name begin by . + + // correct the pb with directory name begin by . path = path.replace(File.separator + File.separator, File.separator + "."); - // create the propertie directory if necessary File propertieDirectory = new File(path + File.separator + WikittyPublication.PROPERTY_DIRECTORY); @@ -245,6 +246,7 @@ if (!propertieFile.exists()) { propertieFile.createNewFile(); } + // load/create id propertie file File idPropertieFile = new File( propertieDirectory.getCanonicalPath() @@ -301,6 +303,9 @@ Properties metaProperties = new Properties(); metaProperties.load(new FileReader(propertieFile)); // update + metaProperties.setProperty( + WikittyPublication.META_CURRENT_LABEL, ourDir); + metaProperties.setProperty(name + "." + extension + ".version", w.getVersion()); metaProperties.setProperty(name + "." + extension @@ -321,7 +326,6 @@ } } - } catch (Exception e) { e.printStackTrace(); // TODO mfortun-2011-04-12 really handle exceptions @@ -387,15 +391,73 @@ @Override public List<Wikitty> restore(String securityToken, List<String> id) { - // TODO mfortun-2011-04-05 + List<Wikitty> result = new ArrayList<Wikitty>(); + try { + Map<String, FileSystemWIkittyId> locations = harvestLocalWikitties( + homeFile, recursion); - /* - * - */ + for (String wikid : id) { + FileSystemWIkittyId localisation = locations.get(wikid); + // create the wikitty with his id + Wikitty wikitty = new WikittyImpl(wikid); + // add label extension + wikitty.addExtension(WikittyLabelImpl.extensionWikittyLabel); - throw new UnsupportedOperationException("not yet implemented"); - // return null; + // preparation for mime research and file research + String path = localisation.getPath(); + String completeName = localisation.getFileName(); + // search for the file + File fileToTransform = new File(path + File.separator + + completeName); + + String extension = FileUtil.extension(fileToTransform); + String name = FileUtil.basename(completeName, "." + extension); + // search for the mimetype + String mimeType = mimeTypeForExtension(extension); + + // load properties + Properties props = new Properties(); + File propsFile = new File(path + File.separator + + WikittyPublication.PROPERTY_DIRECTORY + + File.separator + + WikittyPublication.WIKITTY_FILE_META_PROPERTIES_FILE); + props.load(new FileReader(propsFile)); + // re set the id + wikitty.setVersion(props.getProperty(completeName + + WikittyPublication.META_SUFFIX_KEY_ID)); + + // set the current label + WikittyLabelHelper.addLabels(wikitty, props + .getProperty(WikittyPublication.META_CURRENT_LABEL)); + + /* + * TODO mfortun-2011-04-12 need to merge part of this code with + * filetowikitty method 'cause it is basically the same + */ + + // create the correct wikittypubxxx + if (isMimeWikittyPubText(mimeType)) { + wikitty.addExtension(WikittyPubTextImpl.extensionWikittyPubText); + WikittyPubTextHelper.setName(wikitty, name); + WikittyPubTextHelper.setMimeType(wikitty, mimeType); + WikittyPubTextHelper.setContent(wikitty, + FileUtil.readAsString(fileToTransform)); + } else { + wikitty.addExtension(WikittyPubDataImpl.extensionWikittyPubData); + WikittyPubDataHelper.setName(wikitty, name); + WikittyPubDataHelper.setMimeType(wikitty, mimeType); + WikittyPubDataHelper.setContent(wikitty, + FileUtil.fileToByte(fileToTransform)); + } + + result.add(wikitty); + } + } catch (Exception e) { + e.printStackTrace(); + // TODO mfortun-2011-01-12 really handle exception + } + return result; } @Override @@ -476,7 +538,6 @@ static public Wikitty fileToWikitty(File fileToTransform, File starts) throws Exception { - String completeName = fileToTransform.getName(); // isolate extension and file name @@ -506,11 +567,11 @@ String path = startDirName + pathToFile.replaceAll(pathToStart, ""); /* - * FIXME actually with a dot as a wikittylabel_separator, - * when restauring label to directory it destroy directory that containt dot + * FIXME actually with a dot as a wikittylabel_separator, when + * restauring label to directory it destroy directory that containt dot * in the name e.g.: /home/truc.machin/bob */ - + String label = path.replaceAll(File.separator, WIKITTYLABEL_SEPARATOR); WikittyLabelHelper.addLabels(result, label); @@ -594,13 +655,10 @@ * * @param label * the path string - * @param starts - * the working directory * @return if all the path was created * @throws Exception */ - static public boolean createFilesFromLabelPath(String label, File starts) - throws Exception { + protected boolean createFilesFromLabelPath(String label) throws Exception { label = label.replace(".", File.separator); label = label.replace(File.separator + File.separator, File.separator @@ -609,8 +667,8 @@ boolean result = false; - if (starts.exists() && starts.isDirectory()) { - String path = starts.getCanonicalPath(); + if (homeFile.exists() && homeFile.isDirectory()) { + String path = homeFile.getCanonicalPath(); result = true; for (int i = 0; i < pathElements.length; i++) { @@ -623,4 +681,56 @@ return result; } + + /** + * + * @param starts + * @param recursivly + * @return + * @throws Exception + */ + static public Map<String, FileSystemWIkittyId> harvestLocalWikitties( + File starts, boolean recursivly) throws Exception { + Map<String, FileSystemWIkittyId> result = new HashMap<String, FileSystemWIkittyId>(); + + /* + * TODO mfortun-2011-04-12 find a better way to have cohesion class that + * call another class that call last class <_<. May be a class for file + * access/harvest method + */ + List<File> propertiesDirectory = WikittyPublication + .harvestPropertyDirectory(starts, recursivly); + + for (File propsDir : propertiesDirectory) { + + Properties idProps = new Properties(); + File idFile = new File(propsDir.getCanonicalPath() + File.separator + + WikittyPublication.WIKITTY_ID_PROPERTIES_FILE); + if (idFile.exists()) { + idProps.load(new FileReader(idFile)); + } + + Set<Object> ids = idProps.keySet(); + + for (Object id : ids) { + String name = idProps.getProperty((String) id); + String path = propsDir.getParent(); + FileSystemWIkittyId value = new FileSystemWIkittyId(name, path); + + result.put((String) id, value); + } + + } + + /* + * Pour l'arborescence des fichiers on va aller chercher les fichiers de + * propriété id et meta dans le dossier .wp pour aller récup les labels + * courant et les id liés on va renvoyer la map + * + * id, label + */ + + return result; + } + }

1 0

r792 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org April 12, 2011

April 12, 2011

Author: mfortun Date: 2011-04-12 14:41:07 +0200 (Tue, 12 Apr 2011) New Revision: 792 Url: http://nuiton.org/repositories/revision/wikitty/792 Log: *Correct pb with directory with a name that begin with a "." Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-12 11:05:53 UTC (rev 791) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublication.java 2011-04-12 12:41:07 UTC (rev 792) @@ -216,6 +216,7 @@ WikittyProxy remoteWikittyService = new WikittyProxy( WikittyServiceFactory.buildWikittyService(applicationConfig)); + remoteWikittyService.clear(); // load the list of file List<File> toTransfert = listFile(dir, !noRecur); @@ -307,7 +308,7 @@ WikittyProxy remoteWikittyService = new WikittyProxy( WikittyServiceFactory.buildWikittyService(applicationConfig)); WikittyPublicationFileSystem localWikittyService = new WikittyPublicationFileSystem( - dir, noRecur, label); + dir, !noRecur, label); @@ -340,11 +341,7 @@ PagedResult<Wikitty> pageResult= remoteWikittyService.findAllByCriteria(labelCriteria); List<Wikitty> wikittiesToWrite = pageResult.getAll(); - - for ( Wikitty w : wikittiesToWrite){ - System.out.println(w); - - } + // write the proper properties file! Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java 2011-04-12 11:05:53 UTC (rev 791) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFileSystem.java 2011-04-12 12:41:07 UTC (rev 792) @@ -25,19 +25,14 @@ package org.nuiton.wikitty.publication; import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; -import java.io.InputStreamReader; import java.util.Collection; -import java.util.HashSet; import java.util.List; import java.util.Properties; import java.util.Set; -import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,7 +43,6 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.publication.entities.WikittyPubData; @@ -229,8 +223,13 @@ if (pathFilecreated) { // create the path with the label String path = homeFile.getCanonicalFile() + File.separator - + ourDir.replaceAll(".", File.separator); + + ourDir.replace(".", File.separator); + + //correct the pb with directory name begin by . + path = path.replace(File.separator + File.separator, + File.separator + "."); + // create the propertie directory if necessary File propertieDirectory = new File(path + File.separator + WikittyPublication.PROPERTY_DIRECTORY); @@ -305,7 +304,7 @@ metaProperties.setProperty(name + "." + extension + ".version", w.getVersion()); metaProperties.setProperty(name + "." + extension - + ".id", w.getVersion()); + + ".id", w.getId()); metaProperties.setProperty(name + "." + extension + ".checksum", localMd5); // save @@ -322,29 +321,15 @@ } } - /* - * pour chaque wikitty en fonction du type on va aller écrire le - * fichier avec la bonne extention en fonction du mime. - * - * Et niveau propriété : double entré d'id, checksum, version aussi. - * - * - * faire en deux passes, pour mettre les labels et labels courant - * aussi les ranger et tout. - */ - // StringUtil.encodeMD5(toEncode) - } catch (Exception e) { e.printStackTrace(); - //TODO mfortun-2011-04-12 really handle exceptions + // TODO mfortun-2011-04-12 really handle exceptions } WikittyEvent result = new WikittyEvent(this); return result; - // return null; - } @Override @@ -491,6 +476,7 @@ static public Wikitty fileToWikitty(File fileToTransform, File starts) throws Exception { + String completeName = fileToTransform.getName(); // isolate extension and file name @@ -519,6 +505,12 @@ */ String path = startDirName + pathToFile.replaceAll(pathToStart, ""); + /* + * FIXME actually with a dot as a wikittylabel_separator, + * when restauring label to directory it destroy directory that containt dot + * in the name e.g.: /home/truc.machin/bob + */ + String label = path.replaceAll(File.separator, WIKITTYLABEL_SEPARATOR); WikittyLabelHelper.addLabels(result, label); @@ -572,9 +564,9 @@ * TODO mfortun-2011-04-11 really implements this method */ if (mime.equalsIgnoreCase("ws")) { - return "application/javascript"; + return "ws"; } else { - return "image/png"; + return "ws"; } } @@ -609,18 +601,23 @@ */ static public boolean createFilesFromLabelPath(String label, File starts) throws Exception { - String[] pathElements = StringUtil.split(label, "."); + label = label.replace(".", File.separator); + label = label.replace(File.separator + File.separator, File.separator + + "."); + String[] pathElements = StringUtil.split(label, File.separator); + boolean result = false; if (starts.exists() && starts.isDirectory()) { String path = starts.getCanonicalPath(); - + result = true; for (int i = 0; i < pathElements.length; i++) { path = path + File.separator + pathElements[i]; File temp = new File(path); - result = result && FileUtil.createDirectoryIfNecessary(temp); + FileUtil.createDirectoryIfNecessary(temp); + result = result && temp.exists(); } }

1 0

r791 - trunk/wikitty-jdbc
by jcouteau＠users.nuiton.org April 12, 2011

April 12, 2011

Author: jcouteau Date: 2011-04-12 13:05:53 +0200 (Tue, 12 Apr 2011) New Revision: 791 Url: http://nuiton.org/repositories/revision/wikitty/791 Log: Use wikitty-solr instead of wikitty-solr-impl Modified: trunk/wikitty-jdbc/pom.xml Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-04-12 10:04:16 UTC (rev 790) +++ trunk/wikitty-jdbc/pom.xml 2011-04-12 11:05:53 UTC (rev 791) @@ -23,7 +23,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>wikitty-solr-impl</artifactId> + <artifactId>wikitty-solr</artifactId> <version>${project.version}</version> </dependency> <dependency>

1 0

r790 - in trunk/wikitty-solr: . src/test/java/org/nuiton/wikitty/storage/solr
by jcouteau＠users.nuiton.org April 12, 2011

April 12, 2011

Author: jcouteau Date: 2011-04-12 12:04:16 +0200 (Tue, 12 Apr 2011) New Revision: 790 Url: http://nuiton.org/repositories/revision/wikitty/790 Log: Anomalie #1166: Bad test configuration - Fix for solr module Added: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java Modified: trunk/wikitty-solr/pom.xml trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-04-12 08:59:05 UTC (rev 789) +++ trunk/wikitty-solr/pom.xml 2011-04-12 10:04:16 UTC (rev 790) @@ -105,5 +105,33 @@ <description>Wikiity solr search engine</description> <inceptionYear>2009</inceptionYear> + + + <build> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefirePluginVersion}</version> + <configuration> + <systemPropertyVariables> +  + <wikitty.searchengine.solr.directory.data> + ${java.io.tmpdir}/solr/data + </wikitty.searchengine.solr.directory.data> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefirePluginVersion}</version> + </plugin> + </plugins> + </build> </project> Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-12 08:59:05 UTC (rev 789) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-12 10:04:16 UTC (rev 790) @@ -25,17 +25,20 @@ package org.nuiton.wikitty.storage.solr; import org.junit.Before; +import org.junit.BeforeClass; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.services.WikittyServiceEnhanced; public abstract class AbstractTestSolr { protected WikittyProxy proxy = null; - protected WikittyServiceEnhanced ws = - new WikittyServiceEnhanced(new WikittyServiceSolr(new WikittyConfig())); + protected static WikittyConfig instance = new WikittyConfig(); + protected static WikittyServiceEnhanced ws; + public WikittyProxy getProxy() { if (proxy == null) { proxy = new WikittyProxy(ws); @@ -48,4 +51,12 @@ ws.clear(null); } + @BeforeClass + public static void initTests() throws Exception { + + SolrTestHelper.initTests(instance); + + ws = new WikittyServiceEnhanced(new WikittyServiceSolr(instance)); + } + } Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-04-12 08:59:05 UTC (rev 789) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-04-12 10:04:16 UTC (rev 790) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.storage.solr; +import org.junit.BeforeClass; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.api.AbstractSearchTest; @@ -36,11 +37,17 @@ WikittyService service; + static protected WikittyConfig config = new WikittyConfig(); + + @BeforeClass + public static void initTests() { + SolrTestHelper.initTests(config); + } + @Override public WikittyService getWikittyService() { if (service == null) { - WikittyConfig config = new WikittyConfig(); service = new WikittyServiceSolr(config); } Added: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java (rev 0) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-04-12 10:04:16 UTC (rev 790) @@ -0,0 +1,35 @@ +package org.nuiton.wikitty.storage.solr; + +import java.io.File; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; + +/** + * User: couteau + * Date: 12/04/11 + */ +public class SolrTestHelper { + + static private Log log = LogFactory.getLog(SolrTestHelper.class); + + public static void initTests(ApplicationConfig config) { + // Create tmpdir if not exist + String tmpdir = System.getProperty("java.io.tmpdir"); + File file = new File(tmpdir); + if (!file.exists()) { + file.mkdirs(); + } + + // file where to put wikitty datas + File dataDirectory = new File(tmpdir, "wikitty-data-store"); + if (log.isInfoEnabled()) { + log.info("Will use data directory : " + dataDirectory); + } + + // set data dir configuration + config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.key, + dataDirectory.getAbsolutePath()); + } +} Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-04-12 08:59:05 UTC (rev 789) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-04-12 10:04:16 UTC (rev 790) @@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; @@ -59,8 +60,10 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(WikittySearchEngineSolrTest.class); - protected WikittyServiceSolr ws = new WikittyServiceSolr(new WikittyConfig()); + protected static WikittyServiceSolr ws; + protected static WikittyConfig instance = new WikittyConfig(); + protected WikittyProxy proxy = new WikittyProxy(ws); @Before @@ -68,6 +71,14 @@ ws.clear(null); } + @BeforeClass + public static void initTests() throws Exception { + + SolrTestHelper.initTests(instance); + + ws = new WikittyServiceSolr(instance); + } + @Test public void testFullTextSearch() throws Exception { // for id for easy debugging

1 0

r789 - trunk
by jcouteau＠users.nuiton.org April 12, 2011

April 12, 2011

Author: jcouteau Date: 2011-04-12 10:59:05 +0200 (Tue, 12 Apr 2011) New Revision: 789 Url: http://nuiton.org/repositories/revision/wikitty/789 Log: Remove hbase-impl Removed: trunk/wikitty-hbase-impl/

1 0

r788 - trunk
by jcouteau＠users.nuiton.org April 12, 2011

April 12, 2011

Author: jcouteau Date: 2011-04-12 10:52:45 +0200 (Tue, 12 Apr 2011) New Revision: 788 Url: http://nuiton.org/repositories/revision/wikitty/788 Log: Remove wikitty-jdbc-impl and wikitty-solr-impl Removed: trunk/wikitty-jdbc-impl/ trunk/wikitty-solr-impl/

1 0

r787 - trunk
by jcouteau＠users.nuiton.org April 12, 2011

April 12, 2011

Author: jcouteau Date: 2011-04-12 10:52:05 +0200 (Tue, 12 Apr 2011) New Revision: 787 Url: http://nuiton.org/repositories/revision/wikitty/787 Log: Evolution #1267: Remove unmaintained module or update it (hbase, jpa, jms, multistorage, ui) - Removed all unbuild and unmaintained modules Removed: trunk/wikitty-jms-impl/ trunk/wikitty-jpa-impl/ trunk/wikitty-multistorage-impl/ trunk/wikitty-ui-gwt/ trunk/wikitty-ui-zk/

1 0