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

r16 - trunk/wikitty-api/src/main/java/org/sharengo/wikitty
by echatellier＠users.nuiton.org April 23, 2010

April 23, 2010

Author: echatellier Date: 2010-04-23 11:18:34 +0200 (Fri, 23 Apr 2010) New Revision: 16 Log: Requires can be null. Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java 2010-04-23 09:15:00 UTC (rev 15) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java 2010-04-23 09:18:34 UTC (rev 16) @@ -19,6 +19,8 @@ import java.util.Collection; import java.util.Set; + +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,9 +50,11 @@ // manage requires before current String requires = newExt.getRequires(); - for (String require : requires.split(",")) { - WikittyExtension newRequireExt = service.restoreExtensionLastVersion(require); - addExtension(service, wikitty, newRequireExt); + if (StringUtils.isNotEmpty(requires)) { + for (String require : requires.split(",")) { + WikittyExtension newRequireExt = service.restoreExtensionLastVersion(require); + addExtension(service, wikitty, newRequireExt); + } } // add current extension

1 0

r15 - in trunk: . wikitty-api wikitty-generators wikitty-hbase-impl wikitty-jdbc-impl wikitty-jms-impl wikitty-jpa-impl wikitty-multistorage-impl wikitty-solr-impl wikitty-ui-gwt
by tchemit＠users.nuiton.org April 23, 2010

April 23, 2010

Author: tchemit Date: 2010-04-23 11:15:00 +0200 (Fri, 23 Apr 2010) New Revision: 15 Log: wikitty uses our mavenpom + remove regisn-hessain dependancy Added: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/wikitty-api/LICENSE.txt trunk/wikitty-api/README.txt trunk/wikitty-api/changelog.txt trunk/wikitty-generators/LICENSE.txt trunk/wikitty-generators/README.txt trunk/wikitty-generators/changelog.txt trunk/wikitty-hbase-impl/LICENSE.txt trunk/wikitty-hbase-impl/README.txt trunk/wikitty-hbase-impl/changelog.txt trunk/wikitty-jdbc-impl/LICENSE.txt trunk/wikitty-jdbc-impl/README.txt trunk/wikitty-jdbc-impl/changelog.txt trunk/wikitty-jms-impl/LICENSE.txt trunk/wikitty-jms-impl/README.txt trunk/wikitty-jms-impl/changelog.txt trunk/wikitty-jpa-impl/LICENSE.txt trunk/wikitty-jpa-impl/README.txt trunk/wikitty-jpa-impl/changelog.txt trunk/wikitty-multistorage-impl/LICENSE.txt trunk/wikitty-multistorage-impl/README.txt trunk/wikitty-multistorage-impl/changelog.txt trunk/wikitty-solr-impl/LICENSE.txt trunk/wikitty-solr-impl/README.txt trunk/wikitty-solr-impl/changelog.txt trunk/wikitty-ui-gwt/LICENSE.txt trunk/wikitty-ui-gwt/README.txt trunk/wikitty-ui-gwt/changelog.txt Modified: trunk/pom.xml trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-jdbc-impl/pom.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-23 07:45:07 UTC (rev 14) +++ trunk/pom.xml 2010-04-23 09:15:00 UTC (rev 15) @@ -24,15 +24,79 @@ </modules> <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.1.2</version> +  </parent> - <dependencyManagement> - </dependencyManagement> +<dependencyManagement> + <dependencies> - <distributionManagement> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>com.caucho</groupId> + <artifactId>resin-hessian</artifactId> + <version>${hessian.version}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwt.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <classifier>${gwtplatform}-libs</classifier> + <type>zip</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <classifier>${gwtplatform}</classifier> + <scope>provided</scope> + </dependency> + + </dependencies> + + </dependencyManagement> + +   <scm> @@ -73,9 +137,17 @@ <properties>  - <projectId>core-wikitty</projectId> - <platform>nuiton.org</platform> +  +  <projectId>wikitty</projectId> + +  + <gwt.version>1.7.0</gwt.version> + <junit.version>4.7</junit.version> + <spring.version>3.0.1.RELEASE</spring.version> + <hessian.version>3.1.6</hessian.version> + <jetty.version>6.1.22</jetty.version> + </properties> <build> @@ -85,7 +157,7 @@   - <repositories> +  </project> Property changes on: trunk/wikitty-api/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-04-23 07:45:07 UTC (rev 14) +++ trunk/wikitty-hbase-impl/pom.xml 2010-04-23 09:15:00 UTC (rev 15) @@ -61,10 +61,10 @@ <scope>compile</scope> </dependency> - <dependency> +  <dependency> <groupId>org.mortbay.jetty</groupId> Property changes on: trunk/wikitty-jdbc-impl/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-04-23 07:45:07 UTC (rev 14) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-04-23 09:15:00 UTC (rev 15) @@ -55,10 +55,10 @@ <version>${project.version}</version> </dependency> - <dependency> +  <dependency> <groupId>org.mortbay.jetty</groupId> Property changes on: trunk/wikitty-jms-impl/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/README.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/changelog.txt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r14 - trunk/src/site/rst
by jcouteau＠users.nuiton.org April 23, 2010

April 23, 2010

Author: jcouteau Date: 2010-04-23 09:45:07 +0200 (Fri, 23 Apr 2010) New Revision: 14 Log: Add doc about migration Added: trunk/src/site/rst/migration.rst Added: trunk/src/site/rst/migration.rst =================================================================== --- trunk/src/site/rst/migration.rst (rev 0) +++ trunk/src/site/rst/migration.rst 2010-04-23 07:45:07 UTC (rev 14) @@ -0,0 +1,34 @@ +Manage data migration using Wikitty +----------------------------------- + +Presentation +============ + +In Wikitty, migration is done each time you load an object. If an object is +present in the database in an old version, when it is loaded from the database, +it is automatically migrated to the new version. This way, you avoid costly +migration at initialisation. + +The only thing to bear in mind is that data which was not migrated is still +indexed in the old version and might not be returned by requests. If you need +the data to be indexed on the new version, you still can migrate all your +objects at initialisation by loading all the objects and store them. + +How migrate data properly in Wikitty +==================================== + +After your application launch and before any request, you should store all the +extensions needed by your application, in their last version. +Then you need to add to the registry all the specific migrations for extensions. + +You can now use your data properly, they will be migrated at loading time. + +If you want to migrate objects before using them (for requests purpose for +example), for each version, search all you objects, restore and then store +them:: + + search(Client) + restore(Client) + store(Client) + +Take care to the cost of the indexation compared to the data volume.

1 0

r13 - trunk/wikitty-api/src/main/java/org/sharengo/wikitty
by echatellier＠users.nuiton.org April 22, 2010

April 22, 2010

Author: echatellier Date: 2010-04-22 18:01:46 +0200 (Thu, 22 Apr 2010) New Revision: 13 Log: Fix extension migration (manage extension order changes) Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-04-22 09:07:59 UTC (rev 12) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-04-22 16:01:46 UTC (rev 13) @@ -409,7 +409,7 @@ // Test if extension is never use in this version if(nextExtension != null) { - result = migration.migrate(result, currentExtension, nextExtension); + result = migration.migrate(this, result, currentExtension, nextExtension); currentExtension = nextExtension; } Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java 2010-04-22 09:07:59 UTC (rev 12) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java 2010-04-22 16:01:46 UTC (rev 13) @@ -42,7 +42,9 @@ new HashMap<String, WikittyExtensionMigration>(); /** - * Migrate wikitty data from oldExt version to newExt + * Migrate wikitty data from oldExt version to newExt. + * + * @param service Wikitty service that do migration * @param wikitty Wikitty object that contains data in old version * extension format * @param oldExt old extension definition @@ -50,7 +52,7 @@ * @return same wikitty as argument if nothing to do, or new wikitty * if some modification is done */ - public Wikitty migrate(Wikitty wikitty, + public Wikitty migrate(WikittyService service, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt); } Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java 2010-04-22 09:07:59 UTC (rev 12) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java 2010-04-22 16:01:46 UTC (rev 13) @@ -17,9 +17,7 @@ package org.sharengo.wikitty; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,6 +27,8 @@ * rename, not creation a new field, you should use tag value "renameFrom" with * name of use in before extension. * + * Since 1.5, this class also take care about extension order. + * * @author ruchaud */ public class WikittyExtensionMigrationRename implements WikittyExtensionMigration { @@ -37,8 +37,28 @@ public static String TAG_RENAME = "renameFrom"; + /** + * Recursively add extension with requires ones (orderer). + * + * @param service service + * @param wikitty wikitty to add extension to + * @param newExt extension to add + */ + protected void addExtension(WikittyService service, Wikitty wikitty, WikittyExtension newExt) { + + // manage requires before current + String requires = newExt.getRequires(); + for (String require : requires.split(",")) { + WikittyExtension newRequireExt = service.restoreExtensionLastVersion(require); + addExtension(service, wikitty, newRequireExt); + } + + // add current extension + wikitty.addExtension(newExt); + } + @Override - public Wikitty migrate(Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { + public Wikitty migrate(WikittyService service, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { String wikittyId = wikitty.getId(); String wikittyVersion = wikitty.getVersion(); @@ -47,10 +67,11 @@ result.setVersion(wikittyVersion); // Add all extension and replace old by the new - List<WikittyExtension> extensions = - new ArrayList<WikittyExtension>(wikitty.getExtensions()); - result.addExtension(extensions); - result.addExtension(newExt); + for (WikittyExtension extension : wikitty.getExtensions()) { + // add one by one to manage require + addExtension(service, result, extension); + } + addExtension(service, result, newExt); // Copy other values Set<String> fqFieldNames = wikitty.fieldNames();

1 0

r12 - trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator
by echatellier＠users.nuiton.org April 22, 2010

April 22, 2010

Author: echatellier Date: 2010-04-22 11:07:59 +0200 (Thu, 22 Apr 2010) New Revision: 12 Log: Use dotted default version Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-21 14:26:13 UTC (rev 11) +++ trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-22 09:07:59 UTC (rev 12) @@ -165,8 +165,10 @@ private void generateWikittyExtension(Writer output, ObjectModelClass clazz) throws IOException { String version = clazz.getTagValue("version"); + + // Since wikitty 1.3, version need to be dotted if ( version == null ) { - version = "1"; + version = "1.0"; } // get requires from parent

1 0

r11 - trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator
by echatellier＠users.nuiton.org April 21, 2010

April 21, 2010

Author: echatellier Date: 2010-04-21 16:26:13 +0200 (Wed, 21 Apr 2010) New Revision: 11 Log: Add fixme about generics in model, generation result is not compilable Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-20 15:58:51 UTC (rev 10) +++ trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-21 14:26:13 UTC (rev 11) @@ -215,6 +215,8 @@ } /*{ // EC-20100420 add current extension after parent ones + // if current is loaded before required extension + // load failed because required extension is missing exts.add(extension<%=clazz.getName()%>); extensions = Collections.unmodifiableList(exts); @@ -305,6 +307,9 @@ return; } + // FIXME EC-20100421 cette methode peut retourner List<String> + // et generer la methode getWikitty().getFieldAsList<String>() + // qui ne peut pas compiler String methodAccessName = getFieldAccessMethodName(attr); String attrName = attr.getName();

1 0

r10 - trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator
by echatellier＠users.nuiton.org April 20, 2010

April 20, 2010

Author: echatellier Date: 2010-04-20 17:58:51 +0200 (Tue, 20 Apr 2010) New Revision: 10 Log: Add generation fixme about non working unique attributes Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-20 15:41:47 UTC (rev 9) +++ trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-20 15:58:51 UTC (rev 10) @@ -263,6 +263,8 @@ } } + // FIXME EC-20100420 attr.isUnique() always return true for + // attributes (maybe use tagValue instead) String unique = attr.isUnique() ? " unique" : ""; String tagValues = "";

1 0

r9 - trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator
by echatellier＠users.nuiton.org April 20, 2010

April 20, 2010

Author: echatellier Date: 2010-04-20 17:41:47 +0200 (Tue, 20 Apr 2010) New Revision: 9 Log: Add generation fixme about non working multiples requires. Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-20 15:41:03 UTC (rev 8) +++ trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-20 15:41:47 UTC (rev 9) @@ -182,7 +182,8 @@ requires += separator + parent.getName() + "." + parentExtName; // dans le cas où on aurait un heritage multiple :) - separator = " + \",\" + "; + // FIXME EC-20100420 gerer les extensions multiples + separator = " + \",\" /* FIXME Multiples extentions are not yet supported */ + "; } }

1 0

r8 - trunk/wikitty-api/src/main/java/org/sharengo/wikitty
by echatellier＠users.nuiton.org April 20, 2010

April 20, 2010

Author: echatellier Date: 2010-04-20 17:41:03 +0200 (Tue, 20 Apr 2010) New Revision: 8 Log: Add javadoc about non working multiples requires. Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java Modified: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java 2010-04-20 15:12:05 UTC (rev 7) +++ trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java 2010-04-20 15:41:03 UTC (rev 8) @@ -43,11 +43,16 @@ private static final long serialVersionUID = 1L; /** - * name of this extension + * Name of this extension. */ protected String name; + /** - * name of other extension needed to put this extension to object + * Name of other extension needed to put this extension to object. + * + * Warning : Multiples extensions are not supported yet. + * + * FIXME EC-20100420 multiples extensions need to work */ protected String requires;

1 0

r7 - trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator
by echatellier＠users.nuiton.org April 20, 2010

April 20, 2010

Author: echatellier Date: 2010-04-20 17:12:05 +0200 (Tue, 20 Apr 2010) New Revision: 7 Log: Fix requires generation on wikitty. Also fix extensions list order. Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityBeanGenerator.java trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityInterfaceGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityBeanGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityBeanGenerator.java 2010-04-20 10:05:45 UTC (rev 6) +++ trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityBeanGenerator.java 2010-04-20 15:12:05 UTC (rev 7) @@ -107,7 +107,7 @@ super(); } - }*/ +}*/ if (generatePropertyChangeListener) { /*{ protected transient PropertyChangeSupport propertyChange = new PropertyChangeSupport(this); @@ -196,7 +196,7 @@ String attrName = EXT_NAME + "$" + attr.getName(); /*{ public <%=attrType%> <%=attrName%>; - }*/ +}*/ } private void generateWikittyAttributeAccessors(Writer output, Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-20 10:05:45 UTC (rev 6) +++ trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityGenerator.java 2010-04-20 15:12:05 UTC (rev 7) @@ -168,13 +168,30 @@ if ( version == null ) { version = "1"; } -/*{ - static final public List<WikittyExtension> extensions; + + // get requires from parent + String requires = null; + String separator = ""; + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + String parentExtName = "EXT_" + parent.getName().toUpperCase(); + + if (requires == null) { + requires = ""; + } + + requires += separator + parent.getName() + "." + parentExtName; + // dans le cas où on aurait un heritage multiple :) + separator = " + \",\" + "; + } + } + +/*{ static final protected List<WikittyExtension> extensions; static final public WikittyExtension extension<%=clazz.getName()%> = - new WikittyExtension(<%=EXT_NAME%>, "<%=version%>", null, + new WikittyExtension(<%=EXT_NAME%>, "<%=version%>", <%=requires%>, WikittyUtil.buildFieldMapExtension(}*/ - String separator = ""; + separator = ""; for (ObjectModelAttribute attr : clazz.getAttributes()) { if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { @@ -187,18 +204,21 @@ /*{)); static { ArrayList<WikittyExtension> exts = new ArrayList<WikittyExtension>(); - exts.add(extension<%=clazz.getName()%>); }*/ for (ObjectModelClass parent : clazz.getSuperclasses()) { if (EugengoUtils.isBusinessEntity(parent)) { /*{ - exts.addAll(<%=parent.getName()%>Impl.extensions);}*/ + exts.addAll(<%=parent.getName()%>Impl.extensions); +}*/ } } /*{ + // EC-20100420 add current extension after parent ones + exts.add(extension<%=clazz.getName()%>); + extensions = Collections.unmodifiableList(exts); } - }*/ +}*/ } private void generateAttribute(Writer output, ObjectModelAttribute attr) @@ -213,7 +233,7 @@ String attrName = attr.getName(); String card = ""; - //TODO ymartel 20090812: a better way to manage those DataTypes in the model? + //TODO ymartel 20090812: a better way to manage those DataTypes in the model? if (attrType.contains("Collection") || attrType.contains("List") || attrType.contains("Set")) { card = "[0-*]"; // List<String> Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityInterfaceGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-04-20 10:05:45 UTC (rev 6) +++ trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-04-20 15:12:05 UTC (rev 7) @@ -66,7 +66,7 @@ /*{public interface <%=name%> <%=extendsString%> { - static final public String <%=EXT_NAME%> = "<%=clazz.getName()%>"; + static final public String <%=EXT_NAME%> = "<%=clazz.getName()%>"; }*/ generateFieldNameConstant(output, clazz);

1 0