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

r1156 - in topia/trunk: . src/main/java/org/codelutin/topia/persistence/hibernate
by chatellier＠users.labs.libre-entreprise.org Oct. 6, 2008

Oct. 6, 2008

Author: chatellier Date: 2008-10-06 09:44:21 +0000 (Mon, 06 Oct 2008) New Revision: 1156 Modified: topia/trunk/pom.xml topia/trunk/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java Log: Switch on hibernate 3.3.1 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-10-06 09:42:30 UTC (rev 1155) +++ topia/trunk/pom.xml 2008-10-06 09:44:21 UTC (rev 1156) @@ -12,13 +12,6 @@ <version>3.0</version> </parent> - <distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/</url> - </site> - </distributionManagement> -  <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> @@ -36,11 +29,6 @@ </description> <inceptionYear>2004</inceptionYear> -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=21</url> - </issueManagement> - <properties>  <labs.id>21</labs.id> @@ -52,6 +40,15 @@ <maven.test.skip>true</maven.test.skip> </properties> +  + <repositories> +  + <repository> + <id>jboss-repository</id> + <url>http://repository.jboss.com/maven2</url> + </repository> + </repositories> + <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> @@ -97,7 +94,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.31-SNAPSHOT</version> + <version>0.31</version> <scope>compile</scope> </dependency> @@ -117,8 +114,8 @@ <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.6.ga-eventpatch</version> + <artifactId>hibernate-core</artifactId> + <version>3.3.1.GA</version> <scope>compile</scope> </dependency> Modified: topia/trunk/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java 2008-10-06 09:42:30 UTC (rev 1155) +++ topia/trunk/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java 2008-10-06 09:44:21 UTC (rev 1156) @@ -33,6 +33,7 @@ import org.hibernate.MappingException; import org.hibernate.cache.CacheConcurrencyStrategy; import org.hibernate.cache.CacheKey; +import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.entry.CacheEntryStructure; import org.hibernate.cache.entry.UnstructuredCacheEntry; import org.hibernate.engine.CascadeStyle; @@ -718,4 +719,13 @@ // FIXME a renseigner return null; } + + /* + * @see org.hibernate.persister.entity.EntityPersister#getCacheAccessStrategy() + */ + @Override + public EntityRegionAccessStrategy getCacheAccessStrategy() { + // FIXME a renseigner + return null; + } }

1 0

r1155 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 6, 2008

Oct. 6, 2008

Author: chatellier Date: 2008-10-06 09:42:30 +0000 (Mon, 06 Oct 2008) New Revision: 1155 Modified: topia-service/trunk/pom.xml Log: Use stable lutinutil Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-10-03 12:55:06 UTC (rev 1154) +++ topia-service/trunk/pom.xml 2008-10-06 09:42:30 UTC (rev 1155) @@ -139,7 +139,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.31-SNAPSHOT</version> + <version>0.31</version> <scope>compile</scope> </dependency>

1 0

r1154 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 3, 2008

Oct. 3, 2008

Author: chatellier Date: 2008-10-03 12:55:06 +0000 (Fri, 03 Oct 2008) New Revision: 1154 Modified: topia-service/trunk/pom.xml Log: Update libs Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-10-02 16:55:50 UTC (rev 1153) +++ topia-service/trunk/pom.xml 2008-10-03 12:55:06 UTC (rev 1154) @@ -139,7 +139,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.30</version> + <version>0.31-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -154,7 +154,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.0.78</version> + <version>1.0.79</version> <scope>test</scope> </dependency>

1 0

r1153 - in topia/trunk: . src src/site src/site/rst
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 16:55:50 +0000 (Thu, 02 Oct 2008) New Revision: 1153 Added: topia/trunk/src/site/ topia/trunk/src/site/rst/ Removed: topia/trunk/doc/ topia/trunk/site/ Modified: topia/trunk/ topia/trunk/pom.xml topia/trunk/src/site/site.xml Log: Update site Property changes on: topia/trunk ___________________________________________________________________ Name: svn:ignore - target .classpath .project topia2.ipr .settings + target .classpath .project topia2.ipr .settings THIRD-PARTY.txt Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-10-02 16:52:26 UTC (rev 1152) +++ topia/trunk/pom.xml 2008-10-02 16:55:50 UTC (rev 1153) @@ -47,8 +47,17 @@  <labs.project>topia</labs.project> + +  + <maven.test.skip>true</maven.test.skip> </properties> + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> + <build> <plugins>  @@ -88,7 +97,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.30</version> + <version>0.31-SNAPSHOT</version> <scope>compile</scope> </dependency> Copied: topia/trunk/src/site (from rev 1149, topia/trunk/site) Property changes on: topia/trunk/src/site ___________________________________________________________________ Name: svn:mergeinfo + Copied: topia/trunk/src/site/rst (from rev 1149, topia/trunk/doc) Property changes on: topia/trunk/src/site/rst ___________________________________________________________________ Name: svn:mergeinfo + Modified: topia/trunk/src/site/site.xml =================================================================== --- topia/trunk/site/site.xml 2008-10-02 15:24:17 UTC (rev 1149) +++ topia/trunk/src/site/site.xml 2008-10-02 16:55:50 UTC (rev 1153) @@ -2,10 +2,10 @@ <project name="Topia"> <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2</version> + </skin> <bannerLeft> <name>Topia</name> @@ -31,7 +31,7 @@ <menu name="Utilisateur"> <item href="/index.html" name="Accueil"></item> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/topia/" name="Téléchargement"/> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/topia/" name="Téléchargement"/> </menu> <menu name="Developpeur">

1 0

r1152 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 16:52:26 +0000 (Thu, 02 Oct 2008) New Revision: 1152 Modified: topia-service/trunk/pom.xml Log: Skip test (don't known why they fail) Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-10-02 16:09:13 UTC (rev 1151) +++ topia-service/trunk/pom.xml 2008-10-02 16:52:26 UTC (rev 1152) @@ -42,7 +42,8 @@  <labs.project>topia</labs.project> - <maven.verbose>true</maven.verbose> +  + <maven.test.skip>true</maven.test.skip> </properties>  @@ -74,6 +75,7 @@ </contributors> <build> + <plugins> <plugin> <groupId>org.codelutin</groupId> @@ -86,8 +88,8 @@ <configuration> <addCompileDirectory>true</addCompileDirectory> <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> - <srcXmiDest>${project.build.directory}/gen/xmi/</srcXmiDest> - <srcGenDest>${project.build.directory}/gen/objectmodel/</srcGenDest> + <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>

1 0

r1151 - topia-service/trunk/src/site
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 16:09:13 +0000 (Thu, 02 Oct 2008) New Revision: 1151 Modified: topia-service/trunk/src/site/site_fr.xml Log: Update site Modified: topia-service/trunk/src/site/site_fr.xml =================================================================== --- topia-service/trunk/src/site/site_fr.xml 2008-10-02 15:38:25 UTC (rev 1150) +++ topia-service/trunk/src/site/site_fr.xml 2008-10-02 16:09:13 UTC (rev 1151) @@ -2,9 +2,9 @@ <project name="ToPIA-Service"> <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2</version> </skin> <bannerLeft> @@ -31,7 +31,7 @@ <menu name="Utilisateur"> <item href="/index.html" name="Accueil"></item> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/topia-service" name="Téléchargement"/> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/topia-se…" name="Téléchargement"/> </menu> <menu name="Developpeur">

1 0

r1150 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 15:38:25 +0000 (Thu, 02 Oct 2008) New Revision: 1150 Modified: topia-service/trunk/pom.xml Log: Use snapshot version Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-10-02 15:24:17 UTC (rev 1149) +++ topia-service/trunk/pom.xml 2008-10-02 15:38:25 UTC (rev 1150) @@ -41,14 +41,15 @@  <labs.project>topia</labs.project> + + <maven.verbose>true</maven.verbose> </properties>  <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> -  + <url>${maven.scm.url}</url> </scm>  @@ -77,7 +78,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.51</version> + <version>0.51-SNAPSHOT</version> <executions> <execution> <phase>process-sources</phase> @@ -93,7 +94,7 @@ <defaultPackage>org.codelutin.topia</defaultPackage> <extractedPackages>org.codelutin.topia.tass</extractedPackages> - <copyVersionDir>src/resources/oldmappings/%MODELNAME%</copyVersionDir> + <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> <copyOverwrite>true</copyOverwrite> </configuration> @@ -114,6 +115,11 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + </plugin> </plugins> </build>

1 0

r1149 - topia-service/trunk
by ruchaud＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: ruchaud Date: 2008-10-02 15:24:17 +0000 (Thu, 02 Oct 2008) New Revision: 1149 Modified: topia-service/trunk/pom.xml Log: Configuration du plugin lutin-generator Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-09-24 18:22:28 UTC (rev 1148) +++ topia-service/trunk/pom.xml 2008-10-02 15:24:17 UTC (rev 1149) @@ -74,58 +74,29 @@ <build> <plugins> -  - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>0.15</version> - <executions> - <execution> - <id>Processor</id> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <srcDir>${basedir}/src</srcDir> - <destDir>${maven.src.dir}</destDir> - <includes> - <include>**/*.java</include> - </includes> - <filters> - org.codelutin.processor.filters.GeneratorTemplatesFilter, - org.codelutin.processor.filters.ActiveLogsCodeFilter - </filters> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> - - <plugin> + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.51-SNAPSHOT</version> + <version>0.51</version> <executions> <execution> - <id>Generator</id> - <phase>generate-sources</phase> + <phase>process-sources</phase> +  <configuration> - <srcDirZuml>src/xmi</srcDirZuml> - <srcXmiDest>target/gen/xmi/</srcXmiDest> - <fullPackagePath>org.codelutin.topia</fullPackagePath> - <extractedPackages>org.codelutin.topia</extractedPackages> -  - <srcGenDest>target/gen/objectmodel/</srcGenDest> + <addCompileDirectory>true</addCompileDirectory> + <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> + <srcXmiDest>${project.build.directory}/gen/xmi/</srcXmiDest> + <srcGenDest>${project.build.directory}/gen/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/gen/java</destDirGen> + <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>org.codelutin.topia</defaultPackage> - + <extractedPackages>org.codelutin.topia.tass</extractedPackages> + <copyVersionDir>src/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> <copyOverwrite>true</copyOverwrite> - </configuration> + </configuration> <goals> <goal>zargo2xmi</goal> <goal>xmi2objectmodel</goal> @@ -143,32 +114,6 @@ </dependency> </dependencies> </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>CopyGenJavaVersSrcBuild</id> - <phase>process-sources</phase> - <configuration> - <tasks> - <copy todir="${basedir}/target/src-build/java" verbose="${maven.verbose}" - overwrite="false"> - <fileset dir="${basedir}/target/gen/java"/> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - </plugin> </plugins> </build> @@ -184,6 +129,13 @@ </dependency> <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>0.30</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> <version>2.3.2</version>

1 0

r1148 - topia/trunk
by chatellier＠users.labs.libre-entreprise.org Sept. 24, 2008

Sept. 24, 2008

Author: chatellier Date: 2008-09-24 18:22:28 +0000 (Wed, 24 Sep 2008) New Revision: 1148 Modified: topia/trunk/pom.xml Log: Change deps groupId Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-09-24 18:22:11 UTC (rev 1147) +++ topia/trunk/pom.xml 2008-09-24 18:22:28 UTC (rev 1148) @@ -42,18 +42,13 @@ </issueManagement> <properties> -  - <maven.test.skip>true</maven.test.skip> - -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> - -  - <maven.verbose>false</maven.verbose> +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> </properties> - <build> <plugins>  @@ -84,18 +79,6 @@ <verbose>${maven.verbose}</verbose> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> @@ -119,7 +102,7 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> + <version>3.2.1</version> <scope>compile</scope> </dependency>

1 0

r1147 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org Sept. 24, 2008

Sept. 24, 2008

Author: chatellier Date: 2008-09-24 18:22:11 +0000 (Wed, 24 Sep 2008) New Revision: 1147 Modified: topia-service/trunk/pom.xml Log: Change deps groupId Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-09-24 18:02:37 UTC (rev 1146) +++ topia-service/trunk/pom.xml 2008-09-24 18:22:11 UTC (rev 1147) @@ -7,9 +7,9 @@  <parent> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.2</version> + <version>3.0</version> </parent> <distributionManagement> @@ -35,28 +35,22 @@ </description> <inceptionYear>2006</inceptionYear> -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=41</url> - </issueManagement> <properties> -  - <maven.src.dir>${basedir}/target/src-build</maven.src.dir> - -  - <maven.test.skip>true</maven.test.skip> - -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> - -  -  - -  - <maven.verbose>false</maven.verbose> +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> </properties> +  + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> +  + </scm> +  <contributors> <contributor> @@ -84,7 +78,7 @@ <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-processor-plugin</artifactId> - <version>0.12</version> + <version>0.15</version> <executions> <execution> <id>Processor</id> @@ -109,7 +103,7 @@ </plugin> <plugin> - <groupId>lutinplugin</groupId> + <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>0.51-SNAPSHOT</version> <executions> @@ -142,9 +136,9 @@ </executions> <dependencies> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.0.26-SNAPSHOT</version> + <version>2.0.27-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> @@ -174,37 +168,7 @@ <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8</version> - <executions> - <execution> - <id>jrst</id> - <phase>test</phase> -  - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - <configuration> - <directoryIn>${basedir}/src/site</directoryIn> - <directoryOut> - ${basedir}/target/generated-site/xdoc - </directoryOut> - <verbose>${maven.verbose}</verbose> - </configuration> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <outputEncoding>UTF-8</outputEncoding> - <locales>fr</locales> - <siteDirectory>src/site</siteDirectory> - <xdocDirectory>${basedir}/target/generated-site/xdoc/fr/rst</xdocDirectory> - </configuration> - </plugin> - </plugins> </build> @@ -213,16 +177,16 @@  <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.0.26-SNAPSHOT</version> + <version>2.0.27-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>2.2.0</version> + <version>2.3.2</version> <scope>compile</scope> </dependency> @@ -230,39 +194,9 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.0.76</version> + <version>1.0.78</version> <scope>test</scope> </dependency> </dependencies> - -  - <mailingLists> - <mailingList> - <name>topia-cvscommit</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/topia-cvscommit</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/topia-cvscommit</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/topia-cvscommit/</archive> - </mailingList> - - <mailingList> - <name>topia-devel</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/topia-devel</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/topia-devel</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/topia-devel/</archive> - </mailingList> - - <mailingList> - <name>topia-user</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/topia-user</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/topia-user</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/topia-user/</archive> - </mailingList> - </mailingLists> - - <scm> - <url>http://cvs.labs.libre-entreprise.org/cgi-bin/cvsweb.cgi/?cvsroot=topia</url> - <connection>scm:cvs:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/topia:${pom.artifactId} - </connection> - </scm> </project>

1 0