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

r444 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/importexport wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by bpoussin＠users.nuiton.org Oct. 21, 2010

Oct. 21, 2010

Author: bpoussin Date: 2010-10-21 16:32:50 +0200 (Thu, 21 Oct 2010) New Revision: 444 Url: http://nuiton.org/repositories/revision/wikitty/444 Log: remove all usage of deprecated WikittyException(Throwable) http://www.nuiton.org/issues/show/965 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java 2010-10-21 14:32:50 UTC (rev 444) @@ -116,7 +116,8 @@ ImportTask task = new ImportTask(securityToken, ws, format, reader); task.run(); } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't import in format %s uri %s", format, uri), eee); } } @@ -132,7 +133,8 @@ importExportTask.put(jobId, future); return jobId; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't import in format %s uri %s", format, uri), eee); } } @@ -184,7 +186,8 @@ importExportTask.put(jobId, future); return jobId; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't export in format %s", format), eee); } } @@ -223,7 +226,8 @@ } return result; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't retrieve job info for job %s", jobId), eee); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-21 14:32:50 UTC (rev 444) @@ -179,8 +179,10 @@ } result = WikittyUtil.newInstance( securityToken, wikittyService, clazz, wikitty); + } catch (SecurityException eee) { + throw eee; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't restore wikitty", eee); } if (checkExtension) { // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl @@ -477,8 +479,10 @@ } businessEntity = WikittyUtil.newInstance( securityToken, wikittyService, clazz, wikitty); + } catch (SecurityException eee) { + throw eee; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't restore children", eee); } boolean goodType = true; @@ -526,8 +530,11 @@ extNames = new HashSet<String>(wikitty.getExtensionNames()); result = WikittyUtil.newInstance( securityToken, wikittyService, clazz, wikitty); + } catch (SecurityException eee) { + throw eee; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException( + "Can't retrieve wikitty needed for hasType test", eee); } // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl BusinessEntityWikitty b = (BusinessEntityWikitty)result; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-21 14:32:50 UTC (rev 444) @@ -207,7 +207,7 @@ throw ex; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't store wikitty", eee); } } else { throw new WikittyException("You can't store null wikitty object"); @@ -235,7 +235,7 @@ throw ex; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't store wikitty", eee); } } @@ -263,7 +263,7 @@ throw ex; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't store wikitty", eee); } } @@ -279,7 +279,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't retrieve all extension's ids", eee); } } @@ -297,7 +297,8 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't retrieve all required extension for %s", extensionName), eee); } } @@ -327,7 +328,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't store extensions", eee); } } @@ -344,7 +345,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't store extension", eee); } } @@ -378,7 +379,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("can't restore extensions", eee); } } @@ -408,7 +409,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't restore extension", eee); } } @@ -461,7 +462,7 @@ log.error("Can't restore wikitty collection", eee); } transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't restore wikitty", eee); } } @@ -477,7 +478,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't restore wikitty", eee); } } @@ -609,7 +610,7 @@ transaction.commit(); } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't delete wikitty", eee); } } @@ -624,7 +625,7 @@ transaction.commit(); } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't delete wikitty", eee); } } @@ -645,7 +646,7 @@ transaction.commit(); } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't clear all data", eee); } } @@ -675,7 +676,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Error during find", eee); } } @@ -707,7 +708,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Error during find", eee); } } @@ -753,7 +754,7 @@ return tree; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't restore tree", eee); } } @@ -769,7 +770,7 @@ transaction.commit(); } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't delete tree", eee); } return deletedIds; @@ -842,7 +843,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't restore node", eee); } } @@ -884,7 +885,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't restore children", eee); } } @@ -941,7 +942,7 @@ return result; } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Can't sync searchable index with data", eee); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-10-21 14:32:50 UTC (rev 444) @@ -643,7 +643,8 @@ return result; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't create new instance of %s", clazz), eee); } } @@ -708,7 +709,8 @@ return result; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't create new instance of %s", clazz), eee); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-10-21 14:32:50 UTC (rev 444) @@ -87,7 +87,7 @@ transaction.commit(); } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Error during export task", eee); } } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-10-21 14:32:50 UTC (rev 444) @@ -78,7 +78,7 @@ transaction.commit(); } catch (Exception eee) { transaction.rollback(); - throw new WikittyException(eee); + throw new WikittyException("Error during import task", eee); } } } Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-10-21 14:32:50 UTC (rev 444) @@ -119,7 +119,7 @@ commitJDBCConnection(connection); } catch (SQLException eee) { rollbackJDBCConnection(connection); - throw new WikittyException(eee); + throw new WikittyException("Can't create table for extension storage", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -171,7 +171,7 @@ UpdateResponse result = new UpdateResponse(); return result; } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't store extension", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -191,7 +191,7 @@ boolean result = resultSet.next(); return result; } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't test extension existance",eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -214,7 +214,7 @@ } return result; } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't retrieve all extensions id", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -240,7 +240,8 @@ return result; } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't retrieve all extensions required by %s", extensionName), eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -277,7 +278,7 @@ } lastVersion = tmp; } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't get last version of extensions", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -353,7 +354,7 @@ doQuery(connection, conf.getProperty(QUERY_CLEAR_EXTENSION)); } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't clear all extension", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-10-21 14:32:50 UTC (rev 444) @@ -295,7 +295,9 @@ return connection; } catch(Exception eee) { - throw new WikittyException(eee); + throw new WikittyException(String.format( + "Can't connect to database %s %s with login %s", + JDBC_DRIVER, JDBC_HOST, JDBC_USER_NAME), eee); } } @@ -324,7 +326,8 @@ connection.setAutoCommit(false); return connection; } catch(SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException( + "Can't set connection auto commit to false", eee); } } @@ -337,12 +340,12 @@ try { connection.commit(); } catch(SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't commit transaction", eee); } finally { try { connection.close(); } catch(SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't close connection", eee); } } } @@ -356,12 +359,12 @@ try { connection.rollback(); } catch(SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't rollback transaction", eee); } finally { try { connection.close(); } catch(SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't close connection", eee); } } } Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-10-21 14:32:50 UTC (rev 444) @@ -137,7 +137,7 @@ commitJDBCConnection(connection); } catch (SQLException eee) { rollbackJDBCConnection(connection); - throw new WikittyException(eee); + throw new WikittyException("Can't create table for wikitty storage", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -294,7 +294,7 @@ return result; } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't store wikitty", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -314,7 +314,7 @@ boolean result = resultSet.next(); return result; } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't test wikitty existance", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -339,7 +339,7 @@ "Wikitty with id '%s' doesn't exists", id)); } } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't test if wikitty is already deleted", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -407,7 +407,7 @@ return result; } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't delete wikitty", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -431,7 +431,7 @@ scanner.scan(id); } } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't scan wall wikitty", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } @@ -564,7 +564,7 @@ doQuery(connection, conf.getProperty(QUERY_CLEAR_WIKITTY)); } catch (SQLException eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't clear wikitty data", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-21 10:47:18 UTC (rev 443) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-21 14:32:50 UTC (rev 444) @@ -515,7 +515,7 @@ solrResource = new SolrResource(solrServer); } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException("SolR initialization error", eee); } } @@ -526,7 +526,7 @@ solrResource.init(); solrServer.deleteByQuery("*:*"); } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException("Error during clearing SolR data", eee); } } @@ -581,7 +581,7 @@ return result; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't store wikitty", eee); } } @@ -615,7 +615,7 @@ return result; } catch (Exception eee) { - throw new WikittyException(eee); + throw new WikittyException("Can't delete wikitty in index", eee); } } @@ -626,8 +626,8 @@ solrServer.deleteById(id); } solrServer.commit(); - } catch (Exception e) { - throw new WikittyException(e); + } catch (Exception eee) { + throw new WikittyException("Can't delete wikitty in index", eee); } } @@ -750,8 +750,8 @@ firstIndex, numFound, queryString, facets, ids); return result; - } catch (SolrServerException e) { - throw new WikittyException(e); + } catch (SolrServerException eee) { + throw new WikittyException("Error during find", eee); } } @@ -904,7 +904,7 @@ try { response = solrServer.query(query); } catch (SolrServerException eee) { - throw new WikittyException(eee); + throw new WikittyException("Error during find", eee); } SolrDocumentList results = response.getResults();

1 0

r443 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Oct. 21, 2010

Oct. 21, 2010

Author: bpoussin Date: 2010-10-21 12:47:18 +0200 (Thu, 21 Oct 2010) New Revision: 443 Url: http://nuiton.org/repositories/revision/wikitty/443 Log: restore null id return null http://www.nuiton.org/issues/show/792 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-21 10:37:21 UTC (rev 442) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-21 10:47:18 UTC (rev 443) @@ -163,6 +163,9 @@ * @return wikitty entity with specified id or {@code null} if entity can't be found */ public <E extends BusinessEntity> E restore(Class<E> clazz, String id, boolean checkExtension) { + if (id == null) { + return null; + } E result = null; HashSet<String> extNames = null; try { @@ -203,6 +206,10 @@ * @return wikitty entity with specified id or {@code null} if entity can't be found */ public Wikitty restore(String id) { + if (id == null) { + return null; + } + Wikitty wikitty = wikittyService.restore(securityToken, id); return wikitty; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-21 10:37:21 UTC (rev 442) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-21 10:47:18 UTC (rev 443) @@ -414,6 +414,9 @@ protected Wikitty restore(String securityToken, WikittyTransaction transaction, String id) { + if (id == null) { + return null; + } if (!getWikittyStorage().exists(transaction, id)) { // object doesn't exist, we return null return null;

1 0

r442 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org Oct. 21, 2010

Oct. 21, 2010

Author: bpoussin Date: 2010-10-21 12:37:21 +0200 (Thu, 21 Oct 2010) New Revision: 442 Url: http://nuiton.org/repositories/revision/wikitty/442 Log: correction un peu trop rapide. Ce qui faisait un NPE :( Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-10-21 10:35:22 UTC (rev 441) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-10-21 10:37:21 UTC (rev 442) @@ -268,11 +268,11 @@ while (resultSet.next()) { String name = resultSet.getString(COL_NAME); String version = resultSet.getString(COL_VERSION); - String prevVersion = lastVersion.get(name); + String prevVersion = tmp.get(name); //if the version or this row is greater than the versions of teh already visited rows if (prevVersion == null || WikittyUtil.versionGreaterThan(version, prevVersion)) { - lastVersion.put(name, version); + tmp.put(name, version); } } lastVersion = tmp;

1 0

r441 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Oct. 21, 2010

Oct. 21, 2010

Author: bpoussin Date: 2010-10-21 12:35:22 +0200 (Thu, 21 Oct 2010) New Revision: 441 Url: http://nuiton.org/repositories/revision/wikitty/441 Log: remove unused import Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-21 10:35:05 UTC (rev 440) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-21 10:35:22 UTC (rev 441) @@ -28,7 +28,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Set; /** * Wikitty service.

1 0

r440 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Oct. 21, 2010

Oct. 21, 2010

Author: bpoussin Date: 2010-10-21 12:35:05 +0200 (Thu, 21 Oct 2010) New Revision: 440 Url: http://nuiton.org/repositories/revision/wikitty/440 Log: Change store and delete implementation to force usage of Set collection type http://www.nuiton.org/issues/show/882 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-20 22:26:21 UTC (rev 439) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-21 10:35:05 UTC (rev 440) @@ -38,6 +38,7 @@ import java.util.Map; import java.util.Set; import java.util.AbstractMap.SimpleEntry; +import java.util.LinkedHashSet; import java.util.Map.Entry; import org.apache.commons.logging.Log; @@ -157,10 +158,14 @@ @Override public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { + if (!(wikitties instanceof Set)) { + // use all time Set to prevent duplicated wikitty in collection + wikitties = new LinkedHashSet<Wikitty>(wikitties); + } checkConstraint(wikitties); // update/store extension if necessary - Set<WikittyExtension> allExtensions = new HashSet<WikittyExtension>(); + Set<WikittyExtension> allExtensions = new LinkedHashSet<WikittyExtension>(); for (Wikitty w : wikitties) { // collect all extensions used by all wikitties allExtensions.addAll(w.getExtensions()); @@ -533,18 +538,26 @@ protected void delete(String securityToken, WikittyTransaction transaction, Collection<String> ids) throws WikittyException { // work only on valid id - Collection<Wikitty> storedWikitties = new ArrayList<Wikitty>(); - List<String> idList = new LinkedList<String>(ids); - for (Iterator<String> i = idList.iterator(); i.hasNext();) { + Collection<Wikitty> storedWikitties = new LinkedHashSet<Wikitty>(); + // copy ids because we can remove some element, and modify it + // use set to prevent id duplication and preformance (contains method call) + Set<String> idSet = new LinkedHashSet<String>(ids); + for (Iterator<String> i = idSet.iterator(); i.hasNext();) { String id = i.next(); // test if wikitty exists if (!getWikittyStorage().exists(transaction, id)) { // don't exist, remove this id in id list i.remove(); + // go to the next id, because this id doesn't exist and can't + // be used in tree + continue; } if (getWikittyStorage().isDeleted(transaction, id)) { // already deleted, remove this id in id list i.remove(); + // go to the next id, because this id already deleted and can't + // be used in tree + continue; } // Store node with have deleted node as parent @@ -553,7 +566,7 @@ List<String> wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { - if(!ids.contains(wikittyNodeId)) { + if(!idSet.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, transaction, wikittyNodeId); WikittyTreeNodeHelper.setParent(treeNode, null); @@ -566,7 +579,7 @@ wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { - if(!ids.contains(wikittyNodeId)) { + if(!idSet.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, transaction, wikittyNodeId); WikittyTreeNodeHelper.removeAttachment(treeNode, id); @@ -575,8 +588,8 @@ } } - getWikittyStorage().delete(transaction, idList); - getSearchEngin().delete(transaction, idList); + getWikittyStorage().delete(transaction, idSet); + getSearchEngin().delete(transaction, idSet); store(securityToken, transaction, storedWikitties, false); }

1 0

r439 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Oct. 20, 2010

Oct. 20, 2010

Author: bpoussin Date: 2010-10-21 00:26:21 +0200 (Thu, 21 Oct 2010) New Revision: 439 Url: http://nuiton.org/repositories/revision/wikitty/439 Log: modification pour preparer le remplacement de UpdateResponse par WikittyServiceEvent http://www.nuiton.org/issues/show/944 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java 2010-10-20 22:22:35 UTC (rev 438) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java 2010-10-20 22:26:21 UTC (rev 439) @@ -58,15 +58,16 @@ public void addDeletionDateUpdate(String id, Date date) { idDeletionDateMap.put(id, date); } +// @Deprecated +// public void update(BusinessEntity e) { +// update((BusinessEntityWikitty) e); +// } - public void update(BusinessEntity e) { - update((BusinessEntityWikitty) e); - } +// @Deprecated +// public void update(BusinessEntityWikitty e) { +// update(e.getWikitty()); +// } - public void update(BusinessEntityWikitty e) { - update(e.getWikitty()); - } - /** * Update data directly in object passed in argument. * Actualy only version and deletion date are updated. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-20 22:22:35 UTC (rev 438) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-20 22:26:21 UTC (rev 439) @@ -123,7 +123,7 @@ public <E extends BusinessEntity> E store(E e) { Wikitty w = ((BusinessEntityWikitty)e).getWikitty(); UpdateResponse resp = wikittyService.store(securityToken, w); - resp.update(e); + resp.update(w); return e; } @@ -146,8 +146,8 @@ UpdateResponse resp = wikittyService.store(securityToken, wikitties); // update object - for (E e : objets) { - resp.update(e); + for (Wikitty w : wikitties) { + resp.update(w); } return objets; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 2010-10-20 22:22:35 UTC (rev 438) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 2010-10-20 22:26:21 UTC (rev 439) @@ -69,7 +69,7 @@ } - /** Remote event (received from jgroup). */ + /** Remote event (received from server). */ protected boolean remote; /** event type */ @@ -91,6 +91,7 @@ /** * Map between extensions set for each id. + * Not used for extension event */ protected Map<String, Set<String>> idExtensions; @@ -100,6 +101,11 @@ protected Map<String, String> idVersions; /** + * Map between deletion date for each id, if event is REMOVE. + */ + protected Map<String, String> idDeletionDate; + + /** * Constructor with source {@link WikittyService}. * * @param source wikitty service @@ -212,7 +218,7 @@ String toString = getClass().getName() + "[source=" + source + ", type=" + type + ", remote=" + remote + ", ids=" + ids + ", idExtensions=" + idExtensions + - ", idVersions=" + idVersions + "]"; + ", idVersions=" + idVersions + ", idDeletionDate=" + idVersions + "]"; return toString; }

1 0

r438 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org Oct. 20, 2010

Oct. 20, 2010

Author: bpoussin Date: 2010-10-21 00:22:35 +0200 (Thu, 21 Oct 2010) New Revision: 438 Url: http://nuiton.org/repositories/revision/wikitty/438 Log: correction du bug de multi-threading sur le calcul de lastVersion http://www.nuiton.org/issues/show/782 Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-10-20 14:20:55 UTC (rev 437) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-10-20 22:22:35 UTC (rev 438) @@ -92,7 +92,7 @@ new HashMap<String, WikittyExtension>(); /** cache for last extension version; key: extName value: extVersion */ - protected Map<String, String> lastVersion = null; + transient protected Map<String, String> lastVersion = null; public WikittyExtensionStorageJDBC() { this(null); @@ -257,7 +257,7 @@ String extName) { if (lastVersion == null) { // create cache for futur call - lastVersion = new HashMap<String, String>(); + Map<String, String> tmp = new HashMap<String, String>(); Connection connection = getConnection(conf); try { Statement statement = connection.createStatement(); @@ -275,6 +275,7 @@ lastVersion.put(name, version); } } + lastVersion = tmp; } catch (SQLException eee) { throw new WikittyException(eee); } finally {

1 0

r437 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Oct. 20, 2010

Oct. 20, 2010

Author: bpoussin Date: 2010-10-20 16:20:55 +0200 (Wed, 20 Oct 2010) New Revision: 437 Url: http://nuiton.org/repositories/revision/wikitty/437 Log: amelioreation du test pour verifier que le parsing se passe bien Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java 2010-10-20 14:16:17 UTC (rev 436) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java 2010-10-20 14:20:55 UTC (rev 437) @@ -30,11 +30,13 @@ WikittyExtension ext = label.getWikitty().getExtension(WikittyLabel.EXT_WIKITTYLABEL); + // recuperation de support i18n pour l'extension WikittyLabel WikittyI18n i18n = WikittyI18nUtil.getI18n(proxy, ext); + + // ajout d'une traduction pour le francais i18n.setTranslation("fr", WikittyLabel.FIELD_WIKITTYLABEL_LABELS, "étiquette"); proxy.store(i18n); - // ajout d'une traduction pour le francais String trad = i18n.getTranslation("fr", WikittyLabel.FIELD_WIKITTYLABEL_LABELS); Assert.assertEquals("étiquette", trad); Assert.assertEquals(1, i18n.getLang().size()); @@ -46,7 +48,12 @@ Assert.assertEquals(2, i18n.getLang().size()); - System.out.println(i18n.getTranslations()); + // on force le vidage du cache pour voir si le parsing se passe bien + ((WikittyI18nImpl)i18n).translationsCache = null; + trad = i18n.getTranslation("fr", WikittyLabel.FIELD_WIKITTYLABEL_LABELS); + Assert.assertEquals("étiquette", trad); + +// System.out.println(i18n.getTranslations()); } }

1 0

r436 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/notification
by bpoussin＠users.nuiton.org Oct. 20, 2010

Oct. 20, 2010

Author: bpoussin Date: 2010-10-20 16:16:17 +0200 (Wed, 20 Oct 2010) New Revision: 436 Url: http://nuiton.org/repositories/revision/wikitty/436 Log: modification pour que le test fonctionne "toujours". Il y a un petit probleme de synchro de thread mais le probleme ne peut apparaitre que dans les tests (fonctionnalite de synchro non utilise dans un vrai developpement). Donc pour l'instant un petit sleep suffira :) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-20 14:14:33 UTC (rev 435) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-20 14:16:17 UTC (rev 436) @@ -638,16 +638,21 @@ /** * thread that want wait for particulare event to be processed, can be - * call this method with event time in argument. + * call this method with event time in argument. Used only in unit test + * but this is necessary for test. */ public void waitFor(long eventTime) throws InterruptedException { - if (eventTime <= lastEventTime) { - // le thread demande a attendre un event deja passe - // on le met donc pas en attente - return; - } Object mutex = null; + sleep(1); // sleep 1 millis to prevent problem with 2 events in same millis synchronized (waiter) { + if (eventTime <= lastEventTime) { + // le thread demande a attendre un event deja passe + // on le met donc pas en attente + if (log.isDebugEnabled()) { + log.debug("event deja passe " + eventTime + " <= " + lastEventTime); + } + return; + } mutex = waiter.get(eventTime); if (mutex == null) { mutex = new Object(); @@ -700,6 +705,9 @@ log.error("Can't notify listener", eee); } synchronized (waiter) { + // on met a jour l'heure du dernier event envoye + lastEventTime = event.getTime(); + // on previent les threads en attente si besoin // dans un premier temps on ne recupere que ceux @@ -734,7 +742,6 @@ } } } - lastEventTime = event.getTime(); } } catch (InterruptedException eee) { log.error("Notification thread error", eee); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java 2010-10-20 14:14:33 UTC (rev 435) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java 2010-10-20 14:16:17 UTC (rev 436) @@ -103,8 +103,8 @@ wsn.processRemoteEvent(event); wsn.getEventThread().waitFor(event.getTime()); if (hasListener) { - Assert.assertEquals(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION, - lastEvent); + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION, + lastEvent); } else { Assert.assertEquals(null, lastEvent); }

1 0

r435 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty main/xmi test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Oct. 20, 2010

Oct. 20, 2010

Author: bpoussin Date: 2010-10-20 16:14:33 +0200 (Wed, 20 Oct 2010) New Revision: 435 Url: http://nuiton.org/repositories/revision/wikitty/435 Log: Ajout du support i18n pour les extensions, et d'un debut de test unitaire http://www.nuiton.org/issues/show/756 Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nImpl.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nImpl.java 2010-10-20 14:14:33 UTC (rev 435) @@ -0,0 +1,217 @@ +package org.nuiton.wikitty; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.StringUtil; + +/** + * WikittyI18n permet de gerer les traductions des champs des extensions. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyI18nImpl extends WikittyI18nAbstract + implements PropertyChangeListener { + + private static final long serialVersionUID = 3824481585361443459L; + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyI18nImpl.class); + + /** contient les translations sous une forme plus simple a utiliser */ + transient protected Map<String, Map<String, String>> translationsCache = null; + + /** + * WikittyI18nImpl : + */ + public WikittyI18nImpl() { + super(); + } + + /** + * WikittyI18nImpl : + * @param wikitty + */ + public WikittyI18nImpl(Wikitty wikitty) { + super(wikitty); + } + + /** + * WikittyI18nImpl : + * @param businessEntityWikitty + */ + public WikittyI18nImpl(BusinessEntityWikitty businessEntityWikitty) { + super(businessEntityWikitty.getWikitty()); + } + + /** + * WikittyAuthorisationImpl : + * @param extension + * @param wikitty + */ + + public WikittyI18nImpl(WikittyExtension extension, Wikitty wikitty) { + this(wikitty); + setExtensionForMetaExtension(extension); + } + + /** + * On surcharge la methode pour se mettre listener des modifications de + * translation pour pouvoir vider le cache de translation + * @param wikitty + */ + @Override + public void setWikitty(Wikitty wikitty) { + if (this.wikitty != null) { + this.wikitty.removePropertyChangeListener( + FQ_FIELD_WIKITTYI18N_TRANSLATIONS, this); + } + super.setWikitty(wikitty); + if (this.wikitty != null) { + this.wikitty.addPropertyChangeListener( + FQ_FIELD_WIKITTYI18N_TRANSLATIONS, this); + } + } + + /** + * Retourne la translation pour un champs donne pour une lang donnee + * @param lang la langue souhaitee (ex: fr) + * @param field le champs souhaite (ex: name) + * @return la traduction + */ + public String getTranslation(String lang, String field) { + parseAndCacheTranslations(); + + String result = null; + Map<String, String> l = translationsCache.get(lang); + if (l != null) { + result = l.get(field); + } + + if (result == null) { + // no translation for this field, default return field in parameter + result = field; + } + return result; + } + + /** + * Modifie la traduction d'un champs + * @param lang + * @param field + * @param trad + */ + public void setTranslation(String lang, String field, String trad) { + parseAndCacheTranslations(); + putInTranslationCache(lang, field, trad); + // on sauve temporairement le cache, car il va etre supprime + // suite au setTranslations, vu qu'il est a jour se serait dommage de + // devoir le reconstruire + Map<String, Map<String, String>> tmp = translationsCache; + String trans = convertToString(tmp); + setTranslations(trans); + // remet le cache sauvegarde en place + translationsCache = tmp; + + // on indique que la lang a des traductions si besoin + if (getLang() == null || !getLang().contains(lang)) { + addLang(lang); + } + } + + /** + * Parse les traductions et le met en cache + * + * Translations est de la forme: + * [fr:"name"="nom","firstname"="prenom"],[en:"name="name","firstname"="firstname"] + */ + protected void parseAndCacheTranslations() { + if (translationsCache == null) { + String trans = getTranslations(); + String[] langsFields = StringUtil.split(trans, ","); + for (String langFields : langsFields) { + // suppression des [ ] + langFields = langFields.substring(1, langFields.length() - 1); + int colonPos = langFields.indexOf(":"); + // recuperation de la langue + String lang = langFields.substring(0, colonPos); + langFields = langFields.substring(colonPos + 1); + String[] fields = StringUtil.split(langFields, ","); + for (String field : fields) { + String[] fieldNameAndTrad = StringUtil.split(field, "="); + String fieldName = fieldNameAndTrad[0]; + String fieldTrad = fieldNameAndTrad[1]; + + // suppression des " + fieldName = fieldName.substring(1, fieldName.length() - 1); + fieldTrad = fieldTrad.substring(1, fieldTrad.length() - 1); + putInTranslationCache(lang, fieldName, fieldTrad); + } + } + } + } + + /** + * met un traduction en plus dans le cache + * @param lang + * @param field + * @param trans + */ + protected void putInTranslationCache(String lang, String field, String trans) { + if (translationsCache == null) { + translationsCache = new HashMap<String, Map<String, String>>(); + } + Map<String, String> l = translationsCache.get(lang); + if (l == null) { + l = new HashMap<String, String>(); + translationsCache.put(lang, l); + } + l.put(field, trans); + } + + /** + * converti le cache dans une representation string + * @param trans + * @return + */ + protected String convertToString(Map<String, Map<String, String>> trans) { + StringBuilder result = new StringBuilder(); + for (Map.Entry<String, Map<String, String>> l : trans.entrySet()) { + String lang = l.getKey(); + result.append("[" + lang + ":"); + for(Map.Entry<String, String> t : l.getValue().entrySet()) { + result.append("\"" + t.getKey() + "\"=\"" + t.getValue() + "\","); + } + // suppression de la derniere , + if (result.charAt(result.length() - 1) == ',') { + result.deleteCharAt(result.length() - 1); + } + result.append("],"); + } + if (result.charAt(result.length() - 1) == ',') { + result.deleteCharAt(result.length() - 1); + } + return result.toString(); + } + + /** + * Ecoute les events pour devalider le cache + * @param evt + */ + @Override + public void propertyChange(PropertyChangeEvent evt) { + String propName = evt.getPropertyName(); + if (FQ_FIELD_WIKITTYI18N_TRANSLATIONS.equals(propName)) { + // la valeur a change on vide le cache + translationsCache = null; + } + } + +} //WikittyI18nImpl Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nUtil.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nUtil.java 2010-10-20 14:14:33 UTC (rev 435) @@ -0,0 +1,44 @@ +package org.nuiton.wikitty; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * + * Cette classe sert a aider a la gestion multi-langue des extensions + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyI18nUtil { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyI18nUtil.class); + + /** + * Create or load WikittyExtensionTranslation for given extension. + * If created you must call store if you want keep it in storage + * @param proxy + * @param extension + * @return + */ + static public WikittyI18n getI18n(WikittyProxy proxy, WikittyExtension extension) { + String id = WikittyMetaExtensionUtil.generateId( + WikittyI18n.EXT_WIKITTYI18N, + extension.getName()); + + WikittyI18n result; + Wikitty w = proxy.restore(id); + if (w == null) { + w = new WikittyImpl(id); + } + result = new WikittyI18nImpl(w); + + return result; + } + +} Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo =================================================================== (Binary files differ) Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java 2010-10-20 14:14:33 UTC (rev 435) @@ -0,0 +1,52 @@ +package org.nuiton.wikitty; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyI18nTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyI18nTest.class); + + @Test + public void testI18n() throws Exception { + // creation d'un proxy sur un ws in memory + WikittyService ws = new WikittyServiceInMemory(); + WikittyProxy proxy = new WikittyProxy(ws); + + // creation d'un label pour l'utiliser pour l'i18n + WikittyLabel label = new WikittyLabelImpl(); + WikittyExtension ext = + label.getWikitty().getExtension(WikittyLabel.EXT_WIKITTYLABEL); + + WikittyI18n i18n = WikittyI18nUtil.getI18n(proxy, ext); + i18n.setTranslation("fr", WikittyLabel.FIELD_WIKITTYLABEL_LABELS, "étiquette"); + proxy.store(i18n); + + // ajout d'une traduction pour le francais + String trad = i18n.getTranslation("fr", WikittyLabel.FIELD_WIKITTYLABEL_LABELS); + Assert.assertEquals("étiquette", trad); + Assert.assertEquals(1, i18n.getLang().size()); + Assert.assertEquals("fr", i18n.getLang().iterator().next()); + Assert.assertEquals("[fr:\"labels\"=\"étiquette\"]", i18n.getTranslations()); + + // ajout d'une traduction pour l'espagnole + i18n.setTranslation("es", WikittyLabel.FIELD_WIKITTYLABEL_LABELS, "etiqueta"); + + Assert.assertEquals(2, i18n.getLang().size()); + + System.out.println(i18n.getTranslations()); + } + +}

1 0