- Topia-commits - mailman.cloud.codelutin.com

r1386 - in topia/trunk: src/site topia-persistence/src/site topia-soa/src/site topia-ui/src/site
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 11:39:36 +0000 (Fri, 20 Feb 2009) New Revision: 1386 Modified: topia/trunk/src/site/site.xml topia/trunk/topia-persistence/src/site/site.xml topia/trunk/topia-soa/src/site/site.xml topia/trunk/topia-ui/src/site/site.xml Log: Update lutin skin version Modified: topia/trunk/src/site/site.xml =================================================================== --- topia/trunk/src/site/site.xml 2009-02-20 09:09:24 UTC (rev 1385) +++ topia/trunk/src/site/site.xml 2009-02-20 11:39:36 UTC (rev 1386) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft> Modified: topia/trunk/topia-persistence/src/site/site.xml =================================================================== --- topia/trunk/topia-persistence/src/site/site.xml 2009-02-20 09:09:24 UTC (rev 1385) +++ topia/trunk/topia-persistence/src/site/site.xml 2009-02-20 11:39:36 UTC (rev 1386) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft> Modified: topia/trunk/topia-soa/src/site/site.xml =================================================================== --- topia/trunk/topia-soa/src/site/site.xml 2009-02-20 09:09:24 UTC (rev 1385) +++ topia/trunk/topia-soa/src/site/site.xml 2009-02-20 11:39:36 UTC (rev 1386) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft> Modified: topia/trunk/topia-ui/src/site/site.xml =================================================================== --- topia/trunk/topia-ui/src/site/site.xml 2009-02-20 09:09:24 UTC (rev 1385) +++ topia/trunk/topia-ui/src/site/site.xml 2009-02-20 11:39:36 UTC (rev 1386) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft>

1 0

r1385 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 09:09:24 +0000 (Fri, 20 Feb 2009) New Revision: 1385 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: Remove unique constraints for x->0..1 relations Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-02-20 08:58:09 UTC (rev 1384) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-02-20 09:09:24 UTC (rev 1385) @@ -343,10 +343,16 @@ } protected void generateHibernateOneToOne(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { - generateHibernateManyToOne(output, attr, true, prefix); -// boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model); +// boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model); /// *{ <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(TopiaGeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%> node="<%=getName(attr)%>/@topiaId" embed-xml="false"/> //} */ + + // for hibernate many-to-one with unique="true" => one-to-one + // but if it is one-to-zero-or-one unique contraints is violated + // with null values + boolean unique = TopiaGeneratorUtil.isOneMultiplicity(attr); + generateHibernateManyToOne(output, attr, unique, prefix); + } protected void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr, String prefix) throws IOException {

1 0

r1384 - in topia/trunk: . topia-persistence
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 08:58:09 +0000 (Fri, 20 Feb 2009) New Revision: 1384 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml Log: Use test directory definided in super pom Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-19 00:26:57 UTC (rev 1383) +++ topia/trunk/pom.xml 2009-02-20 08:58:09 UTC (rev 1384) @@ -215,9 +215,9 @@ <inherited>true</inherited> <configuration> <srcDirZuml>${maven.src.dir}/test/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/test-xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/test--models/</srcGenDest> - <destDirGen>${maven.gen.dir}/test-java</destDirGen> + <srcXmiDest>${maven.test.gen.dir}/xmi</srcXmiDest> + <srcGenDest>${maven.test.gen.dir}/models</srcGenDest> + <destDirGen>${maven.test.gen.dir}/java</destDirGen> </configuration> </plugin> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-02-19 00:26:57 UTC (rev 1383) +++ topia/trunk/topia-persistence/pom.xml 2009-02-20 08:58:09 UTC (rev 1384) @@ -78,14 +78,14 @@ <testResources> <testResource> - <directory>${maven.src.dir}/test/java</directory> + <directory>${maven.test.gen.dir}/java</directory> <includes> <include>**/*.hbm.xml</include> </includes> </testResource> <testResource> - <directory>${test.gen.dir}/java</directory> + <directory>${maven.test.gen.dir}/java</directory> <includes> <include>**/*.hbm.xml</include> </includes>

1 0

r1383 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 19 Feb '09

19 Feb '09

Author: tchemit Date: 2009-02-19 00:26:57 +0000 (Thu, 19 Feb 2009) New Revision: 1383 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Log: suppression de le generalisation redondante Serializable ajout des annotations Override sur les implantation du contrat de l'entite Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-02-18 23:33:29 UTC (rev 1382) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-02-19 00:26:57 UTC (rev 1383) @@ -153,7 +153,7 @@ extendClass += TopiaEntityAbstract.class.getSimpleName(); } -/*{public abstract class <%=clazzName%>Abstract extends <%=extendClass%> implements Serializable, <%=clazzName%> { +/*{public abstract class <%=clazzName%>Abstract extends <%=extendClass%> implements <%=clazzName%> { }*/ @@ -250,10 +250,12 @@ public <%=clazzName%>Abstract() { } + @Override public void update() throws TopiaException { ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=clazzName%>.class).update(this); } + @Override public void delete() throws TopiaException { ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=clazzName%>.class).delete(this); } @@ -266,6 +268,7 @@ * * @throws TopiaException if any pb while visit *) + @Override public void accept(EntityVisitor visitor) throws TopiaException { visitor.start(this); }*/ @@ -330,6 +333,7 @@ visitor.end(this); } + @Override public List<TopiaEntity> getAggregate() throws TopiaException { List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); @@ -362,6 +366,7 @@ return result; } + @Override public List<TopiaEntity> getComposite() throws TopiaException { List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); @@ -441,6 +446,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void set<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> value) { <%=attrType%> _oldValue = this.<%=attrName%>; fireOnPreWrite("<%=attrName%>", _oldValue, value); @@ -451,6 +457,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public <%=attrType%> get<%=GeneratorUtil.capitalize(attrName)%>() { fireOnPreRead("<%=attrName%>", <%=attrName%>); <%=attrType%> result = this.<%=attrName%>; @@ -465,6 +472,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> association) { <%=assocClassFQN%> _oldValue = this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, association); @@ -475,6 +483,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; } @@ -488,6 +497,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#add<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void add<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> <%=attrName%>) { fireOnPreWrite("<%=attrName%>", null, <%=attrName%>); if (this.<%=attrName%> == null) { @@ -516,6 +526,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#addAll<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>>) *) + @Override public void addAll<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>> values) { if (values == null) { return; @@ -528,6 +539,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String) *) + @Override public <%=attrType%> get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String topiaId) { return org.codelutin.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=attrName%>, topiaId); } @@ -535,6 +547,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>>) *) + @Override public void set<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>> values) { <%=collectionInterface%><<%=attrType%>> _oldValue = <%=attrName%>; fireOnPreWrite("<%=attrName%>", _oldValue, values); @@ -545,6 +558,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#remove<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void remove<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> value) { fireOnPreWrite("<%=attrName%>", value, null); if ((this.<%=attrName%> == null) || (!this.<%=attrName%>.remove(value))) { @@ -568,6 +582,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#clear<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public void clear<%=GeneratorUtil.capitalize(attrName)%>() { if (this.<%=attrName%> == null) { return; @@ -601,6 +616,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#add<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void add<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> value) { fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", null, value); if (this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { @@ -620,6 +636,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String) *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>ByTopiaId(String topiaId) { return org.codelutin.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=assocAttrName%>, topiaId); } @@ -627,6 +644,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>>() *) + @Override public void addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>> values) { if (values == null) { return; @@ -639,6 +657,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>>() *) + @Override public void set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>> values) { // clear<%=GeneratorUtil.capitalize(assocAttrName)%>(); // addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(values); @@ -652,6 +671,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#remove<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void remove<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> value) { fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", value, null); if ((this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) || (!this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>.remove(value))) { @@ -670,6 +690,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#clear<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public void clear<%=GeneratorUtil.capitalize(assocAttrName)%>() { if (this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return; @@ -695,6 +716,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public <%=collectionInterface%><<%=attrType%>> get<%=GeneratorUtil.capitalize(attrName)%>() { return <%=attrName%>; } @@ -702,6 +724,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#size<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public int size<%=GeneratorUtil.capitalize(attrName)%>() { if (<%=attrName%> == null) { return 0; @@ -716,6 +739,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public <%=collectionInterface%><<%=assocClassFQN%>> get<%=GeneratorUtil.capitalize(assocAttrName)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; } @@ -723,6 +747,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=attrType%>) *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=attrType%> value) { if (value == null || <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return null; @@ -738,6 +763,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#size<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public int size<%=GeneratorUtil.capitalize(assocAttrName)%>() { if (<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return 0; @@ -772,6 +798,7 @@ /*{ /* (non-Javadoc) * @see java.lang.Object#toString() *) + @Override public String toString() { String result = new ToStringBuilder(this). }*/ @@ -807,6 +834,7 @@ /*{ /** * @param value La valeur de l'attribut <%=name%> à positionner. *) + @Override public void set<%=GeneratorUtil.capitalize(name)%>(<%=type%> value) { <%=type%> _oldValue = this.<%=GeneratorUtil.toLowerCaseFirstLetter(name)%>; fireOnPreWrite("<%=name%>", _oldValue, value); @@ -817,6 +845,7 @@ /** * @return La valeur de l'attribut <%=name%>. *) + @Override public <%=type%> get<%=GeneratorUtil.capitalize(name)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(name)%>; }

1 0

r1382 - topia/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 23:33:29 +0000 (Wed, 18 Feb 2009) New Revision: 1382 Modified: topia/trunk/ topia/trunk/pom.xml Log: prefer use target/generated-sources/test-XXX instead of target/generated-test-sources/test/XXX since this is the convention. Property changes on: topia/trunk ___________________________________________________________________ Name: svn:ignore - target .classpath .project topia2.ipr .settings THIRD-PARTY.txt *.iml topia.ipr + topia2.ipr .classpath *.iml .project target topia.ipr topia.iws THIRD-PARTY.txt .settings Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 22:15:05 UTC (rev 1381) +++ topia/trunk/pom.xml 2009-02-18 23:33:29 UTC (rev 1382) @@ -173,9 +173,7 @@ <topia.version>${project.version}</topia.version> <xmlrpc.version>3.1</xmlrpc.version> - <hibernate.version>3.3.1.GA</hibernate.version> -  -  + <hibernate.version>3.3.1.GA</hibernate.version> </properties> <build> @@ -216,10 +214,10 @@ <version>${generator.version}</version> <inherited>true</inherited> <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>${maven.test.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.test.gen.dir}/models/</srcGenDest> - <destDirGen>${maven.test.gen.dir}/java</destDirGen> + <srcDirZuml>${maven.src.dir}/test/xmi</srcDirZuml> + <srcXmiDest>${maven.gen.dir}/test-xmi/</srcXmiDest> + <srcGenDest>${maven.gen.dir}/test--models/</srcGenDest> + <destDirGen>${maven.gen.dir}/test-java</destDirGen> </configuration> </plugin>

1 0

r1381 - topia/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 22:15:05 +0000 (Wed, 18 Feb 2009) New Revision: 1381 Modified: topia/trunk/pom.xml Log: zeroConf in license-switcher and jrst pass to stable versions Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 19:39:05 UTC (rev 1380) +++ topia/trunk/pom.xml 2009-02-18 22:15:05 UTC (rev 1381) @@ -168,7 +168,8 @@ <generator.version>0.64</generator.version> <processor.version>0.17</processor.version> <lutinutil.version>1.0.3</lutinutil.version> - + <jrst.version>0.8.4</jrst.version> + <license-switcher.version>0.6</license-switcher.version> <topia.version>${project.version}</topia.version> <xmlrpc.version>3.1</xmlrpc.version> @@ -230,17 +231,12 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <defaultLocale>fr</defaultLocale> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.build.sourceEncoding}</outputEncoding> + <version>${jrst.version}</version> + <configuration> + <defaultLocale>fr</defaultLocale> </configuration> <executions> - <execution> - <phase>pre-site</phase> + <execution> <goals> <goal>jrst</goal> </goals> @@ -293,10 +289,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.6</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> + <version>${license-switcher.version}</version> <executions> <execution> <id>attach-licenses</id>

1 0

r1380 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 19:39:05 +0000 (Wed, 18 Feb 2009) New Revision: 1380 Modified: topia-service/trunk/pom.xml Log: utilisation lutinproject 3.4 Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-02-18 19:37:58 UTC (rev 1379) +++ topia-service/trunk/pom.xml 2009-02-18 19:39:05 UTC (rev 1380) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <artifactId>topia-service</artifactId> @@ -82,8 +82,8 @@  <topia.version>2.1.3-SNAPSHOT</topia.version> - <generator.version>0.64-SNAPSHOT</generator.version> - <lutinutil.version>1.0.2</lutinutil.version> + <generator.version>0.64</generator.version> + <lutinutil.version>1.0.3</lutinutil.version> </properties> @@ -154,7 +154,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>0.8.4</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> @@ -217,7 +217,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

r1379 - topia/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 19:37:58 +0000 (Wed, 18 Feb 2009) New Revision: 1379 Modified: topia/trunk/pom.xml Log: variable test.gen.dir chang?\195?\169 en maven.test.Gen.dir comme dans lutinproject Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 19:33:53 UTC (rev 1378) +++ topia/trunk/pom.xml 2009-02-18 19:37:58 UTC (rev 1379) @@ -216,9 +216,9 @@ <inherited>true</inherited> <configuration> <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>${test.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${test.gen.dir}/models/</srcGenDest> - <destDirGen>${test.gen.dir}/java</destDirGen> + <srcXmiDest>${maven.test.gen.dir}/xmi/</srcXmiDest> + <srcGenDest>${maven.test.gen.dir}/models/</srcGenDest> + <destDirGen>${maven.test.gen.dir}/java</destDirGen> </configuration> </plugin>

1 0

r1378 - topia/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 19:33:53 +0000 (Wed, 18 Feb 2009) New Revision: 1378 Modified: topia/trunk/pom.xml Log: utilisation lutinproject 3.4 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 15:26:58 UTC (rev 1377) +++ topia/trunk/pom.xml 2009-02-18 19:33:53 UTC (rev 1378) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <artifactId>topia</artifactId> @@ -165,9 +165,9 @@ <labs.project>topia</labs.project>  - <generator.version>0.64-SNAPSHOT</generator.version> - <processor.version>0.17-SNAPSHOT</processor.version> - <lutinutil.version>1.0</lutinutil.version> + <generator.version>0.64</generator.version> + <processor.version>0.17</processor.version> + <lutinutil.version>1.0.3</lutinutil.version> <topia.version>${project.version}</topia.version> @@ -230,7 +230,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>0.8.4</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> @@ -293,7 +293,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

r1377 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 15:26:58 +0000 (Wed, 18 Feb 2009) New Revision: 1377 Modified: topia-service/trunk/pom.xml Log: suppression des versions de nos librairies de lutinproject Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-02-18 15:26:50 UTC (rev 1376) +++ topia-service/trunk/pom.xml 2009-02-18 15:26:58 UTC (rev 1377) @@ -84,7 +84,7 @@ <topia.version>2.1.3-SNAPSHOT</topia.version> <generator.version>0.64-SNAPSHOT</generator.version> <lutinutil.version>1.0.2</lutinutil.version> - + </properties> <build> @@ -154,13 +154,13 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> + <version>0.8.3</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> </configuration> <executions> <execution> @@ -217,7 +217,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <version>0.5</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0