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

r378 - in trunk: . wikitty-api wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-solr-impl wikitty-ui-zk
by echatellier＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: echatellier Date: 2010-09-30 18:12:44 +0200 (Thu, 30 Sep 2010) New Revision: 378 Url: http://nuiton.org/repositories/revision/wikitty/378 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/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-solr-impl/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-30 16:12:33 UTC (rev 377) +++ trunk/pom.xml 2010-09-30 16:12:44 UTC (rev 378) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> <modules> @@ -307,10 +307,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-2.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-2.2 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-2.2</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-09-30 16:12:33 UTC (rev 377) +++ trunk/wikitty-api/pom.xml 2010-09-30 16:12:44 UTC (rev 378) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-09-30 16:12:33 UTC (rev 377) +++ trunk/wikitty-generators/pom.xml 2010-09-30 16:12:44 UTC (rev 378) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-09-30 16:12:33 UTC (rev 377) +++ trunk/wikitty-hessian-client/pom.xml 2010-09-30 16:12:44 UTC (rev 378) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-09-30 16:12:33 UTC (rev 377) +++ trunk/wikitty-hessian-server/pom.xml 2010-09-30 16:12:44 UTC (rev 378) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-09-30 16:12:33 UTC (rev 377) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-09-30 16:12:44 UTC (rev 378) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-09-30 16:12:33 UTC (rev 377) +++ trunk/wikitty-solr-impl/pom.xml 2010-09-30 16:12:44 UTC (rev 378) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-09-30 16:12:33 UTC (rev 377) +++ trunk/wikitty-ui-zk/pom.xml 2010-09-30 16:12:44 UTC (rev 378) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent>

1 0

r377 - in tags: . wikitty-2.2
by echatellier＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: echatellier Date: 2010-09-30 18:12:33 +0200 (Thu, 30 Sep 2010) New Revision: 377 Url: http://nuiton.org/repositories/revision/wikitty/377 Log: [maven-release-plugin] copy for tag wikitty-2.2 Added: tags/wikitty-2.2/ Property changes on: tags/wikitty-2.2 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r376 - in trunk: . wikitty-api wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-solr-impl wikitty-ui-zk
by echatellier＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: echatellier Date: 2010-09-30 18:12:30 +0200 (Thu, 30 Sep 2010) New Revision: 376 Url: http://nuiton.org/repositories/revision/wikitty/376 Log: [maven-release-plugin] prepare release wikitty-2.2 Modified: trunk/pom.xml trunk/wikitty-api/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-solr-impl/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-30 16:07:22 UTC (rev 375) +++ trunk/pom.xml 2010-09-30 16:12:30 UTC (rev 376) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2</version> <modules> @@ -307,10 +307,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-2.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-2.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-2.2</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-09-30 16:07:22 UTC (rev 375) +++ trunk/wikitty-api/pom.xml 2010-09-30 16:12:30 UTC (rev 376) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-09-30 16:07:22 UTC (rev 375) +++ trunk/wikitty-generators/pom.xml 2010-09-30 16:12:30 UTC (rev 376) @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-09-30 16:07:22 UTC (rev 375) +++ trunk/wikitty-hessian-client/pom.xml 2010-09-30 16:12:30 UTC (rev 376) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-09-30 16:07:22 UTC (rev 375) +++ trunk/wikitty-hessian-server/pom.xml 2010-09-30 16:12:30 UTC (rev 376) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-09-30 16:07:22 UTC (rev 375) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-09-30 16:12:30 UTC (rev 376) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-09-30 16:07:22 UTC (rev 375) +++ trunk/wikitty-solr-impl/pom.xml 2010-09-30 16:12:30 UTC (rev 376) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2</version> </parent>  Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-09-30 16:07:22 UTC (rev 375) +++ trunk/wikitty-ui-zk/pom.xml 2010-09-30 16:12:30 UTC (rev 376) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.2</version> </parent>

1 0

r375 - trunk
by echatellier＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: echatellier Date: 2010-09-30 18:07:22 +0200 (Thu, 30 Sep 2010) New Revision: 375 Url: http://nuiton.org/repositories/revision/wikitty/375 Log: Use eugene stable Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-30 14:19:00 UTC (rev 374) +++ trunk/pom.xml 2010-09-30 16:07:22 UTC (rev 375) @@ -446,7 +446,7 @@ <projectId>wikitty</projectId>  - <eugene.version>2.2-SNAPSHOT</eugene.version> + <eugene.version>2.2</eugene.version> <spring.version>3.0.1.RELEASE</spring.version> <jetty.version>6.1.22</jetty.version>

1 0

r374 - trunk/wikitty-ui-zk/src/license
by echatellier＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: echatellier Date: 2010-09-30 16:19:00 +0200 (Thu, 30 Sep 2010) New Revision: 374 Url: http://nuiton.org/repositories/revision/wikitty/374 Log: Remove unused license Modified: trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties Modified: trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties 2010-09-30 14:08:45 UTC (rev 373) +++ trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties 2010-09-30 14:19:00 UTC (rev 374) @@ -24,12 +24,8 @@ # # #Wed Jul 21 13:38:35 CEST 2010 -bouncycastle--bcmail-jdk14--136=http://www.bouncycastle.org/licence.html -com.experlog--xapool--1.5.0=Lesser General Public License (LGPL) v 3.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -eclipse--jdtcore--3.1.0=Eclipse Public License 1.0 (EPL) javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 -xml-apis--xml-apis--1.3.02=The Apache Software License, Version 2.0

1 0

r373 - in trunk: wikitty-api/src/license wikitty-hessian-client/src/license wikitty-hessian-server/src/license wikitty-jdbc-impl/src/license wikitty-solr-impl/src/license wikitty-ui-zk/src/license
by echatellier＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: echatellier Date: 2010-09-30 16:08:45 +0200 (Thu, 30 Sep 2010) New Revision: 373 Url: http://nuiton.org/repositories/revision/wikitty/373 Log: Fix project licenses Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-09-30 08:53:21 UTC (rev 372) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-09-30 14:08:45 UTC (rev 373) @@ -4,6 +4,7 @@ # - Apache 2 # - Apache Software License, version 1.1 # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 @@ -14,10 +15,10 @@ # Please fill the missing licenses for dependencies : # # -#Wed Jul 21 13:25:36 CEST 2010 +#Thu Sep 30 15:40:34 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 org.springframework--spring-aop--3.0.1.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-asm--3.0.1.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-beans--3.0.1.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2010-09-30 08:53:21 UTC (rev 372) +++ trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2010-09-30 14:08:45 UTC (rev 373) @@ -4,6 +4,7 @@ # - Apache 2 # - Apache Software License, version 1.1 # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 @@ -14,7 +15,7 @@ # Please fill the missing licenses for dependencies : # # -#Wed Jul 21 13:43:43 CEST 2010 +#Thu Sep 30 15:52:40 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 Modified: trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2010-09-30 08:53:21 UTC (rev 372) +++ trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2010-09-30 14:08:45 UTC (rev 373) @@ -23,5 +23,5 @@ commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 Modified: trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties 2010-09-30 08:53:21 UTC (rev 372) +++ trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties 2010-09-30 14:08:45 UTC (rev 373) @@ -25,7 +25,7 @@ commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 org.springframework--spring-aop--3.0.1.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-asm--3.0.1.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-beans--3.0.1.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties 2010-09-30 08:53:21 UTC (rev 372) +++ trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties 2010-09-30 14:08:45 UTC (rev 373) @@ -20,7 +20,7 @@ commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 org.springframework--spring-aop--3.0.1.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-asm--3.0.1.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-beans--3.0.1.RELEASE=The Apache Software License, Version 2.0 Modified: trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties 2010-09-30 08:53:21 UTC (rev 372) +++ trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties 2010-09-30 14:08:45 UTC (rev 373) @@ -30,6 +30,6 @@ eclipse--jdtcore--3.1.0=Eclipse Public License 1.0 (EPL) javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jgroups--jgroups--2.9.0.GA=Lesser General Public License (LGPL) v 3.0 +org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 xml-apis--xml-apis--1.3.02=The Apache Software License, Version 2.0

1 0

r372 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: bleny Date: 2010-09-30 10:53:21 +0200 (Thu, 30 Sep 2010) New Revision: 372 Url: http://nuiton.org/repositories/revision/wikitty/372 Log: bugfix Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-30 08:38:02 UTC (rev 371) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-30 08:53:21 UTC (rev 372) @@ -254,7 +254,7 @@ metaExtension.getName())); setOperationBody(hasMetaExtension, "" /*{ - wikitty.hasMetaExtension(<%=extensionVariableName%>, extension.getName()); + return wikitty.hasMetaExtension(<%=extensionVariableName%>, extension.getName()); }*/);

1 0

r371 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: bleny Date: 2010-09-30 10:38:02 +0200 (Thu, 30 Sep 2010) New Revision: 371 Url: http://nuiton.org/repositories/revision/wikitty/371 Log: add missing operations in Wikitty API for meta-extension Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-09-30 08:18:10 UTC (rev 370) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-09-30 08:38:02 UTC (rev 371) @@ -37,6 +37,15 @@ void addExtension(List<WikittyExtension> exts); /** + * check that the wikitty has a metaExtension about a given extension + * @param metaExtension the metaExtension to be checked + * @param extension an extension already added to the wikitty + * @since 2.2.0 + */ + boolean hasMetaExtension(String metaExtensionName, + String extensionName); + + /** * add a meta-extension about the given extension to this wikitty * @param metaExtension the metaExtension to add * @param extension an extension already added to the wikitty @@ -164,11 +173,19 @@ void setVersion(String version); /** + * get the field modified after wikitty was restored + * @return a set of fully qualified field names + * @since 2.2.0 + */ + Set<String> getDirty(); + + /** * Server only used * @param version */ void clearDirty(); + /** * Server only used * @param fieldName fqn (ex: extensionName.fieldName) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-09-30 08:18:10 UTC (rev 370) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-09-30 08:38:02 UTC (rev 371) @@ -265,11 +265,26 @@ target.setVersion(version); } + /** + * @see org.nuiton.wikitty.Wikitty#getDirty() + */ + public Set<String> getDirty() { + return target.getDirty(); + } + + /** + * @see org.nuiton.wikitty.Wikitty#clearDirty() + */ public void clearDirty() { + substituteTargetWithCopy(); target.clearDirty(); } + /** + * @see org.nuiton.wikitty.Wikitty#setFqField(String, Object) + */ public void setFqField(String fieldName, Object value) { + substituteTargetWithCopy(); target.setFqField(fieldName, value); } @@ -278,6 +293,15 @@ } /** + * @see org.nuiton.wikitty.Wikitty#hasMetaExtension(String, String) + */ + @Override + public boolean hasMetaExtension(String metaExtensionName, + String extensionName) { + return target.hasMetaExtension(metaExtensionName, extensionName); + } + + /** * @see org.nuiton.wikitty.Wikitty#addMetaExtension(WikittyExtension, WikittyExtension) */ @Override Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-09-30 08:18:10 UTC (rev 370) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-09-30 08:38:02 UTC (rev 371) @@ -208,6 +208,19 @@ } extensions.put(ext.name, ext); } + + /** + * @see org.nuiton.wikitty.Wikitty#hasMetaExtension(String, String) + */ + @Override + public boolean hasMetaExtension(String metaExtensionName, + String extensionName) { + String metaExtensionFQName = WikittyUtil.getFQMetaExtensionName( + metaExtensionName, + extensionName); + boolean hasMetaExtension = extensions.containsKey(metaExtensionFQName); + return hasMetaExtension; + } /** * @see org.nuiton.wikitty.Wikitty#addMetaExtension(WikittyExtension, WikittyExtension) @@ -222,15 +235,14 @@ * @see org.nuiton.wikitty.Wikitty#addMetaExtension(WikittyExtension, String) */ @Override - public void addMetaExtension(WikittyExtension metaExtension, String extensionFqn) { - if (hasExtension(extensionFqn)) { - extensions.put( String.format("%s:%s", - extensionFqn, - metaExtension.getName()), - metaExtension); - // add field + public void addMetaExtension(WikittyExtension metaExtension, String extensionName) { + if (hasExtension(extensionName)) { + String metaExtensionFQName = WikittyUtil.getFQMetaExtensionName( + metaExtension.getName(), + extensionName); + extensions.put(metaExtensionFQName, metaExtension); } else { - throw new IllegalArgumentException("this wikitty doesn't have an extension named " + extensionFqn); + throw new IllegalArgumentException("this wikitty doesn't have an extension named " + extensionName); } } @@ -780,6 +792,13 @@ this.version = version; } + /** + * @see org.nuiton.wikitty.Wikitty#getDirty() + */ + public Set<String> getDirty() { + return fieldDirty; + } + /* * @see org.nuiton.wikitty.Wikitty#clearDirty() */ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-09-30 08:18:10 UTC (rev 370) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-09-30 08:38:02 UTC (rev 371) @@ -73,6 +73,11 @@ static final protected FastDateFormat solrDateFormat = FastDateFormat.getInstance( DATE_FORMAT, CANONICAL_TZ, CANONICAL_LOCALE); + protected static final String FQ_FIELD_NAME_SEPARATOR = "."; + protected static final String FQ_FIELD_NAME_SEPARATOR_REGEX = "\\."; + protected static final String FQ_META_EXTENSION_SEPARATOR = ":"; + protected static final String FQ_META_EXTENSION_SEPARATOR_REGEX = ":"; + // /** All date format parser used to convert string to date */ // static final protected DateFormat[] parserDateFormats = new DateFormat[] { @@ -796,4 +801,54 @@ * current = leastSignificant; } return enc.encode(b); */ } + + /** given a fully qualified field name, return the name of the extension */ + public static String getExtensionNameFromFQFieldName(String fqFieldName) { + String[] fqFieldElements = fqFieldName.split(FQ_FIELD_NAME_SEPARATOR_REGEX); + return fqFieldElements[0]; + } + + /** given a fully qualified field name, return the name of the field */ + public static String getFieldNameFromFQFieldName(String fqFieldName) { + String[] fqFieldElements = fqFieldName.split(FQ_FIELD_NAME_SEPARATOR_REGEX); + return fqFieldElements[1]; + } + + /** given names of extension and field, return a fully qualified field name */ + public static String getFQFieldName(String extensionName, String fieldName) { + String fqFieldName = extensionName + FQ_FIELD_NAME_SEPARATOR_REGEX + fieldName; + return fqFieldName; + } + + /** given a fully qualified meta-extension name, return the name of the meta-extension */ + public static String getMetaExtensionNameFromFQMetaExtensionName(String fqFieldName) { + String[] fqElements = fqFieldName.split(FQ_META_EXTENSION_SEPARATOR_REGEX); + return fqElements[0]; + } + + /** given a fully qualified meta-extension name, return the name of the extension */ + public static String getExtensionNameFromFQMetaExtensionName(String fqFieldName) { + String[] fqElements = fqFieldName.split(FQ_META_EXTENSION_SEPARATOR_REGEX); + return fqElements[1]; + } + + /** given names of meta-extension and extension, return a fully qualified meta-extension name */ + public static String getFQMetaExtensionName(String metaExtensionName, String extensionName) { + String fqFieldName = metaExtensionName + FQ_META_EXTENSION_SEPARATOR + extensionName; + return fqFieldName; + } + + /** + * Get the FQN of a metaExtension field. The FQN may depend of an extension + * getMetaFieldName(metaExt, ext, field) returns "ext:metaExt.field" + * getMetaFieldName(metaExt, null, field) returns "metaExt.field" + */ + public static String getMetaFieldName(String metaExtensionName, String extensionName, String fieldName) { + String actualExtensionName = metaExtensionName; + if (extensionName == null) { + actualExtensionName = getFQMetaExtensionName(metaExtensionName, extensionName); + } + String metaFieldName = getFQFieldName(actualExtensionName, fieldName); + return metaFieldName; + } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-09-30 08:18:10 UTC (rev 370) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-09-30 08:38:02 UTC (rev 371) @@ -591,7 +591,6 @@ String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); getPropertyChangeSupport().firePropertyChange(fieldName, oldValue, <%=getter.getName()%>()); } - return oldValue; }*/); } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-30 08:18:10 UTC (rev 370) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-30 08:38:02 UTC (rev 371) @@ -231,6 +231,7 @@ String abstractName = WikittyTransformerUtil.businessEntityToAbstractName(metaExtension); String contractName = WikittyTransformerUtil.businessEntityToContractName(metaExtension); + String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(metaExtension, true); ObjectModelOperation addMetaExtension = addOperation(helper, "addMetaExtension", "void", ObjectModelModifier.STATIC); @@ -253,7 +254,7 @@ metaExtension.getName())); setOperationBody(hasMetaExtension, "" /*{ - wikitty.hasMetaExtension(<%=abstractName%>.extension<%=contractName%>, extension); + wikitty.hasMetaExtension(<%=extensionVariableName%>, extension.getName()); }*/);

1 0

r370 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: bleny Date: 2010-09-30 10:18:10 +0200 (Thu, 30 Sep 2010) New Revision: 370 Url: http://nuiton.org/repositories/revision/wikitty/370 Log: make generated classes bean (setter returns void) ; add some methods for meta-extensions Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-09-29 12:41:13 UTC (rev 369) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-09-30 08:18:10 UTC (rev 370) @@ -340,16 +340,16 @@ <%=attributeType%> value = <%=helperClassName%>.<%=getterName%>(getWikitty()); return value; }*/); - + String setterName = "set" + StringUtils.capitalize(attributeName); - ObjectModelOperation setter = addOperation(abstractClass, setterName, attributeType); + ObjectModelOperation setter = addOperation(abstractClass, setterName, "void"); addAnnotation(abstractClass, setter, "Override"); addParameter(setter, attributeType, attributeName); setOperationBody(setter, "" /*{ - <%=attributeType%> oldValue = <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>); + <%=attributeType%> oldValue = <%=getterName%>(); + <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=getter.getName()%>()); - return oldValue; }*/); } @@ -499,7 +499,7 @@ if (extensionForMetaExtension == null) { result = <%=helperClassName%>.<%=getterName%>(getWikitty()); } else { - result = <%=helperClassName%>.<%=getterName%>(extensionForMetaExtension, getWikitty()); + result = <%=helperClassName%>.<%=getterName%>(extensionForMetaExtension.getName(), getWikitty()); } return result; }*/; @@ -515,7 +515,7 @@ <%=helperClassName%>.<%=addName%>(getWikitty(), element); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); } else { - <%=helperClassName%>.<%=addName%>(extensionForMetaExtension, getWikitty(), element); + <%=helperClassName%>.<%=addName%>(extensionForMetaExtension.getName(), getWikitty(), element); String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); getPropertyChangeSupport().firePropertyChange(fieldName, null, <%=getter.getName()%>()); } @@ -532,7 +532,7 @@ <%=helperClassName%>.<%=removeName%>(getWikitty(), element); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); } else { - <%=helperClassName%>.<%=removeName%>(extensionForMetaExtension, getWikitty(), element); + <%=helperClassName%>.<%=removeName%>(extensionForMetaExtension.getName(), getWikitty(), element); String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); getPropertyChangeSupport().firePropertyChange(fieldName, null, <%=getter.getName()%>()); } @@ -548,7 +548,7 @@ <%=helperClassName%>.<%=clearName%>(getWikitty()); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); } else { - <%=helperClassName%>.<%=clearName%>(extensionForMetaExtension, getWikitty()); + <%=helperClassName%>.<%=clearName%>(extensionForMetaExtension.getName(), getWikitty()); String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); getPropertyChangeSupport().firePropertyChange(fieldName, null, <%=getter.getName()%>()); } @@ -569,23 +569,25 @@ if (extensionForMetaExtension == null) { value = <%=helperClassName%>.<%=getterName%>(getWikitty()); } else { - value = <%=helperClassName%>.<%=getterName%>(extensionForMetaExtension, getWikitty()); + value = <%=helperClassName%>.<%=getterName%>(extensionForMetaExtension.getName(), getWikitty()); } return value; }*/); String setterName = "set" + StringUtils.capitalize(attributeName); - ObjectModelOperation setter = addOperation(abstractClassForThisMetaExtension, setterName, attributeType); + ObjectModelOperation setter = addOperation(abstractClassForThisMetaExtension, setterName, "void"); addAnnotation(abstractClassForThisMetaExtension, setter, "Override"); addParameter(setter, attributeType, attributeName); setOperationBody(setter, "" /*{ <%=attributeType%> oldValue; if (extensionForMetaExtension == null) { - oldValue = <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>); + oldValue = <%=getterName%>(); + <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=getter.getName()%>()); } else { - oldValue = <%=helperClassName%>.<%=setterName%>(extensionForMetaExtension, getWikitty(), <%=attributeName%>); + oldValue = <%=getterName%>(); + <%=helperClassName%>.<%=setterName%>(extensionForMetaExtension.getName(), getWikitty(), <%=attributeName%>); String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); getPropertyChangeSupport().firePropertyChange(fieldName, oldValue, <%=getter.getName()%>()); } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-09-29 12:41:13 UTC (rev 369) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-09-30 08:18:10 UTC (rev 370) @@ -204,7 +204,7 @@ getter = addOperation(contract, getterName, attributeType); String setterName = "set" + StringUtils.capitalize(attributeName); - ObjectModelOperation setter = addOperation(contract, setterName, attributeType); + ObjectModelOperation setter = addOperation(contract, setterName, "void"); addParameter(setter, attributeType, attributeName); } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-29 12:41:13 UTC (rev 369) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-30 08:18:10 UTC (rev 370) @@ -194,13 +194,22 @@ - // finally, adding isExtention and addExtension + // finally, adding isExtension, hasExtension and addExtension ObjectModelOperation isExtension = addOperation(helper, "isExtension", "boolean", ObjectModelModifier.STATIC); addParameter(isExtension, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); - setDocumentation(isExtension, "Check if wikitty has current extension"); + addAnnotation(helper, isExtension, "Deprecated"); + setDocumentation(isExtension, "@deprecated renamed to keep consistency, use hasExtension instead"); setOperationBody(isExtension, "" /*{ + return hasExtension(wikitty); +}*/); + + ObjectModelOperation hasExtension = addOperation(helper, "hasExtension", "boolean", ObjectModelModifier.STATIC); + addParameter(hasExtension, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setDocumentation(hasExtension, "check if wikitty has current extension"); + setOperationBody(hasExtension, "" +/*{ return wikitty.hasExtension(<%=extensionVariableName%>); }*/); @@ -219,21 +228,34 @@ /** add needed operations if input model element has stereotype "meta" */ protected void createOperationForMetaExtension(ObjectModelClass metaExtension, ObjectModelClass helper) { + + String abstractName = WikittyTransformerUtil.businessEntityToAbstractName(metaExtension); + String contractName = WikittyTransformerUtil.businessEntityToContractName(metaExtension); + ObjectModelOperation addMetaExtension = addOperation(helper, "addMetaExtension", "void", ObjectModelModifier.STATIC); addParameter(addMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); addParameter(addMetaExtension, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); setDocumentation(addMetaExtension, String.format( "add %s meta-extension on given extension to the given wikitty", metaExtension.getName())); - String abstractName = WikittyTransformerUtil.businessEntityToAbstractName(metaExtension); - String contractName = WikittyTransformerUtil.businessEntityToContractName(metaExtension); setOperationBody(addMetaExtension, "" /*{ wikitty.addMetaExtension(<%=abstractName%>.extension<%=contractName%>, extension); }*/); + ObjectModelOperation hasMetaExtension = addOperation(helper, "hasMetaExtension", "boolean", ObjectModelModifier.STATIC); + addParameter(hasMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(hasMetaExtension, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setDocumentation(hasMetaExtension, String.format( + "true if given wikitty has %s meta-extension on given extension", + metaExtension.getName())); + setOperationBody(hasMetaExtension, "" +/*{ + wikitty.hasMetaExtension(<%=abstractName%>.extension<%=contractName%>, extension); +}*/); + // now adding getMetaFielName, both implementations @@ -257,7 +279,7 @@ metaExtension.getName())); setOperationBody(getMetaFieldNameFromExtensionName, "" /*{ - String metaFieldName = String.format("%s<%=META_EXTENSION_SEPARATOR%><%=metaExtension.getName()%>.%s", extensionName, fieldName); + String metaFieldName = WikittyUtil.getMetaFieldName("<%=metaExtension.getName()%>", extensionName, fieldName); return metaFieldName; }*/); @@ -288,11 +310,11 @@ // adding operations to contract String getterName = "get" + StringUtils.capitalize(attributeName); ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet, ObjectModelModifier.STATIC); - addParameter(getter, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(getter, "String", "extensionName"); addParameter(getter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); String getterBody = "" /*{ - String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + String fieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); <%=attributeTypeSimpleNameInSet%> result = (<%=attributeTypeSimpleNameInSet%>) wikitty.getFqField(fieldName); return result; }*/; @@ -300,35 +322,35 @@ String addName = "add" + StringUtils.capitalize(attributeName); ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC); - addParameter(adder, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(adder, "String", "extensionName"); addParameter(adder, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); addParameter(adder, attributeType, "element"); String adderBody = "" /*{ - String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + String fieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); wikitty.addToField(fieldName, element); }*/; setOperationBody(adder, adderBody); String removeName = "remove" + StringUtils.capitalize(attributeName); ObjectModelOperation remover = addOperation(helper, removeName, "void", ObjectModelModifier.STATIC); - addParameter(remover, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(remover, "String", "extensionName"); addParameter(remover, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); addParameter(remover, attributeType, "element"); String removerBody = "" /*{ - String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + String fieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); wikitty.removeFromField(fieldName, element); }*/; setOperationBody(remover, removerBody); String clearName = "clear" + StringUtils.capitalize(attributeName); ObjectModelOperation clear = addOperation(helper, clearName, "void", ObjectModelModifier.STATIC); - addParameter(clear, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(clear, "String", "extensionName"); addParameter(clear, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); String clearBody = "" /*{ - String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + String fieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); wikitty.clearField(fieldName); }*/; setOperationBody(clear, clearBody); @@ -340,24 +362,24 @@ // adding getter and setter to contract String getterName = "get" + StringUtils.capitalize(attributeName); ObjectModelOperation getter = addOperation(helper, getterName, attributeType, ObjectModelModifier.STATIC); - addParameter(getter, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(getter, "String", "extensionName"); addParameter(getter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); setOperationBody(getter, "" /*{ - String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + String fieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); <%=attributeType%> value = (<%=attributeType%>) wikitty.getFqField(fieldName); return value; }*/); String setterName = "set" + StringUtils.capitalize(attributeName); ObjectModelOperation setter = addOperation(helper, setterName, attributeType, ObjectModelModifier.STATIC); - addParameter(setter, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(setter, "String", "extensionName"); addParameter(setter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); addParameter(setter, attributeType, attributeName); setOperationBody(setter, "" /*{ - <%=attributeType%> oldValue = <%=getter.getName()%>(extension, wikitty); - String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + <%=attributeType%> oldValue = <%=getter.getName()%>(extensionName, wikitty); + String fieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); wikitty.setFqField(fieldName, <%=attributeName%>); return oldValue; }*/);

1 0

r369 - trunk
by bleny＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: bleny Date: 2010-09-29 14:41:13 +0200 (Wed, 29 Sep 2010) New Revision: 369 Url: http://nuiton.org/repositories/revision/wikitty/369 Log: add missing <developpers> in POM Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 12:28:42 UTC (rev 368) +++ trunk/pom.xml 2010-09-29 12:41:13 UTC (rev 369) @@ -413,6 +413,27 @@ </roles> </developer> + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + + <developer> + <name>Benoit Brossaud</name> + <id>bbrossaud</id> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + </developers>

1 0