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

r1266 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Dec. 11, 2008

Dec. 11, 2008

Author: tchemit Date: 2008-12-11 21:33:45 +0000 (Thu, 11 Dec 2008) New Revision: 1266 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java Log: fix methods to test if a EnittyImpl is abstract (was not ok when you add an Interface to a Entity) Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java 2008-12-11 16:33:58 UTC (rev 1265) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java 2008-12-11 21:33:45 UTC (rev 1266) @@ -33,14 +33,19 @@ import java.io.IOException; import java.io.Writer; import java.util.Iterator; +import java.util.Collection; import org.codelutin.generator.Generator; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModelClass; import org.codelutin.generator.models.object.ObjectModelOperation; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; public class EntityImplGenerator extends ObjectModelGenerator { + private static final Log log = LogFactory.getLog(EntityImplGenerator.class); + public EntityImplGenerator() { super(); } @@ -61,17 +66,17 @@ } //De même, on ne génère pas le impl si il y a des opérations venant des // superclasses non implémentées - for (Iterator otherOps = clazz.getAllOtherOperations(false).iterator(); otherOps.hasNext(); ) { - ObjectModelOperation otherOp = (ObjectModelOperation)otherOps.next(); + for (ObjectModelOperation otherOp : clazz.getAllOtherOperations(false)) { if (otherOp.isAbstract()) { return; } } - boolean isAbstract = clazz.isAbstract(); + boolean isAbstract = isAbstract(clazz); + //boolean isAbstract = clazz.isAbstract(); //Une classe peut être abstraite si elle a des méthodes définies dans // ses superinterface et non implantées dans ses superclasses - if (!isAbstract) { + /*if (!isAbstract) { for (Iterator operations = clazz.getAllInterfaceOperations(true).iterator(); (!isAbstract) && operations.hasNext(); ) { ObjectModelOperation op = (ObjectModelOperation)operations.next(); boolean implementationFound = false; @@ -84,7 +89,7 @@ } isAbstract = !implementationFound; } - } + }*/ String copyright = GeneratorUtil.getCopyright(model); if (GeneratorUtil.notEmpty(copyright)) { /*{<%=copyright%> @@ -107,4 +112,35 @@ }*/ } + + protected boolean isAbstract(ObjectModelClass clazz) { + if (clazz.isAbstract()) { + return true; + } + + //Une classe peut être abstraite si elle a des méthodes définies dans + // ses superinterface et non implantées dans ses superclasses + Collection<ObjectModelOperation> allInterfaceOperations = clazz.getAllInterfaceOperations(true); + allInterfaceOperations.removeAll(clazz.getAllOtherOperations(true)); + for (ObjectModelOperation op : allInterfaceOperations) { + boolean implementationFound = false; + for (ObjectModelClass superClazz : clazz.getSuperclasses()) { + for (ObjectModelOperation matchingOp : superClazz.getOperations(op.getName())) { + implementationFound = (op.equals(matchingOp) && !matchingOp.isAbstract()); + if (implementationFound) { + break; + } + } + if (implementationFound) { + break; + } + } + if (!implementationFound) { + log.info(clazz.getName()+" : abstract operation "+op); + return true; + } + } + return false; + } + } //EntityPOJOGenerator

1 0

r1265 - in topia/trunk/topia-persistence: . src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org Dec. 11, 2008

Dec. 11, 2008

Author: tchemit Date: 2008-12-11 16:33:58 +0000 (Thu, 11 Dec 2008) New Revision: 1265 Added: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java Modified: topia/trunk/topia-persistence/changelog.txt Log: add a InterfaceGenerator to generate simple with no stereotype interfaces. Modified: topia/trunk/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2008-12-10 16:30:17 UTC (rev 1264) +++ topia/trunk/topia-persistence/changelog.txt 2008-12-11 16:33:58 UTC (rev 1265) @@ -1,3 +1,6 @@ +2.1.1 ?? 200812?? +* 20081212 [chemit] - add a InterfaceGenerator to generate simple with no stereotype interfaces. + 2.1.0 chemit 20081210 * 20081205 [chemit] - improve poms, use lutinproject 3.2 - add some usefull methods in TopiaUtil to help with regex on topiaId expression \ No newline at end of file Copied: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java (from rev 1250, topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java) =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java (rev 0) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java 2008-12-11 16:33:58 UTC (rev 1265) @@ -0,0 +1,186 @@ +/* *##% ToPIA - Tools for Portable and Independent Architecture + * Copyright (C) 2004 - 2008 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + +/* * +* EntityGenerator.java +* +* Created: 12 déc. 2005 +* +* @author Arnaud Thimel <thimel(a)codelutin.com> +* @version $Revision$ +* +* Mise a jour: $Date$ +* par : $Author$ +*/ + +package org.codelutin.topia.generator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.generator.Generator; +import org.codelutin.generator.ObjectModelGenerator; +import org.codelutin.generator.models.object.ObjectModelClass; +import org.codelutin.generator.models.object.ObjectModelClassifier; +import org.codelutin.generator.models.object.ObjectModelInterface; +import org.codelutin.generator.models.object.ObjectModelOperation; +import org.codelutin.generator.models.object.ObjectModelParameter; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +public class InterfaceGenerator extends ObjectModelGenerator { //InterfaceGenerator + + /** Logger for this class */ + private static final Log log = LogFactory.getLog(InterfaceGenerator.class); + + public InterfaceGenerator() { + super(); + } + + public InterfaceGenerator(Generator parent) { + super(parent); + } + + @Override + public String getFilenameForClass(ObjectModelClass clazz) { + return clazz.getQualifiedName().replace('.', File.separatorChar) + ".java"; + } + + @Override + public String getFilenameForInterface(ObjectModelInterface interfacez) { + return interfacez.getQualifiedName().replace('.', File.separatorChar) + ".java"; + } + + @Override + public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException { + if (!interfacez.getStereotypes().isEmpty()) { + // can only generate an interface with there is no other stereotypes + return; + } + + // log + if (log.isDebugEnabled()) { + log.debug("Generating interface for : " + interfacez.getName()); + } + + generateInterfaceHeader(output, interfacez); + + generateInterfaceOperations(output, interfacez); + +/*{} //<%=interfacez.getName()%> +}*/ + } + + private String getStringRepresentation(List<String> strings) { + StringBuffer result = new StringBuffer(); + String doubleQuote = "\""; + String comma = ","; + Iterator<String> it = strings.iterator(); + while (it.hasNext()) { + result.append(doubleQuote); + result.append(it.next()); + result.append(doubleQuote); + if (it.hasNext()) { + result.append(comma); + } + } + return result.toString(); + } + + private void generateInterfaceHeader(Writer output, ObjectModelClassifier classifier) throws IOException { + String copyright = GeneratorUtil.getCopyright(model); + if (GeneratorUtil.notEmpty(copyright)) { +/*{<%=copyright%> +}*/ + } +/*{package <%=classifier.getPackageName()%>; + +}*/ + if (GeneratorUtil.hasDocumentation(classifier)) { +/*{ +/** + * <%=classifier.getDocumentation()%> + *) +}*/ + } +/*{public interface <%=classifier.getName()%> }*/ + String extendClass = ""; + if (!classifier.getInterfaces().isEmpty()) { + for (ObjectModelClassifier parent : classifier.getInterfaces()) { + extendClass += parent.getQualifiedName(); + extendClass += ", "; + } + if (log.isTraceEnabled()) { + log.trace("Interface : " + extendClass); + } + +/*{ extends <%=extendClass%> { + +}*/ + } +/*{ { +}*/ + } + + private void generateInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { + for (ObjectModelOperation op : classifier.getOperations()) { +/*{ /** +}*/ + if (GeneratorUtil.hasDocumentation(op)) { +/*{ * <%=op.getName()%> : <%=op.getDocumentation()%> +}*/ + } + Collection<ObjectModelParameter> params = op.getParameters(); + for (ObjectModelParameter param : params) { + if (log.isTraceEnabled()) { + log.trace("Param" + param); + } +/*{ * @param <%=param.getName()%> <%=param.getDocumentation()%> + }*/ + } +/*{ *) + <%=op.getVisibility()%> <%=op.getReturnType()%> <%=op.getName()%>(}*/ + String vir = ""; + for (ObjectModelParameter param : params) { + if (log.isTraceEnabled()) { + log.trace("Param" + param + " vir" + vir); + } +/*{<%=vir%><%=param.getType()%> <%=param.getName()%>}*/ + vir = ", "; + } +/*{)}*/ + Set<String> exceptions = op.getExceptions(); + vir = " throws "; + for (String exception : exceptions) { + if (log.isTraceEnabled()) { + log.trace("exception" + exception + " vir" + vir); + } +/*{<%=vir%><%=exception%>}*/ + vir = ", "; + } +/*{; + +}*/ + } + } + +} //InterfaceGenerator \ No newline at end of file Property changes on: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native

1 0

r1264 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:30:17 +0000 (Wed, 10 Dec 2008) New Revision: 1264 Modified: topia-test/trunk/pom.xml Log: push back scm generic values Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 16:23:30 UTC (rev 1263) +++ topia-test/trunk/pom.xml 2008-12-10 16:30:17 UTC (rev 1264) @@ -22,7 +22,7 @@ <dependency> <groupId>org.codelutin.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -128,9 +128,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/trun…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>

1 0

r1263 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:23:30 +0000 (Wed, 10 Dec 2008) New Revision: 1263 Modified: topia-test/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 16:23:27 UTC (rev 1262) +++ topia-test/trunk/pom.xml 2008-12-10 16:23:30 UTC (rev 1263) @@ -14,7 +14,7 @@ </parent> <artifactId>topia-test</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <dependencies> @@ -22,7 +22,7 @@ <dependency> <groupId>org.codelutin.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -128,9 +128,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/trun…</url> </scm>

1 0

r1262 - in topia-test/tags: . 2.1.0
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:23:27 +0000 (Wed, 10 Dec 2008) New Revision: 1262 Added: topia-test/tags/2.1.0/ topia-test/tags/2.1.0/changelog.txt topia-test/tags/2.1.0/pom.xml Removed: topia-test/tags/2.1.0/changelog.txt topia-test/tags/2.1.0/pom.xml Log: [maven-release-plugin] copy for tag 2.1.0 Copied: topia-test/tags/2.1.0 (from rev 1250, topia-test/trunk) Deleted: topia-test/tags/2.1.0/changelog.txt =================================================================== --- topia-test/trunk/changelog.txt 2008-12-10 15:09:31 UTC (rev 1250) +++ topia-test/tags/2.1.0/changelog.txt 2008-12-10 16:23:27 UTC (rev 1262) @@ -1,3 +0,0 @@ -2.0.28 ?? 200812?? - * 20081206 [chemit] - improve poms, use lutinproject 3.2 - \ No newline at end of file Copied: topia-test/tags/2.1.0/changelog.txt (from rev 1260, topia-test/trunk/changelog.txt) =================================================================== --- topia-test/tags/2.1.0/changelog.txt (rev 0) +++ topia-test/tags/2.1.0/changelog.txt 2008-12-10 16:23:27 UTC (rev 1262) @@ -0,0 +1,3 @@ +2.1.0 chemit 20081210 + * 20081206 [chemit] - improve poms, use lutinproject 3.2 + \ No newline at end of file Deleted: topia-test/tags/2.1.0/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 15:09:31 UTC (rev 1250) +++ topia-test/tags/2.1.0/pom.xml 2008-12-10 16:23:27 UTC (rev 1262) @@ -1,134 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.2</version> - </parent> - - <artifactId>topia-test</artifactId> - <version>2.0.28-SNAPSHOT</version> - - <dependencies> - -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.61</version> - <scope>test</scope> - </dependency> - - </dependencies> - -  -  -  - - <name>ToPIA Testing</name> - - <description>Test de ToPIA</description> - <inceptionYear>2007</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - - <properties> - -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <topia.version>2.0.27</topia.version> - -  - <generator.version>0.62-SNAPSHOT</generator.version> - </properties> - - <build> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> - <executions> - <execution> - <id>Generator</id> - <phase>generate-sources</phase> - <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> - <fullPackagePath>org.codelutin.topia</fullPackagePath> - <extractedPackages>org.codelutin.topia</extractedPackages> -  - <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/generated-sources/java</destDirGen> - <defaultPackage>org.codelutin.topia</defaultPackage> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - - -</project> Copied: topia-test/tags/2.1.0/pom.xml (from rev 1261, topia-test/trunk/pom.xml) =================================================================== --- topia-test/tags/2.1.0/pom.xml (rev 0) +++ topia-test/tags/2.1.0/pom.xml 2008-12-10 16:23:27 UTC (rev 1262) @@ -0,0 +1,137 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.2</version> + </parent> + + <artifactId>topia-test</artifactId> + <version>2.1.0</version> + + <dependencies> + +  + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>2.1.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.0.61</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + + </dependencies> + +  +  +  + + <name>ToPIA Testing</name> + + <description>Test de ToPIA</description> + <inceptionYear>2007</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> + +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> + +  + <generator.version>0.62</generator.version> + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <id>Generator</id> + <phase>generate-sources</phase> + <configuration> + <srcDirZuml>src/test/xmi</srcDirZuml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> + <fullPackagePath>org.codelutin.topia</fullPackagePath> + <extractedPackages>org.codelutin.topia</extractedPackages> +  + <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>target/generated-sources/java</destDirGen> + <defaultPackage>org.codelutin.topia</defaultPackage> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> + </scm> + + +</project>

1 0

r1261 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:23:24 +0000 (Wed, 10 Dec 2008) New Revision: 1261 Modified: topia-test/trunk/pom.xml Log: [maven-release-plugin] prepare release 2.1.0 Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 16:20:41 UTC (rev 1260) +++ topia-test/trunk/pom.xml 2008-12-10 16:23:24 UTC (rev 1261) @@ -1,6 +1,5 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -15,7 +14,7 @@ </parent> <artifactId>topia-test</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.0</version> <dependencies> @@ -23,7 +22,7 @@ <dependency> <groupId>org.codelutin.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> + <version>2.1.0</version> <scope>compile</scope> </dependency> @@ -129,9 +128,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.1.0</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> </scm>

1 0

r1260 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 16:20:41 +0000 (Wed, 10 Dec 2008) New Revision: 1260 Modified: topia-test/trunk/changelog.txt topia-test/trunk/pom.xml Log: prepare release Modified: topia-test/trunk/changelog.txt =================================================================== --- topia-test/trunk/changelog.txt 2008-12-10 15:57:54 UTC (rev 1259) +++ topia-test/trunk/changelog.txt 2008-12-10 16:20:41 UTC (rev 1260) @@ -1,3 +1,3 @@ -2.0.28 ?? 200812?? +2.1.0 chemit 20081210 * 20081206 [chemit] - improve poms, use lutinproject 3.2 \ No newline at end of file Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-12-10 15:57:54 UTC (rev 1259) +++ topia-test/trunk/pom.xml 2008-12-10 16:20:41 UTC (rev 1260) @@ -15,15 +15,15 @@ </parent> <artifactId>topia-test</artifactId> - <version>2.0.28-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <dependencies>  <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -42,6 +42,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + </dependencies>  @@ -67,11 +74,8 @@  <labs.project>topia</labs.project> -  - <topia.version>2.0.27</topia.version> -  - <generator.version>0.62-SNAPSHOT</generator.version> + <generator.version>0.62</generator.version> </properties> <build> @@ -106,9 +110,9 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> <scope>compile</scope> </dependency> </dependencies>

1 0

r1259 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 15:57:54 +0000 (Wed, 10 Dec 2008) New Revision: 1259 Modified: topia-service/trunk/pom.xml Log: push back scm generic values Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-10 15:47:07 UTC (rev 1258) +++ topia-service/trunk/pom.xml 2008-12-10 15:57:54 UTC (rev 1259) @@ -167,9 +167,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> </project>

1 0

r1258 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 15:47:07 +0000 (Wed, 10 Dec 2008) New Revision: 1258 Modified: topia-service/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-10 15:47:04 UTC (rev 1257) +++ topia-service/trunk/pom.xml 2008-12-10 15:47:07 UTC (rev 1258) @@ -13,7 +13,7 @@ </parent> <artifactId>topia-service</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <dependencies> @@ -167,9 +167,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.0</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.0</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> </scm> </project>

1 0

r1257 - in topia-service/tags: . 1.0.0
by tchemit＠users.labs.libre-entreprise.org Dec. 10, 2008

Dec. 10, 2008

Author: tchemit Date: 2008-12-10 15:47:04 +0000 (Wed, 10 Dec 2008) New Revision: 1257 Added: topia-service/tags/1.0.0/ topia-service/tags/1.0.0/changelog.txt topia-service/tags/1.0.0/pom.xml Removed: topia-service/tags/1.0.0/changelog.txt topia-service/tags/1.0.0/pom.xml Log: [maven-release-plugin] copy for tag 1.0.0 Copied: topia-service/tags/1.0.0 (from rev 1250, topia-service/trunk) Deleted: topia-service/tags/1.0.0/changelog.txt =================================================================== --- topia-service/trunk/changelog.txt 2008-12-10 15:09:31 UTC (rev 1250) +++ topia-service/tags/1.0.0/changelog.txt 2008-12-10 15:47:04 UTC (rev 1257) @@ -1,34 +0,0 @@ -1.0 ?? 200812?? - * 20081205 [chemit] - improve poms, use lutinproject 3.2, migrate tests to JUnit4 - -0.9.1 - * [chatellier] Correction d'un bug de recherche de mapping sous windows (\) - -0.9 - * <chemit> use lutinproject 3.0 + clean pom + use topia 2.0.27 - * <poussin> modif dans service de migration pour permettre a l'app de - faire la migration via le callback - -0.8 - - * 20071120 [chatellier] update topia-service site - * 20071115 [chatellier] apply hibernate code style to open/close session and - transaction - * 20071115 [chatellier] refractoring separate specifique topia service - and real migration code - * 20071115 [chatellier] add schema existance detection support - and dont migrate if there is no table - * 20071111 [chatellier] add support for callback handler - * 20071111 [chatellier] use cascade to calculate dependencies order - * 20071109 [chatellier] change schema creation process to - correct duplicate foreign key creation - * 20071109 [chatellier] add inherit support to calculate dependancies - -0.6 ??? ??? - - * 20070426 [chatellier] use lutinutil.Resources.getUrls() to get mappings - * 20070426 [chatellier] change finder migration to use Class.forName() - * 20070420 [chatellier] remove the 'V' letter in old mapping directories name - * 20070420 [chatellier] add support to look for hibernate mapping in a tree - structure of directories - * 20070418 [chatellier] add migration service \ No newline at end of file Copied: topia-service/tags/1.0.0/changelog.txt (from rev 1251, topia-service/trunk/changelog.txt) =================================================================== --- topia-service/tags/1.0.0/changelog.txt (rev 0) +++ topia-service/tags/1.0.0/changelog.txt 2008-12-10 15:47:04 UTC (rev 1257) @@ -0,0 +1,34 @@ +1.0 chemit 20081210 + * 20081205 [chemit] - improve poms, use lutinproject 3.2, migrate tests to JUnit4 + +0.9.1 + * [chatellier] Correction d'un bug de recherche de mapping sous windows (\) + +0.9 + * <chemit> use lutinproject 3.0 + clean pom + use topia 2.0.27 + * <poussin> modif dans service de migration pour permettre a l'app de + faire la migration via le callback + +0.8 + + * 20071120 [chatellier] update topia-service site + * 20071115 [chatellier] apply hibernate code style to open/close session and + transaction + * 20071115 [chatellier] refractoring separate specifique topia service + and real migration code + * 20071115 [chatellier] add schema existance detection support + and dont migrate if there is no table + * 20071111 [chatellier] add support for callback handler + * 20071111 [chatellier] use cascade to calculate dependencies order + * 20071109 [chatellier] change schema creation process to + correct duplicate foreign key creation + * 20071109 [chatellier] add inherit support to calculate dependancies + +0.6 ??? ??? + + * 20070426 [chatellier] use lutinutil.Resources.getUrls() to get mappings + * 20070426 [chatellier] change finder migration to use Class.forName() + * 20070420 [chatellier] remove the 'V' letter in old mapping directories name + * 20070420 [chatellier] add support to look for hibernate mapping in a tree + structure of directories + * 20070418 [chatellier] add migration service \ No newline at end of file Deleted: topia-service/tags/1.0.0/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-12-10 15:09:31 UTC (rev 1250) +++ topia-service/tags/1.0.0/pom.xml 2008-12-10 15:47:04 UTC (rev 1257) @@ -1,176 +0,0 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.2</version> - </parent> - - <artifactId>topia-service</artifactId> - <version>1.0.0-SNAPSHOT</version> - - <dependencies> - -  - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>2.3.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.1.103</version> - <scope>test</scope> - </dependency> - - </dependencies> - -  -  -  - - <name>ToPIA Service</name> - <description> - ToPIA Service est une librairie de ToPIA pour la gestion de services. - </description> - <inceptionYear>2006</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - - <properties> -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> - -  - <topia.version>2.1.0-SNAPSHOT</topia.version> - -  - <generator.version>0.62-SNAPSHOT</generator.version> - -  - <lutinutil.version>0.31</lutinutil.version> - - </properties> - - <build> - - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> -  - <configuration> - <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>${maven.gen.dir}/java</destDirGen> - <defaultPackage>org.codelutin.topia</defaultPackage> - <extractedPackages>org.codelutin.topia.tass</extractedPackages> - <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <copyOverwrite>true</copyOverwrite> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - <goal>copyVersionFiles</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <phase>test-compile</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${maven.gen.dir}/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> Copied: topia-service/tags/1.0.0/pom.xml (from rev 1256, topia-service/trunk/pom.xml) =================================================================== --- topia-service/tags/1.0.0/pom.xml (rev 0) +++ topia-service/tags/1.0.0/pom.xml 2008-12-10 15:47:04 UTC (rev 1257) @@ -0,0 +1,175 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.2</version> + </parent> + + <artifactId>topia-service</artifactId> + <version>1.0.0</version> + + <dependencies> + +  + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>2.3.2</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.1.103</version> + <scope>test</scope> + </dependency> + + </dependencies> + +  +  +  + + <name>ToPIA Service</name> + <description> + ToPIA Service est une librairie de ToPIA pour la gestion de services. + </description> + <inceptionYear>2006</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> + +  + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> + +  + <topia.version>2.1.0</topia.version> + +  + <generator.version>0.62</generator.version> + +  + <lutinutil.version>1.0</lutinutil.version> + + </properties> + + <build> + + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> +  + <configuration> + <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> + <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> + <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>${maven.gen.dir}/java</destDirGen> + <defaultPackage>org.codelutin.topia</defaultPackage> + <extractedPackages>org.codelutin.topia.tass</extractedPackages> + <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <copyOverwrite>true</copyOverwrite> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + <goal>copyVersionFiles</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${maven.gen.dir}/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.0</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-service/tags/1.0.0</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-service/t…</url> + </scm> + +</project>

1 0