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

r833 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 26 Apr '11

26 Apr '11

Author: mfortun Date: 2011-04-26 12:25:41 +0200 (Tue, 26 Apr 2011) New Revision: 833 Url: http://nuiton.org/repositories/revision/wikitty/833 Log: * Documentation * Correct method * remove static from method that not have to * add support for directory name filter eg: .svn, .git, etc Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java 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/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java 2011-04-22 16:37:22 UTC (rev 832) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java 2011-04-26 10:25:41 UTC (rev 833) @@ -15,8 +15,19 @@ */ public class MimeTypePubHelper { + /** + * Mapping between extention and mime type, key: extension, value: mimeType + */ protected Map<String, String> mapExtensionMime; + + /** + * White list of mime type that have to be transform as a wikittyPubText + */ protected List<String> mimePubText; + + /** + * The default mime type + */ public static String DEFAULT_MIME_TYPE = "application/octet-stream"; public MimeTypePubHelper() { @@ -48,6 +59,15 @@ this.mimePubText = mimePubText; } + /** + * Return the corresponding mime Type for an extension, default if not + * recognized + * + * @param ext + * the extension + * @return the corresponding mimeTypeForExt DEFAULT_MIME_TYPE if ext not + * recognized + */ public String getMimeForExtension(String ext) { String result = mapExtensionMime.get(ext); @@ -58,14 +78,33 @@ return result; } + /** + * Used to check if a file have to be converted as a wikittyPubText + * + * @param mimeType + * of the file + * @return if the mimetype of a file correspond to a wikittyPubText + */ public boolean isPubTextMime(String mimeType) { return mimePubText.contains(mimeType); } + /** + * Add a mimeType corresponding to a WikittyPubText + * + * @param mime + */ public void addMimeForPubText(String mime) { mimePubText.add(mime); } + /** + * Add an entry in the map that store mapping between extension and + * mimeType. + * + * @param extension + * @param mime + */ public void addExtensionMime(String extension, String mime) { mapExtensionMime.put(extension, mime); } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java 2011-04-22 16:37:22 UTC (rev 832) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java 2011-04-26 10:25:41 UTC (rev 833) @@ -1,13 +1,16 @@ package org.nuiton.wikitty.publication.synchro; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; +import java.io.IOException; import java.util.Properties; /** - * Class usefull when load properties file, update, delete, then save again - * File used to load properties is store. + * Class usefull when load properties file, update, delete, then save again File + * used to load properties is store, and this allow to save again the properties + * inside the file used to load them. * * @author mfortun * @@ -19,20 +22,69 @@ */ private static final long serialVersionUID = -264337198024996529L; + /** + * The original file used to load and create properties + */ protected File origin; - public PropertiesExtended(File origin) throws Exception { + + public File getOrigin() { + return origin; + } + + public void setOrigin(File origin) { + this.origin = origin; + } + + + + /** + * Default constructor, need a file from whom load the properties. This is + * equivalent of a basic creation of properties and load after property from + * a file. + * + * @param origin + * the file from whom load the property, it is save for store. + * @throws IOException + * if error while reading the file + * @throws FileNotFoundException + * if file not found + */ + public PropertiesExtended(File origin) throws FileNotFoundException, + IOException { super(); this.load(origin); } - public void load(File file) throws Exception { + + /** + * Load the property from the file, and store the file, for storage. + * + * @param file + * the file from whom to load the property, it replace the file + * use to create this class + * @throws IOException + * if error while reading the file + * @throws FileNotFoundException + * if file not found + */ + public void load(File file) throws FileNotFoundException, IOException { this.origin = file; this.load(new FileReader(origin)); } - public void store() throws Exception { + /** + * Store the properties inside the last file used to load the property (or + * by default file used to create the class), equivalent of store(new + * FileWriter('File'),""); + * + * @throws IOException + * if error while reading the file + * @throws FileNotFoundException + * if file not found + */ + public void store() throws IOException { this.store(new FileWriter(origin), ""); } 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-22 16:37:22 UTC (rev 832) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-26 10:25:41 UTC (rev 833) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.publication.synchro; import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -126,17 +127,12 @@ } - static public void synchronisation(String origin, String target) - throws Exception { + static public void synchronisation(String origin, String target) throws URISyntaxException + { boolean isRecur = applicationConfig .getOptionAsBoolean(IS_RECURSION_OPTION); - - - - /* - * TODO mfortun-2011-04-14 handle exception if uri format does not match - */ + URI uriOrigin = new URI(origin); URI uriTarget = new URI(target); @@ -164,7 +160,6 @@ WikittyProxy proxyTarget = new WikittyProxy( WikittyServiceFactory.buildWikittyService(temp2)); - String labelOrigin = uriOrigin.getFragment(); String labelTarget = uriOrigin.getFragment(); @@ -252,11 +247,9 @@ * if option delete remove those who are on the target but not on origin */ if (isDelete) { - + for (String id : existOnlyOnTarget) { - - - + Wikitty w = proxyTarget.restore(id); WikittyLabelHelper.removeLabels(w, labelTarget); @@ -317,10 +310,11 @@ } /** - * Used to construct criteria on wikittypubdata an pubtext on the + * Used to construct criteria on wikittypubdata and pubtext on the * wikittylabel extension * * @param label + * the label criteria * @param isRecur * is recusion * @return the constructed criteria @@ -365,13 +359,15 @@ */ static protected ApplicationConfig setUpApplicationConfigServerConnector( URI uri) { - + // prepare new application config ApplicationConfig result = new ApplicationConfig(); // transfert main properties to new application config result.setOptions(applicationConfig.getFlatOptions()); String url = uri.toASCIIString(); + if (uri.getScheme().equals("file")) { + result.setOption(WIKITTY_OPTION_COMPONENT, "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); } else if (uri.getScheme().equals("cajo")) { @@ -380,6 +376,7 @@ // remove fragment from the uri. url = url.replaceAll("\\#.*", ""); + } else if (uri.getScheme().equals("hessian")) { result.setOption(WIKITTY_OPTION_COMPONENT, "org.nuiton.wikitty.services.WikittyServiceHessianClient"); 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-04-22 16:37:22 UTC (rev 832) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-26 10:25:41 UTC (rev 833) @@ -27,8 +27,11 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileReader; +import java.io.IOException; import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -96,10 +99,26 @@ static public String WIKITTYLABEL_SEPARATOR = "."; + /** + * The working directory of the wikitty service + */ protected File homeFile; + + /** + * if recursion is chose + */ protected boolean recursion; + + /** + * The initial label of the wikitties, and the path to the first wikitties + * of the working directory + */ protected String label; + /** + * Property key to store the current label in a wikittyProperty meta file. + * Usefull to retrieve easily the wikitties and convert file as wikitty. + */ static public String META_CURRENT_LABEL = "current.label"; /* @@ -108,70 +127,96 @@ * solution un case of delete we can easily read the id and make operation * on the wikitty */ + /** + * property key used in the metaPropertyFile to store the wikitty's version + */ static public String META_PREFIX_KEY_VERSION = "version."; + /** + * property key used in the metaPropertyFile to store the wikitty's content + * checksum + */ static public String META_PREFIX_KEY_CHECKSUM = "checksum."; + /** + * property key used in the metaPropertyFile to store the wikitty's id + */ static public String META_PREFIX_KEY_ID = "id."; + /** + * The file name of the meta property file + */ static public String WIKITTY_FILE_META_PROPERTIES_FILE = "meta.properties"; - static public String WIKITTY_FILE_SERVICE = "ws.properties"; - /* * Need a different file for id and meta information about wikittiesFiles * because with this solution we can simply read the ids with props.keySet() */ + /** + * The file Name of the id property file + */ static public String WIKITTY_ID_PROPERTIES_FILE = "ids.properties"; + /** + * The file name of the wikitty service property + */ + static public String WIKITTY_FILE_SERVICE = "ws.properties"; + + /** + * the file name of the property directory + */ static public String PROPERTY_DIRECTORY = ".wp"; + /** + * the mimeType Handler used to determine mimeType for file extension and if + * file have to be converted as wikittyPubText or WikittyPubData + */ protected MimeTypePubHelper mimeHelper; /** - * Constructor with the working directory + * List of directory name that does'nt have to be harvest exampe : .svn, + * .git + */ + protected List<String> directoryNameBlackList; + + /** + * Default constructor, call by a factory * - * @param home - * the home directory + * @param app + * application config needed to correctly initialize this. Need + * wikitty url to be set (with URI format) and option for + * recursion, @see WikittyPublication for constant + * @throws URISyntaxException + * if serveur url is not in the proper format (URI format) */ + public WikittyPublicationFileSystem(ApplicationConfig app) + throws URISyntaxException { - public WikittyPublicationFileSystem(ApplicationConfig app) { - /* - * load informations from the application config to correctly initialize - * this - */ - try { + this.mimeHelper = new MimeTypePubHelper(); - this.mimeHelper = new MimeTypePubHelper(); + String url = app.getOption(WikittyPublication.WIKITTY_OPTION_URL); + URI uri = new URI(url); - - - - String url = app.getOption(WikittyPublication.WIKITTY_OPTION_URL); - URI uri = new URI(url); + this.homeFile = new File(uri.getPath()); - this.homeFile = new File(uri.getPath()); + if (homeFile == null || !homeFile.exists()) { + File cur = FileUtil.getCurrentDirectory(); + homeFile = new File(cur.getAbsolutePath()); + } - if (homeFile == null || !homeFile.exists()) { - File cur = FileUtil.getCurrentDirectory(); - homeFile = new File(cur.getAbsolutePath()); - } + this.label = uri.getFragment(); - this.label = uri.getFragment(); + if (label == null) { + label = homeFile.getName(); + } - if (label == null) { - label = homeFile.getName(); - } + this.recursion = app + .getOptionAsBoolean(WikittyPublication.IS_RECURSION_OPTION); - this.recursion = app - .getOptionAsBoolean(WikittyPublication.IS_RECURSION_OPTION); + this.directoryNameBlackList = new ArrayList<String>(); + directoryNameBlackList.add(".svn"); + directoryNameBlackList.add(".git"); - - - - } catch (Exception e) { - e.printStackTrace(); - } } public File getHomeFile() { @@ -290,6 +335,9 @@ } @Override + /** + * Store wikitty as file + */ public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { WikittyEvent result = new WikittyEvent(this); @@ -300,7 +348,8 @@ Set<String> set = WikittyLabelHelper.getLabels(w); String ourDir = ""; - // search for our label + // search for our label recursion determine how search the label + // if have to match exactly or startswith for (String name : set) { if (!recursion && name.equalsIgnoreCase(label)) { ourDir = name; @@ -309,10 +358,11 @@ } } + // if label is empty it means that the wikitty have to be remove + // from the FileSystem if ("".equals(ourDir)) { // remove file if the wikitty already exist - BidiMap location = harvestLocalWikitties(homeFile, true); FileSystemWIkittyId idSystem = (FileSystemWIkittyId) location @@ -326,8 +376,8 @@ wikittyFile.delete(); } } - - return result; + // jump to the next wikitty to store + continue; } // create the directories from the label @@ -338,7 +388,7 @@ String path = homeFile.getCanonicalFile() + File.separator + ourDir.replace(".", File.separator); - // correct the pb with directory name begin by . + // correct the problem with directory name begin by . path = path.replace(File.separator + File.separator, File.separator + "."); @@ -346,6 +396,7 @@ // create the propertie directory if necessary File propertieDirectory = new File(path + File.separator + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); + if (!propertieDirectory.exists() || !propertieDirectory.isDirectory()) { propertieDirectory.mkdir(); @@ -355,6 +406,8 @@ String extension = ""; File wikittyFile = null; + // construct the file differently if wikittyPubData or + // wikittyPubText if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { name = WikittyPubDataHelper.getName(w); // String mime = WikittyPubDataHelper.getMimeType(w); @@ -385,6 +438,7 @@ FileUtil.writeString(wikittyFile, content); } + // if file properly write, write wikittyProperties if (wikittyFile != null) { // write current label @@ -467,27 +521,22 @@ } @Override + /** + * restore file as wikitty + */ public List<Wikitty> restore(String securityToken, List<String> id) { - /* - * FIXME mfortun-2011-04-14 s'assurer que quand on restore on restore - * bien la version correctement, potentiellement si ya eut des - * modifications faites entre la version précédent et actuel on fasse - * gaffe à incrémenter la version "mineur" - * - * - * - * version d'un wikitty sous forme x.y, où x incrémenté par serveur y - * incrémenté à chaque set sur content. - */ - List<Wikitty> result = new ArrayList<Wikitty>(); try { + // construct the starts file from the label and the working + // directory String labelToDir = this.labelToPath(label); File starts = new File(homeFile.getAbsolutePath() + File.separator + labelToDir); + // harvest all wikitty from the file system BidiMap locations = harvestLocalWikitties(starts, recursion); + // register wikitty in the result for (String wikid : id) { Object value = locations.get(wikid); @@ -510,17 +559,13 @@ public WikittyEvent delete(String securityToken, Collection<String> ids) { try { + // load localisation of all the wikitties BidiMap location = harvestLocalWikitties(homeFile, true); for (String id : ids) { Object value = location.get(id); - if (value == null) { - location = location.inverseBidiMap(); - value = location.get(id); - } - if (value != null) { FileSystemWIkittyId localisation = (FileSystemWIkittyId) value; @@ -533,13 +578,10 @@ new File(path), WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); - // update - propsProperties - .remove(WikittyPublicationFileSystem.META_PREFIX_KEY_CHECKSUM - + fileName); - propsProperties - .remove(WikittyPublicationFileSystem.META_PREFIX_KEY_VERSION - + fileName); + // update remove properties + propsProperties.remove(META_PREFIX_KEY_CHECKSUM + fileName); + propsProperties.remove(META_PREFIX_KEY_VERSION + fileName); + propsProperties.remove(META_PREFIX_KEY_ID + fileName); // resave propsProperties.store(); @@ -951,25 +993,25 @@ List<Criteria> criteria) { Map<String, Wikitty> wikitties = new HashMap<String, Wikitty>(); try { + // construct properly with the working directory and the label + // the starts directory String labelToDir = this.labelToPath(label); File starts = new File(homeFile.getAbsolutePath() + File.separator + labelToDir); if (starts.exists()) { + // check for new file, modifications and deleted wikitty harvestNewCheckModificationsAndDeleted(starts, label); } + // load all locals wikitty BidiMap map = harvestLocalWikitties(starts, true); - - - + // put all local wikitties in a map for (Object o : map.keySet()) { String id = (String) o; FileSystemWIkittyId location = (FileSystemWIkittyId) map .get(id); - - - + wikitties.put(id, restore(id, location)); } @@ -1021,23 +1063,28 @@ Map<String, Wikitty> wikitties = new HashMap<String, Wikitty>(); try { + // construct properly with the working directory and the label + // the starts directory String labelToDir = this.labelToPath(label); File starts = new File(homeFile.getAbsolutePath() + File.separator + labelToDir); if (starts.exists()) { + // check for new file, modifications and deleted wikitty harvestNewCheckModificationsAndDeleted(starts, label); } + // load all locals wikitty BidiMap map = harvestLocalWikitties(starts, true); + // put all local wikitties in a map for (Object o : map.keySet()) { String id = (String) o; FileSystemWIkittyId location = (FileSystemWIkittyId) map .get(id); + wikitties.put(id, restore(id, location)); } - } catch (Exception e) { // TODO mfortun-2011-04-21 really handle exception e.printStackTrace(); @@ -1115,17 +1162,17 @@ * @param recursivly * @return list of harvested file */ - static public List<File> harvestPropertyDirectory(File starts, - boolean recursivly) { + public List<File> harvestPropertyDirectory(File starts, boolean recursivly) { List<File> result = new ArrayList<File>(); for (File child : starts.listFiles()) { - + // search for all property directory, usefull to retrieve wikitty if (child.isDirectory() && child.getName().equals(PROPERTY_DIRECTORY)) { result.add(child); - } else if (child.isDirectory() && recursivly) { + } else if (child.isDirectory() && recursivly + && !this.directoryNameBlackList.contains(child.getName())) { result.addAll(harvestPropertyDirectory(child, recursivly)); } } @@ -1140,13 +1187,14 @@ * @return * @throws Exception */ - static public BidiMap harvestLocalWikitties(File starts, boolean recursivly) + public BidiMap harvestLocalWikitties(File starts, boolean recursivly) throws Exception { BidiMap result = new DualHashBidiMap(); - List<File> propertiesDirectory = WikittyPublicationFileSystem - .harvestPropertyDirectory(starts, recursivly); + List<File> propertiesDirectory = harvestPropertyDirectory(starts, + recursivly); + // use the list of property to retrieve wikitty for (File propsDir : propertiesDirectory) { Properties idProps = new Properties(); @@ -1157,7 +1205,9 @@ } Set<Object> ids = idProps.keySet(); - + // simply load the id property file to retrieve wikitty id + // with the path to the propertyfile and the value of the file + // construct FileSytemWikittyId for (Object id : ids) { String name = idProps.getProperty((String) id); String path = propsDir.getParent(); @@ -1179,8 +1229,22 @@ return result; } + /** + * Simply return the propertyExtended corresponding that can be found in + * starts/.wp/ directory. It create the corresponding property file if + * does'nt exist + * + * @param starts + * the directory that containt a .wp directory containing the + * property + * @param name + * the property file name, use constants + * @return the properties extended requested + * @throws IOException + * if error while reading the file + */ static public PropertiesExtended getWikittyPublicationProperties( - File starts, String name) throws Exception { + File starts, String name) throws IOException { File propertieDirectory = new File(starts.getCanonicalPath() + File.separator @@ -1198,8 +1262,21 @@ return result; } + /** + * Restore the corresponding wikitty identify by the id and is location on + * the filesytem + * + * @param id + * the wikitty id + * @param fileId + * the wikitty file system id (his localisation on the + * wikittyFileSystem) + * @return the restored wikitty + * @throws IOException + * if errors while reading the file + */ protected Wikitty restore(String id, FileSystemWIkittyId fileId) - throws Exception { + throws IOException { Wikitty result = new WikittyImpl(id); @@ -1244,7 +1321,8 @@ WikittyPubDataHelper.setFileExtension(result, extension); } - // re set the version + // re set the version (re set the version now allow the version to be + // not altered by operation on the wikitty to restore it result.setVersion(props .getProperty(WikittyPublicationFileSystem.META_PREFIX_KEY_VERSION + completeName)); @@ -1252,8 +1330,14 @@ return result; } + /** + * + * @param starts + * @param label + * @throws Exception + */ protected void harvestNewCheckModificationsAndDeleted(File starts, - String label) throws Exception { + String label) throws Exception { File propertyFile = new File(starts + File.separator + PROPERTY_DIRECTORY); @@ -1325,7 +1409,7 @@ } - protected void checkModifications(File child) throws Exception { + protected void checkModifications(File child) throws IOException { // will check if there was modification with checksum BufferedInputStream input = new BufferedInputStream( @@ -1421,9 +1505,8 @@ */ protected boolean createFilesFromLabelPath(String label) throws Exception { - label = label.replace(".", File.separator); - label = label.replace(File.separator + File.separator, File.separator - + "."); + label = labelToPath(label); + String[] pathElements = StringUtil.split(label, File.separator); boolean result = false; @@ -1443,6 +1526,11 @@ return result; } + /** + * Construct correctly the path from a label + * @param label the label + * @return the correct path + */ public String labelToPath(String label) { String result = label;

1 0

r832 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org 22 Apr '11

22 Apr '11

Author: bpoussin Date: 2011-04-22 18:37:22 +0200 (Fri, 22 Apr 2011) New Revision: 832 Url: http://nuiton.org/repositories/revision/wikitty/832 Log: extractFieldName must remove indice of collection field (ext.field[n/m] must return field and not field[n/m]) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2011-04-22 13:47:11 UTC (rev 831) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2011-04-22 16:37:22 UTC (rev 832) @@ -231,7 +231,8 @@ } /** - * Extract field name from fully qualified field name + * Extract field name from fully qualified field name (suppression [n/m] if + * field is collection * * @param fqFieldName fully qualified field name like 'WikittyUser.login' * @return return field name. Example 'login' @@ -240,6 +241,11 @@ int i = fqFieldName.indexOf(WikittyUtil.FQ_FIELD_NAME_SEPARATOR); if (i > 0) { String result = fqFieldName.substring(i+1); + int b = result.lastIndexOf("["); + if (b > 0) { + result = result.substring(0, b); + } + return result; } else { throw new IllegalArgumentException(String.format(

1 0

r831 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 22 Apr '11

22 Apr '11

Author: mfortun Date: 2011-04-22 15:47:11 +0200 (Fri, 22 Apr 2011) New Revision: 831 Url: http://nuiton.org/repositories/revision/wikitty/831 Log: * correction of the version manipulation in the sync part * correct home directory used to find wikitties on file system. Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 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/FileSystemWIkittyId.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 2011-04-21 15:18:04 UTC (rev 830) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 2011-04-22 13:47:11 UTC (rev 831) @@ -73,4 +73,10 @@ return true; } + @Override + public String toString() { + return "FileSystemWIkittyId [fileName=" + fileName + ", path=" + path + + "]"; + } + } 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-21 15:18:04 UTC (rev 830) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-22 13:47:11 UTC (rev 831) @@ -131,6 +131,9 @@ boolean isRecur = applicationConfig .getOptionAsBoolean(IS_RECURSION_OPTION); + + + /* * TODO mfortun-2011-04-14 handle exception if uri format does not match */ @@ -161,11 +164,7 @@ WikittyProxy proxyTarget = new WikittyProxy( WikittyServiceFactory.buildWikittyService(temp2)); - /* - * 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 - * truc du genre ? - */ + String labelOrigin = uriOrigin.getFragment(); String labelTarget = uriOrigin.getFragment(); @@ -223,18 +222,29 @@ } + // save the version before reset label + String wikittyVersionLocal = wikittyNew.getVersion(); WikittyLabelHelper.setLabels(wikittyNew, targetLabels); - + // restore the version + wikittyNew.setVersion(wikittyVersionLocal); proxyTarget.store(wikittyNew); - String versionSave = wikittyNew.getVersion(); + String versionSaveTarget = wikittyNew.getVersion(); WikittyLabelHelper.setLabels(wikittyNew, saveLabelOrigin); - wikittyNew.setVersion(versionSave); + wikittyNew.setVersion(versionSaveTarget); // we re store on the origin to ensure wikitty version - proxyOrigin.store(wikittyNew); + try { + proxyOrigin.store(wikittyNew); + } catch (Exception e) { + + // FIXME when a wikitty service store a + // wikitty that he does'nt know + // he set the version to 1.0 + e.printStackTrace(); + } } } @@ -242,7 +252,11 @@ * if option delete remove those who are on the target but not on origin */ if (isDelete) { + for (String id : existOnlyOnTarget) { + + + Wikitty w = proxyTarget.restore(id); WikittyLabelHelper.removeLabels(w, labelTarget); @@ -265,8 +279,7 @@ // check version for update /* - * TODO mfortun-2011-14-18 do something for labels at this time - * we replace origin labels y target's labels if we udpate. + * we replace origin labels by target's labels if we udpate. */ if (WikittyUtil .versionGreaterThan(versionOrigin, versionTarget)) { @@ -276,8 +289,12 @@ Set<String> setLabelOrigin = WikittyLabelHelper .getLabels(fromOrigin); + // save version before reset the label + String versionLocalSave = fromOrigin.getVersion(); // replace labels origins, by targets label WikittyLabelHelper.setLabels(fromOrigin, setLabelTarget); + // restore the version + fromOrigin.setVersion(versionLocalSave); // send modified origin to target wikitty service proxyTarget.store(fromOrigin); // re store on origin to ensure version is the same on both 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-04-21 15:18:04 UTC (rev 830) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-22 13:47:11 UTC (rev 831) @@ -144,6 +144,9 @@ this.mimeHelper = new MimeTypePubHelper(); + + + String url = app.getOption(WikittyPublication.WIKITTY_OPTION_URL); URI uri = new URI(url); @@ -163,6 +166,9 @@ this.recursion = app .getOptionAsBoolean(WikittyPublication.IS_RECURSION_OPTION); + + + } catch (Exception e) { e.printStackTrace(); } @@ -286,7 +292,7 @@ @Override public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - + WikittyEvent result = new WikittyEvent(this); try { for (Wikitty w : wikitties) { @@ -303,6 +309,27 @@ } } + if ("".equals(ourDir)) { + + // remove file if the wikitty already exist + + BidiMap location = harvestLocalWikitties(homeFile, true); + + FileSystemWIkittyId idSystem = (FileSystemWIkittyId) location + .get(w.getId()); + + if (idSystem != null) { + File wikittyFile = new File(idSystem.getPath() + + File.separator + idSystem.getFileName()); + + if (wikittyFile.exists()) { + wikittyFile.delete(); + } + } + + return result; + } + // create the directories from the label boolean pathFilecreated = createFilesFromLabelPath(ourDir); @@ -383,8 +410,6 @@ // TODO mfortun-2011-04-12 really handle exceptions } - WikittyEvent result = new WikittyEvent(this); - return result; } @@ -933,12 +958,18 @@ harvestNewCheckModificationsAndDeleted(starts, label); } - BidiMap map = harvestLocalWikitties(homeFile, true); + BidiMap map = harvestLocalWikitties(starts, true); + + + for (Object o : map.keySet()) { String id = (String) o; FileSystemWIkittyId location = (FileSystemWIkittyId) map .get(id); + + + wikitties.put(id, restore(id, location)); } @@ -997,7 +1028,7 @@ harvestNewCheckModificationsAndDeleted(starts, label); } - BidiMap map = harvestLocalWikitties(homeFile, true); + BidiMap map = harvestLocalWikitties(starts, true); for (Object o : map.keySet()) { String id = (String) o; @@ -1271,7 +1302,7 @@ filesWikitty.addAll(CollectionUtil.toGenericCollection(ids.values(), String.class)); - //remove property of deleted wikitties + // remove property of deleted wikitties if (filesWikitty.size() != listChildFileNonDir.size()) { meta = getWikittyPublicationProperties(starts,

1 0

r830 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 21 Apr '11

21 Apr '11

Author: mfortun Date: 2011-04-21 17:18:04 +0200 (Thu, 21 Apr 2011) New Revision: 830 Url: http://nuiton.org/repositories/revision/wikitty/830 Log: * add correction for label manipulation Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.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-04-21 13:07:49 UTC (rev 829) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-21 15:18:04 UTC (rev 830) @@ -26,6 +26,7 @@ import java.net.URI; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -197,10 +198,45 @@ if (isUpdate) { List<Wikitty> newWikitties = proxyOrigin.restore(existOnlyOnOrigin); - proxyTarget.storeWikitty(newWikitties); - // we re store on the origin to ensure wikitty version - proxyOrigin.storeWikitty(newWikitties); + for (Wikitty wikittyNew : newWikitties) { + + Set<String> saveLabelOrigin = WikittyLabelHelper + .getLabels(wikittyNew); + + Set<String> targetLabels = new HashSet<String>(); + + // prepare set of target label + // we save all the label except the one corresponding + // to origin, determine by isRecur + for (String labels : saveLabelOrigin) { + + if (isRecur && labels.startsWith(labelOrigin)) { + String finalLabelTarge = labels.replace(labelOrigin, + labelTarget); + targetLabels.add(finalLabelTarge); + } else if (!isRecur && labels.equals(labelOrigin)) { + targetLabels.add(labelTarget); + } else { + targetLabels.add(labels); + } + + } + + WikittyLabelHelper.setLabels(wikittyNew, targetLabels); + + proxyTarget.store(wikittyNew); + + String versionSave = wikittyNew.getVersion(); + + WikittyLabelHelper.setLabels(wikittyNew, saveLabelOrigin); + wikittyNew.setVersion(versionSave); + + // we re store on the origin to ensure wikitty version + proxyOrigin.store(wikittyNew); + + } + } /* * if option delete remove those who are on the target but not on origin @@ -236,11 +272,25 @@ .versionGreaterThan(versionOrigin, versionTarget)) { Set<String> setLabelTarget = WikittyLabelHelper .getLabels(fromTarget); + + Set<String> setLabelOrigin = WikittyLabelHelper + .getLabels(fromOrigin); + // replace labels origins, by targets label WikittyLabelHelper.setLabels(fromOrigin, setLabelTarget); // send modified origin to target wikitty service proxyTarget.store(fromOrigin); // re store on origin to ensure version is the same on both + + // save the version case re set labels increment version + String saveVersion = fromOrigin.getVersion(); + // re set correctly labels + WikittyLabelHelper.setLabels(fromOrigin, setLabelOrigin); + // re set the version + fromOrigin.setVersion(saveVersion); + + // re store the wikitty with the correct version + // and labels proxyOrigin.store(fromOrigin); } }

1 0

r829 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 21 Apr '11

21 Apr '11

Author: mfortun Date: 2011-04-21 15:07:49 +0200 (Thu, 21 Apr 2011) New Revision: 829 Url: http://nuiton.org/repositories/revision/wikitty/829 Log: * correction to ensure version are the same on both wikittyservice after udapte, and existing type of sync. Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.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-04-21 12:22:24 UTC (rev 828) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-21 13:07:49 UTC (rev 829) @@ -68,7 +68,6 @@ static protected ApplicationConfig applicationConfig; - /** * for recursion option */ @@ -199,6 +198,8 @@ List<Wikitty> newWikitties = proxyOrigin.restore(existOnlyOnOrigin); proxyTarget.storeWikitty(newWikitties); + // we re store on the origin to ensure wikitty version + proxyOrigin.storeWikitty(newWikitties); } /* @@ -211,6 +212,7 @@ WikittyLabelHelper.removeLabels(w, labelTarget); proxyTarget.store(w); + } } else { /* @@ -238,6 +240,8 @@ WikittyLabelHelper.setLabels(fromOrigin, setLabelTarget); // send modified origin to target wikitty service proxyTarget.store(fromOrigin); + // re store on origin to ensure version is the same on both + proxyOrigin.store(fromOrigin); } }

1 0

r828 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 21 Apr '11

21 Apr '11

Author: mfortun Date: 2011-04-21 14:22:24 +0200 (Thu, 21 Apr 2011) New Revision: 828 Url: http://nuiton.org/repositories/revision/wikitty/828 Log: * add detection of deleted file, now it delete property from the local workspace Modified: 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/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-21 09:39:45 UTC (rev 827) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-21 12:22:24 UTC (rev 828) @@ -112,6 +112,8 @@ static public String META_PREFIX_KEY_CHECKSUM = "checksum."; + static public String META_PREFIX_KEY_ID = "id."; + static public String WIKITTY_FILE_META_PROPERTIES_FILE = "meta.properties"; static public String WIKITTY_FILE_SERVICE = "ws.properties"; @@ -928,7 +930,7 @@ File starts = new File(homeFile.getAbsolutePath() + File.separator + labelToDir); if (starts.exists()) { - harvestNewCheckModifications(starts, label); + harvestNewCheckModificationsAndDeleted(starts, label); } BidiMap map = harvestLocalWikitties(homeFile, true); @@ -946,7 +948,6 @@ e.printStackTrace(); } - List<PagedResult<String>> result = new ArrayList<PagedResult<String>>(); // for each criteria @@ -993,7 +994,7 @@ File starts = new File(homeFile.getAbsolutePath() + File.separator + labelToDir); if (starts.exists()) { - harvestNewCheckModifications(starts, label); + harvestNewCheckModificationsAndDeleted(starts, label); } BidiMap map = harvestLocalWikitties(homeFile, true); @@ -1220,8 +1221,8 @@ return result; } - protected void harvestNewCheckModifications(File starts, String label) - throws Exception { + protected void harvestNewCheckModificationsAndDeleted(File starts, + String label) throws Exception { File propertyFile = new File(starts + File.separator + PROPERTY_DIRECTORY); @@ -1238,13 +1239,17 @@ meta.put(META_CURRENT_LABEL, label); meta.store(); + + List<String> listChildFileNonDir = new ArrayList<String>(); + for (File child : starts.listFiles()) { if (child.isDirectory() && !child.getName().equals(PROPERTY_DIRECTORY)) { - harvestNewCheckModifications(child, label + harvestNewCheckModificationsAndDeleted(child, label + WIKITTYLABEL_SEPARATOR + child.getName()); } else if (!child.isDirectory()) { + listChildFileNonDir.add(child.getName()); // check if file is a wikitty by check if they is a id/file name // in the correct properties file List<String> filesWikitty = new ArrayList<String>(); @@ -1258,7 +1263,35 @@ } } } + // after the add of new file check for delete file + ids = getWikittyPublicationProperties(starts, + WIKITTY_ID_PROPERTIES_FILE); + List<String> filesWikitty = new ArrayList<String>(); + filesWikitty.addAll(CollectionUtil.toGenericCollection(ids.values(), + String.class)); + + //remove property of deleted wikitties + if (filesWikitty.size() != listChildFileNonDir.size()) { + + meta = getWikittyPublicationProperties(starts, + WIKITTY_FILE_META_PROPERTIES_FILE); + + filesWikitty.removeAll(listChildFileNonDir); + + for (String fileRemoved : filesWikitty) { + ids.remove(meta.get(META_PREFIX_KEY_ID + fileRemoved)); + + meta.remove(META_PREFIX_KEY_CHECKSUM + fileRemoved); + meta.remove(META_PREFIX_KEY_VERSION + fileRemoved); + meta.remove(META_PREFIX_KEY_ID + fileRemoved); + } + meta.store(); + + } + + ids.store(); + } protected void checkModifications(File child) throws Exception { @@ -1335,6 +1368,8 @@ wikitty.getVersion()); meta.put(META_PREFIX_KEY_CHECKSUM + towrite.getName(), localMd5); + meta.put(META_PREFIX_KEY_ID + towrite.getName(), wikitty.getId()); + id.store(); meta.store(); } else {

1 0

r827 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 21 Apr '11

21 Apr '11

Author: mfortun Date: 2011-04-21 11:39:45 +0200 (Thu, 21 Apr 2011) New Revision: 827 Url: http://nuiton.org/repositories/revision/wikitty/827 Log: * correct wikittypublicationfilesystem for norecursion option * correct starts directory for search, restore, etc, starts file is determine by label and homedir Modified: 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/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-20 21:42:24 UTC (rev 826) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-21 09:39:45 UTC (rev 827) @@ -99,7 +99,6 @@ protected File homeFile; protected boolean recursion; protected String label; - static public String META_CURRENT_LABEL = "current.label"; @@ -125,8 +124,8 @@ static public String PROPERTY_DIRECTORY = ".wp"; - protected MimeTypePubHelper mimeHelper; + /** * Constructor with the working directory * @@ -141,9 +140,8 @@ */ try { - this.mimeHelper = new MimeTypePubHelper(); + this.mimeHelper = new MimeTypePubHelper(); - String url = app.getOption(WikittyPublication.WIKITTY_OPTION_URL); URI uri = new URI(url); @@ -330,7 +328,7 @@ File wikittyFile = null; if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { name = WikittyPubDataHelper.getName(w); - // String mime = WikittyPubDataHelper.getMimeType(w); + // String mime = WikittyPubDataHelper.getMimeType(w); byte[] content = WikittyPubDataHelper.getContent(w); extension = WikittyPubDataHelper.getFileExtension(w); @@ -345,7 +343,7 @@ } else if (w .hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { name = WikittyPubTextHelper.getName(w); - //String mime = WikittyPubTextHelper.getMimeType(w); + // String mime = WikittyPubTextHelper.getMimeType(w); String content = WikittyPubTextHelper.getContent(w); extension = WikittyPubTextHelper.getFileExtension(w); @@ -457,16 +455,15 @@ List<Wikitty> result = new ArrayList<Wikitty>(); try { - BidiMap locations = harvestLocalWikitties(homeFile, recursion); + String labelToDir = this.labelToPath(label); + File starts = new File(homeFile.getAbsolutePath() + File.separator + + labelToDir); + BidiMap locations = harvestLocalWikitties(starts, recursion); + for (String wikid : id) { Object value = locations.get(wikid); - if (value == null) { - locations = locations.inverseBidiMap(); - value = locations.get(wikid); - } - if (value != null) { FileSystemWIkittyId localisation = (FileSystemWIkittyId) value; @@ -474,6 +471,7 @@ result.add(this.restore(wikid, localisation)); } } + } catch (Exception e) { e.printStackTrace(); // TODO mfortun-2011-01-12 really handle exception @@ -630,8 +628,8 @@ switch (restriction.getName()) { case EQUALS: + if (value instanceof String && o instanceof String) { - String pattern = (String) value; pattern = pattern.replace("*", "\\p{ASCII}*"); pattern = pattern.replace("?", "\\p{ASCII}"); @@ -926,12 +924,13 @@ List<Criteria> criteria) { Map<String, Wikitty> wikitties = new HashMap<String, Wikitty>(); try { - String labelToDir = this.labelToPath(label); - File starts = new File (homeFile.getAbsolutePath()+File.separator+labelToDir); - if (starts.exists()){ + String labelToDir = this.labelToPath(label); + File starts = new File(homeFile.getAbsolutePath() + File.separator + + labelToDir); + if (starts.exists()) { harvestNewCheckModifications(starts, label); } - + BidiMap map = harvestLocalWikitties(homeFile, true); for (Object o : map.keySet()) { @@ -947,6 +946,7 @@ e.printStackTrace(); } + List<PagedResult<String>> result = new ArrayList<PagedResult<String>>(); // for each criteria @@ -988,7 +988,28 @@ List<String> result = new ArrayList<String>(); Map<String, Wikitty> wikitties = new HashMap<String, Wikitty>(); + try { + String labelToDir = this.labelToPath(label); + File starts = new File(homeFile.getAbsolutePath() + File.separator + + labelToDir); + if (starts.exists()) { + harvestNewCheckModifications(starts, label); + } + BidiMap map = harvestLocalWikitties(homeFile, true); + + for (Object o : map.keySet()) { + String id = (String) o; + FileSystemWIkittyId location = (FileSystemWIkittyId) map + .get(id); + wikitties.put(id, restore(id, location)); + + } + + } catch (Exception e) { + // TODO mfortun-2011-04-21 really handle exception + e.printStackTrace(); + } // for each criteria for (Criteria cr : criteria) { // prepare restriction on result @@ -1054,8 +1075,6 @@ } - - /** * Method that create a list of the properties directory * @@ -1164,7 +1183,6 @@ String extension = FileUtil.extension(fileToTransform); String name = FileUtil.basename(completeName, "." + extension); - // search for the mimetype String mimeType = mimeHelper.getMimeForExtension(extension); @@ -1207,7 +1225,7 @@ File propertyFile = new File(starts + File.separator + PROPERTY_DIRECTORY); - + if (!propertyFile.exists() || !propertyFile.isDirectory()) { propertyFile.mkdir(); @@ -1359,17 +1377,16 @@ return result; } - - public String labelToPath (String label){ + public String labelToPath(String label) { String result = label; - + result = result.replace(".", File.separator); // correct the pb with directory name begin by . - result = result.replace(File.separator + File.separator, - File.separator + "."); - + result = result.replace(File.separator + File.separator, File.separator + + "."); + return result; } - + }

1 0

r826 - trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org 20 Apr '11

20 Apr '11

Author: bpoussin Date: 2011-04-20 23:42:24 +0200 (Wed, 20 Apr 2011) New Revision: 826 Url: http://nuiton.org/repositories/revision/wikitty/826 Log: si on sauve avec une nouvelle extension sans modifier son numero de version, cela plantait :( maintenant, on a seulement un message d'erreur dans les logs Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2011-04-20 21:01:17 UTC (rev 825) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2011-04-20 21:42:24 UTC (rev 826) @@ -511,7 +511,16 @@ while (resultSet.next()) { // fqfieldName fully qualified fieldName (extention.fieldname) String fqfieldName = resultSet.getString(COL_FIELDNAME); - if (isAcceptedField(acceptedField, fqfieldName)) { + // si le champs est dans la base sur l'objet mais non declarer sur + // l'extension, on ne charge pas ce champs (ceci arrive si, quelqu'un + // a modifier une extension, sans modifier sa version :( + if (!result.hasField(fqfieldName)) { + if (log.isErrorEnabled()) { + log.error(String.format("Stored field not found in this" + + " extension version, perhaps you have change" + + " extension without change version", fqfieldName)); + } + } else if (isAcceptedField(acceptedField, fqfieldName)) { FieldType type = result.getFieldType(fqfieldName); Object value = null; switch (type.getType()) {

1 0

r825 - in trunk/wikitty-api/src/main/java/org/nuiton/wikitty: . entities services
by bpoussin＠users.nuiton.org 20 Apr '11

20 Apr '11

Author: bpoussin Date: 2011-04-20 23:01:17 +0200 (Wed, 20 Apr 2011) New Revision: 825 Url: http://nuiton.org/repositories/revision/wikitty/825 Log: - prise en charge de parametre null dans diffentes methods - ajout de la methode store avec varargs Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-04-20 15:50:20 UTC (rev 824) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-04-20 21:01:17 UTC (rev 825) @@ -46,7 +46,6 @@ import org.nuiton.wikitty.services.WikittyServiceEnhanced; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -219,7 +218,27 @@ return w; } + // TODO poussin 20110420 je ne sais pas comment creer un tableau de E pour + // le retouner. Donc je retourne la liste au lieu d'un toArray sur celle-ci + public <E extends BusinessEntity> List<E> store(E e1, E e2, E... eN) { + List<E> es = new ArrayList<E>(eN.length + 2); + Collections.addAll(es, e1, e2); + Collections.addAll(es, eN); + List<E> result = store(es); + return result; + } + + public Wikitty[] store(Wikitty w1, Wikitty w2, Wikitty... wN) { + List<Wikitty> ws = new ArrayList<Wikitty>(wN.length + 2); + Collections.addAll(ws, w1, w2); + Collections.addAll(ws, wN); + + List<Wikitty> resultList = storeWikitty(ws); + Wikitty[] result = resultList.toArray(new Wikitty[resultList.size()]); + return result; + } + /** * Store to WikittyService objects. * @@ -232,8 +251,12 @@ // prepare data to send to service List<Wikitty> wikitties = new ArrayList<Wikitty>(objets.size()); for (E e : objets) { - Wikitty w = ((BusinessEntityImpl)e).getWikitty(); - wikitties.add(w); + if (e == null) { + wikitties.add(null); + } else { + Wikitty w = ((BusinessEntityImpl)e).getWikitty(); + wikitties.add(w); + } } // call the service with Wikitty Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2011-04-20 15:50:20 UTC (rev 824) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2011-04-20 21:01:17 UTC (rev 825) @@ -102,6 +102,8 @@ boolean hasField(String extName, String fieldName); + boolean hasField(String fqfieldName); + WikittyExtension getExtension(String ext); Collection<String> getExtensionNames(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2011-04-20 15:50:20 UTC (rev 824) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2011-04-20 21:01:17 UTC (rev 825) @@ -197,6 +197,11 @@ } @Override + public boolean hasField(String fqfieldName) { + return target.hasField(fqfieldName); + } + + @Override public WikittyExtension getExtension(String ext) { return target.getExtension(ext); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2011-04-20 15:50:20 UTC (rev 824) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2011-04-20 21:01:17 UTC (rev 825) @@ -365,6 +365,15 @@ return result; } + @Override + public boolean hasField(String fqfieldName) { + String extName = WikittyExtension.extractExtensionName(fqfieldName); + String fieldName = WikittyExtension.extractFieldName(fqfieldName); + + boolean result = hasField(extName, fieldName); + return result; + } + /* * @see org.nuiton.wikitty.Wikitty#getExtension(java.lang.String) */ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2011-04-20 15:50:20 UTC (rev 824) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2011-04-20 21:01:17 UTC (rev 825) @@ -268,23 +268,25 @@ * @return wikitty passed in arguement or null, if event is CLEAR_WIKITTY */ public Wikitty update(Wikitty e) { - // update version - String id = e.getId(); - if (type.contains(WikittyEventType.CLEAR_WIKITTY)) { - e = null; - } else { - if (type.contains(WikittyEventType.PUT_WIKITTY)) { - Wikitty newWikitty = getWikitties().get(id); - // can be null if wikitty is already saved (uptodate), then this wikitty is not re-saved - if (newWikitty != null) { - e.replaceWith(newWikitty); + if (e != null) { + // update version + String id = e.getId(); + if (type.contains(WikittyEventType.CLEAR_WIKITTY)) { + e = null; + } else { + if (type.contains(WikittyEventType.PUT_WIKITTY)) { + Wikitty newWikitty = getWikitties().get(id); + // can be null if wikitty is already saved (uptodate), then this wikitty is not re-saved + if (newWikitty != null) { + e.replaceWith(newWikitty); + } } + if (type.contains(WikittyEventType.REMOVE_WIKITTY)) { + Date date = getRemoveDate().get(id); + e.setDeleteDate(date); + } + e.clearDirty(); } - if (type.contains(WikittyEventType.REMOVE_WIKITTY)) { - Date date = getRemoveDate().get(id); - e.setDeleteDate(date); - } - e.clearDirty(); } return e; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2011-04-20 15:50:20 UTC (rev 824) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2011-04-20 21:01:17 UTC (rev 825) @@ -218,7 +218,9 @@ protected void checkStore(String securityToken, Collection<Wikitty> wikitties) { String userId = getUserId(securityToken); for (Wikitty wikitty : wikitties) { - + if (wikitty == null) { + continue; + } // usual case, a user want to store a wikitty Wikitty oldVersion = WikittyServiceEnhanced.restore( getDelegate(), securityToken, wikitty.getId()); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2011-04-20 15:50:20 UTC (rev 824) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2011-04-20 21:01:17 UTC (rev 825) @@ -175,6 +175,9 @@ // use all time Set to prevent duplicated wikitty in collection wikitties = new LinkedHashSet<Wikitty>(wikitties); } + // suppress null wikitty + wikitties.remove(null); + checkConstraint(wikitties); // update/store extension if necessary @@ -774,9 +777,13 @@ List<PagedResult<String>> result = new ArrayList<PagedResult<String>>(criteria.size()); for (Criteria c : criteria) { - PagedResult<String> searchResult = - getSearchEngine().findAllByCriteria(tx, c); - result.add(searchResult); + if (c == null) { + result.add(null); + } else { + PagedResult<String> searchResult = + getSearchEngine().findAllByCriteria(tx, c); + result.add(searchResult); + } } if (txBeginHere) {

1 0

r824 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 20 Apr '11

20 Apr '11

Author: mfortun Date: 2011-04-20 17:50:20 +0200 (Wed, 20 Apr 2011) New Revision: 824 Url: http://nuiton.org/repositories/revision/wikitty/824 Log: * change how determine mimetype for a file, add a class to do that Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java 2011-04-20 15:50:20 UTC (rev 824) @@ -0,0 +1,72 @@ +package org.nuiton.wikitty.publication.synchro; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Class used to determine mimetype for an extension, used to determine type of + * wikittypub (data or text) with the extension and the mime type + * + * + * @author mfortun + * + */ +public class MimeTypePubHelper { + + protected Map<String, String> mapExtensionMime; + protected List<String> mimePubText; + public static String DEFAULT_MIME_TYPE = "application/octet-stream"; + + public MimeTypePubHelper() { + this.mapExtensionMime = new HashMap<String, String>(); + this.mimePubText = new ArrayList<String>(); + + // TODO create a property file to store and handle mimetype for pub + // text + mimePubText.add("application/javascript"); + + mapExtensionMime.put("wp", "application/javascript"); + mapExtensionMime.put("jpg", "image/jpeg"); + mapExtensionMime.put("png", "image/png"); + } + + public Map<String, String> getMapExtensionMime() { + return mapExtensionMime; + } + + public void setMapExtensionMime(Map<String, String> mapExtensionMime) { + this.mapExtensionMime = mapExtensionMime; + } + + public List<String> getMimePubText() { + return mimePubText; + } + + public void setMimePubText(List<String> mimePubText) { + this.mimePubText = mimePubText; + } + + public String getMimeForExtension(String ext) { + String result = mapExtensionMime.get(ext); + + if (result == null) { + result = DEFAULT_MIME_TYPE; + } + + return result; + } + + public boolean isPubTextMime(String mimeType) { + return mimePubText.contains(mimeType); + } + + public void addMimeForPubText(String mime) { + mimePubText.add(mime); + } + + public void addExtensionMime(String extension, String mime) { + mapExtensionMime.put(extension, mime); + } +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-04-20 14:45:47 UTC (rev 823) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-20 15:50:20 UTC (rev 824) @@ -42,7 +42,6 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.activation.MimetypesFileTypeMap; import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.logging.Log; @@ -100,7 +99,7 @@ protected File homeFile; protected boolean recursion; protected String label; - protected List<String> pubTextMimeType; + static public String META_CURRENT_LABEL = "current.label"; @@ -126,6 +125,8 @@ static public String PROPERTY_DIRECTORY = ".wp"; + + protected MimeTypePubHelper mimeHelper; /** * Constructor with the working directory * @@ -140,11 +141,8 @@ */ try { - this.pubTextMimeType = new ArrayList<String>(); + this.mimeHelper = new MimeTypePubHelper(); - // TODO create a property file to store and handle mimetype for pub - // text - pubTextMimeType.add("application/javascript"); String url = app.getOption(WikittyPublication.WIKITTY_OPTION_URL); URI uri = new URI(url); @@ -332,7 +330,7 @@ File wikittyFile = null; if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { name = WikittyPubDataHelper.getName(w); - String mime = WikittyPubDataHelper.getMimeType(w); + // String mime = WikittyPubDataHelper.getMimeType(w); byte[] content = WikittyPubDataHelper.getContent(w); extension = WikittyPubDataHelper.getFileExtension(w); @@ -347,7 +345,7 @@ } else if (w .hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { name = WikittyPubTextHelper.getName(w); - String mime = WikittyPubTextHelper.getMimeType(w); + //String mime = WikittyPubTextHelper.getMimeType(w); String content = WikittyPubTextHelper.getContent(w); extension = WikittyPubTextHelper.getFileExtension(w); @@ -1056,15 +1054,7 @@ } - /** - * return if the mime type is associate to a wikittypubtext - * - * @param mime - * @return - */ - public boolean isMimeWikittyPubText(String mime) { - return pubTextMimeType.contains(mime); - } + /** * Method that create a list of the properties directory @@ -1174,9 +1164,9 @@ String extension = FileUtil.extension(fileToTransform); String name = FileUtil.basename(completeName, "." + extension); - MimetypesFileTypeMap mapMime = new MimetypesFileTypeMap(); + // search for the mimetype - String mimeType = mapMime.getContentType(fileToTransform); + String mimeType = mimeHelper.getMimeForExtension(extension); // load properties File wikittyParentDir = new File(path); @@ -1188,7 +1178,7 @@ .getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL)); // create the correct wikittypubxxx - if (isMimeWikittyPubText(mimeType)) { + if (mimeHelper.isPubTextMime(mimeType)) { result.addExtension(WikittyPubTextImpl.extensionWikittyPubText); WikittyPubTextHelper.setName(result, name); WikittyPubTextHelper.setMimeType(result, mimeType); @@ -1217,11 +1207,7 @@ File propertyFile = new File(starts + File.separator + PROPERTY_DIRECTORY); - - // TODO mfortun-2011-04-18 have to work on labels - // actually starts + label have to be the same. - // first starts and label. - + if (!propertyFile.exists() || !propertyFile.isDirectory()) { propertyFile.mkdir();

1 0