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

r680 - in tags: . wikitty-3.0.2
by sletellier＠users.nuiton.org 10 Jan '11

10 Jan '11

Author: sletellier Date: 2011-01-10 22:32:39 +0100 (Mon, 10 Jan 2011) New Revision: 680 Url: http://nuiton.org/repositories/revision/wikitty/680 Log: [maven-release-plugin] copy for tag wikitty-3.0.2 Added: tags/wikitty-3.0.2/ Property changes on: tags/wikitty-3.0.2 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r679 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-perf-test wikitty-publication wikitty-solr-impl
by sletellier＠users.nuiton.org 10 Jan '11

10 Jan '11

Author: sletellier Date: 2011-01-10 22:32:36 +0100 (Mon, 10 Jan 2011) New Revision: 679 Url: http://nuiton.org/repositories/revision/wikitty/679 Log: [maven-release-plugin] prepare release wikitty-3.0.2 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> <modules> @@ -353,10 +353,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.0.2</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-api/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-dto/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-generators/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-hessian-client/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-hessian-server/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-jdbc-impl/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-perf-test/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-publication/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent>  Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2011-01-10 21:25:07 UTC (rev 678) +++ trunk/wikitty-solr-impl/pom.xml 2011-01-10 21:32:36 UTC (rev 679) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent>

1 0

r678 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/services test/java/org/nuiton/wikitty/services
by sletellier＠users.nuiton.org 10 Jan '11

10 Jan '11

Author: sletellier Date: 2011-01-10 22:25:07 +0100 (Mon, 10 Jan 2011) New Revision: 678 Url: http://nuiton.org/repositories/revision/wikitty/678 Log: Update headers Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java 2011-01-10 21:18:50 UTC (rev 677) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java 2011-01-10 21:25:07 UTC (rev 678) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.services; import java.util.Set; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2011-01-10 21:18:50 UTC (rev 677) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2011-01-10 21:25:07 UTC (rev 678) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.services;

1 0

r677 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/services test/java/org/nuiton/wikitty/services
by sletellier＠users.nuiton.org 10 Jan '11

10 Jan '11

Author: sletellier Date: 2011-01-10 22:18:50 +0100 (Mon, 10 Jan 2011) New Revision: 677 Url: http://nuiton.org/repositories/revision/wikitty/677 Log: Add svn keywords Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r676 - in trunk/wikitty-dto/src: main/java/org/nuiton/wikitty/dto test/java/org/nuiton/wikitty/dto
by jcouteau＠users.nuiton.org 03 Jan '11

03 Jan '11

Author: jcouteau Date: 2011-01-03 17:01:30 +0100 (Mon, 03 Jan 2011) New Revision: 676 Url: http://nuiton.org/repositories/revision/wikitty/676 Log: Allow to transform from to dto to wikitty something that have not been stored in database previously Modified: trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java Modified: trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java =================================================================== --- trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java 2011-01-03 14:05:10 UTC (rev 675) +++ trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java 2011-01-03 16:01:30 UTC (rev 676) @@ -28,7 +28,10 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ObjectUtil; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; /** * User: couteau @@ -59,7 +62,22 @@ public static <E extends BusinessEntity> E fromDto(WikittyProxy proxy, Class<E> clazz, E dto) { E result = proxy.restore(clazz, dto.getWikittyId()); - result.copyFrom(dto); + + if (result == null){ + try { + String wikittyId = dto.getWikittyId(); + Wikitty wikitty = new WikittyImpl(wikittyId); + result = WikittyUtil.newInstance( proxy.getSecurityToken(), + proxy.getWikittyService(), clazz, wikitty); + } catch (Exception eee) { + log.error("Could not transform DTO to Wikitty", eee); + } + } + + if (result != null) { + result.copyFrom(dto); + } + return result; } Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2011-01-03 14:05:10 UTC (rev 675) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2011-01-03 16:01:30 UTC (rev 676) @@ -60,9 +60,6 @@ WikittyLabel label = new WikittyLabelImpl(); label.addLabels("Test"); - //store entity - label = proxy.store(label); - //make conversion WikittyLabel dto = DTOHelper.toDto(label);

1 0

r675 - trunk/src/site/rst
by jcouteau＠users.nuiton.org 03 Jan '11

03 Jan '11

Author: jcouteau Date: 2011-01-03 15:05:10 +0100 (Mon, 03 Jan 2011) New Revision: 675 Url: http://nuiton.org/repositories/revision/wikitty/675 Log: Improve migration doc Modified: trunk/src/site/rst/migration.rst Modified: trunk/src/site/rst/migration.rst =================================================================== --- trunk/src/site/rst/migration.rst 2010-12-29 17:54:20 UTC (rev 674) +++ trunk/src/site/rst/migration.rst 2011-01-03 14:05:10 UTC (rev 675) @@ -50,9 +50,13 @@ store(myExtension); -Ensuite, vous devez ajouter au registre toutes les migrations spécifiques des -extensions:: +ou:: + store(myEntityImpl.extensionMyEntity) + +Si vous avez des migrations spécifiques à effectuer, ajoutez au registre toutes +les migrations spécifiques des extensions:: + WikittyExtensionMigration.migrationRegistry.put("myExtension", myMigrationClass); Vous pouvez maintenant utiliser vos données simplement, elles seront migrées

1 0