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

r1241 - in topia/trunk/topia-persistence/src/main/java: . org/codelutin/topia/persistence
by chemit＠users.labs.libre-entreprise.org 28 Nov '08

28 Nov '08

Author: chemit Date: 2008-11-28 13:13:02 +0000 (Fri, 28 Nov 2008) New Revision: 1241 Removed: topia/trunk/topia-persistence/src/main/java/topia/ Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java Log: not set topiaContext with create method (already done by dao) remove empty directories Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2008-11-21 11:54:32 UTC (rev 1240) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2008-11-28 13:13:02 UTC (rev 1241) @@ -28,7 +28,7 @@ return contractClass; } - @SuppressWarnings( { "unchecked" }) + @SuppressWarnings({"unchecked"}) public Class<T> getImplementationClass() { if (implementationClass == null) { try { @@ -51,10 +51,7 @@ public T create(TopiaContext ctxt) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); - T newInstance = dao.create(); - // attach topia context to entity (to allow propertyChangeSupport for entity) - ((TopiaEntityAbstract) newInstance).setTopiaContext(ctxt); - return newInstance; + return dao.create(); } public T create(TopiaContext ctxt, Object... properties) @@ -120,7 +117,7 @@ } public T findByProperties(TopiaContext ctxt, String propertyName, - Object value, Object... others) throws TopiaException { + Object value, Object... others) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findByProperties(propertyName, value, others); } @@ -132,43 +129,43 @@ } public List<T> findAllByProperty(TopiaContext ctxt, String propertyName, - Object value) throws TopiaException { + Object value) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllByProperty(propertyName, value); } public List<T> findAllByProperties(TopiaContext ctxt, String propertyName, - Object value, Object... others) throws TopiaException { + Object value, Object... others) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllByProperties(propertyName, value, others); } public List<T> findAllByProperties(TopiaContext ctxt, - Map<String, Object> properties) throws TopiaException { + Map<String, Object> properties) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllByProperties(properties); } public T findContainsProperties(TopiaContext ctxt, - Map<String, Collection> properties) throws TopiaException { + Map<String, Collection> properties) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findContainsProperties(properties); } public T findContainsProperties(TopiaContext ctxt, String propertyName, - Collection values, Object... others) throws TopiaException { + Collection values, Object... others) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findContainsProperties(propertyName, values, others); } public List<T> findAllContainsProperties(TopiaContext ctxt, - Map<String, Collection> properties) throws TopiaException { + Map<String, Collection> properties) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllContainsProperties(properties); } public List<T> findAllContainsProperties(TopiaContext ctxt, - String propertyName, Collection values, Object... others) + String propertyName, Collection values, Object... others) throws TopiaException { TopiaDAO<T> dao = getDAO(ctxt); return dao.findAllContainsProperties(propertyName, values, others);

1 0

r1240 - topia/trunk/topia-persistence/src/site/rst
by chatellier＠users.labs.libre-entreprise.org 21 Nov '08

21 Nov '08

Author: chatellier Date: 2008-11-21 11:54:32 +0000 (Fri, 21 Nov 2008) New Revision: 1240 Modified: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst Log: Correct configuration Modified: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst 2008-11-21 11:43:30 UTC (rev 1239) +++ topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst 2008-11-21 11:54:32 UTC (rev 1240) @@ -39,7 +39,7 @@ <id>Generator</id> <phase>generate-sources</phase> <configuration> - <srcDirZuml>src/main/xmi</srcDirZuml> + <srcDirUml>src/main/xmi</srcDirUml> <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> <fullPackagePath>org.company.package</fullPackagePath> <extractedPackages>org.company.package</extractedPackages>

1 0

r1239 - topia/trunk/topia-persistence/src/site/rst
by chatellier＠users.labs.libre-entreprise.org 21 Nov '08

21 Nov '08

Author: chatellier Date: 2008-11-21 11:43:30 +0000 (Fri, 21 Nov 2008) New Revision: 1239 Added: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst Log: Ajout d'un bout de doc pour configurer maven pour la generation des modeles Added: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst (rev 0) +++ topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst 2008-11-21 11:43:30 UTC (rev 1239) @@ -0,0 +1,84 @@ +Génération des modèles +---------------------- + +Le module "topia-persistence" de topia est capable de +générer la persistence à partir d'un modèle UML. + +Nous allons détailler ici comme inclure la génération dans le +cycle de compilation maven. + + +Architecture maven +------------------ + ++---------------------------------+-----------------------------------------+ +| src/main/xmi/mymodel.zargo | exemple de modele UML avec argoUML | ++---------------------------------+-----------------------------------------+ +| src/main/xmi/mymodel.properties | fichier de propriétés attaché au modele | ++---------------------------------|-----------------------------------------+ + + +Configuration du pom.xml +------------------------ + +Pour générer les sources dans la phase "generate-source" de maven, et utiliser +les sources générées, et faut configurer le pom. + +Plugin lutingenerator +===================== + +:: + +<plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> +  + <version>0.62</version> + <executions> + <execution> + <id>Generator</id> + <phase>generate-sources</phase> + <configuration> + <srcDirZuml>src/main/xmi</srcDirZuml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> + <fullPackagePath>org.company.package</fullPackagePath> + <extractedPackages>org.company.package</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.company.package</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>2.1.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</plugin> + + +Dépendances du projet +===================== + +Il faut enfin ajouter "topia-persistence" en dépendance du projet : + +:: + +<dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> +  + <version>2.1.0</version> + <scope>compile</scope> +</dependency> \ No newline at end of file

1 0

r1238 - in topia/trunk: . topia-persistence topia-soa topia-ui
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 09:54:33 +0000 (Wed, 19 Nov 2008) New Revision: 1238 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: Fix scm configuration Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-11-19 09:54:19 UTC (rev 1237) +++ topia/trunk/pom.xml 2008-11-19 09:54:33 UTC (rev 1238) @@ -94,6 +94,17 @@  <maven.test.skip>true</maven.test.skip> + +  + <maven.scm.url.child> + http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} + </maven.scm.url.child> + <maven.scm.developerConnection.child> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.developerConnection.child> + <maven.scm.connection.child> + scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.connection.child> </properties>  Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-11-19 09:54:19 UTC (rev 1237) +++ topia/trunk/topia-persistence/pom.xml 2008-11-19 09:54:33 UTC (rev 1238) @@ -78,18 +78,6 @@  <packaging>jar</packaging> - - <properties> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} - </maven.scm.url> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.developerConnection> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.connection> - </properties> <build> <plugins> @@ -106,9 +94,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2008-11-19 09:54:19 UTC (rev 1237) +++ topia/trunk/topia-soa/pom.xml 2008-11-19 09:54:33 UTC (rev 1238) @@ -99,18 +99,6 @@  <packaging>jar</packaging> - - <properties> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} - </maven.scm.url> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.developerConnection> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.connection> - </properties> <build> <plugins> @@ -127,9 +115,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2008-11-19 09:54:19 UTC (rev 1237) +++ topia/trunk/topia-ui/pom.xml 2008-11-19 09:54:33 UTC (rev 1238) @@ -51,18 +51,6 @@  <packaging>jar</packaging> - - <properties> - <maven.scm.url> - http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} - </maven.scm.url> - <maven.scm.developerConnection> - scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.developerConnection> - <maven.scm.connection> - scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} - </maven.scm.connection> - </properties> <build> <plugins> @@ -79,9 +67,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + <url>${maven.scm.url.child}</url> </scm> </project>

1 0

r1237 - in topia/trunk: topia-soa/src topia-ui/src
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 09:54:19 +0000 (Wed, 19 Nov 2008) New Revision: 1237 Added: topia/trunk/topia-soa/src/site/ topia/trunk/topia-ui/src/site/ Log: Add child site structure

1 0

r1236 - in topia/trunk: . src src/site src/site/fr src/site/fr/rst
by chatellier＠users.labs.libre-entreprise.org 19 Nov '08

19 Nov '08

Author: chatellier Date: 2008-11-19 09:47:24 +0000 (Wed, 19 Nov 2008) New Revision: 1236 Added: topia/trunk/src/ topia/trunk/src/site/ topia/trunk/src/site/fr/ topia/trunk/src/site/fr/rst/ topia/trunk/src/site/fr/rst/index.rst topia/trunk/src/site/site.xml Log: Add parent site Added: topia/trunk/src/site/fr/rst/index.rst =================================================================== --- topia/trunk/src/site/fr/rst/index.rst (rev 0) +++ topia/trunk/src/site/fr/rst/index.rst 2008-11-19 09:47:24 UTC (rev 1236) @@ -0,0 +1,17 @@ +ToPIA +===== + +Présentation +------------ + +ToPIA, pour Tools for Portable and Independant Architecture, est un framework +d'abstraction des plateformes techniques. + +Constitution +------------ + +Il est actuellement composé de 3 modules : + + * topia-persistence : pour la gestion de la persistance sur hibernate + * topia-soa : pour le développement orienté service + * topia-ui : pour la génération des interfaces \ No newline at end of file Property changes on: topia/trunk/src/site/fr/rst/index.rst ___________________________________________________________________ Name: svn:executable + * Added: topia/trunk/src/site/site.xml =================================================================== --- topia/trunk/src/site/site.xml (rev 0) +++ topia/trunk/src/site/site.xml 2008-11-19 09:47:24 UTC (rev 1236) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.1</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + </links> + + <menu ref="parent"/> + + </body> +</project>

1 0

r1235 - topia-service/trunk
by chemit＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chemit Date: 2008-11-18 16:53:19 +0000 (Tue, 18 Nov 2008) New Revision: 1235 Modified: topia-service/trunk/pom.xml Log: invalid addCompileDirectory property in generator plugin Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-11-18 16:43:41 UTC (rev 1234) +++ topia-service/trunk/pom.xml 2008-11-18 16:53:19 UTC (rev 1235) @@ -99,7 +99,6 @@ <phase>generate-sources</phase>  <configuration> - <addCompileDirectory>true</addCompileDirectory> <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest>

1 0

r1234 - topia/trunk/topia-soa
by chatellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chatellier Date: 2008-11-18 16:43:41 +0000 (Tue, 18 Nov 2008) New Revision: 1234 Modified: topia/trunk/topia-soa/pom.xml Log: Add scm config Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2008-11-18 16:43:32 UTC (rev 1233) +++ topia/trunk/topia-soa/pom.xml 2008-11-18 16:43:41 UTC (rev 1234) @@ -100,6 +100,18 @@ <packaging>jar</packaging> + <properties> + <maven.scm.url> + http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} + </maven.scm.url> + <maven.scm.developerConnection> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.developerConnection> + <maven.scm.connection> + scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.connection> + </properties> + <build> <plugins>

1 0

r1233 - topia/trunk/topia-ui
by chatellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chatellier Date: 2008-11-18 16:43:32 +0000 (Tue, 18 Nov 2008) New Revision: 1233 Modified: topia/trunk/topia-ui/pom.xml Log: Add scm config Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2008-11-18 16:42:25 UTC (rev 1232) +++ topia/trunk/topia-ui/pom.xml 2008-11-18 16:43:32 UTC (rev 1233) @@ -52,6 +52,18 @@ <packaging>jar</packaging> + <properties> + <maven.scm.url> + http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} + </maven.scm.url> + <maven.scm.developerConnection> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.developerConnection> + <maven.scm.connection> + scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.connection> + </properties> + <build> <plugins>

1 0

r1232 - topia/trunk/topia-persistence
by chatellier＠users.labs.libre-entreprise.org 18 Nov '08

18 Nov '08

Author: chatellier Date: 2008-11-18 16:42:25 +0000 (Tue, 18 Nov 2008) New Revision: 1232 Modified: topia/trunk/topia-persistence/pom.xml Log: Add missing slf4j impl used by hibernate Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2008-11-18 14:21:49 UTC (rev 1231) +++ topia/trunk/topia-persistence/pom.xml 2008-11-18 16:42:25 UTC (rev 1232) @@ -42,13 +42,19 @@ <version>3.3.1.GA</version> <scope>compile</scope> </dependency> - <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>3.4.GA</version> <scope>runtime</scope> </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.2</version> + <scope>runtime</scope> + </dependency>  <dependency> @@ -73,6 +79,18 @@ <packaging>jar</packaging> + <properties> + <maven.scm.url> + http://${labs.host}/plugins/scmsvn/viewcvs.php/${labs.project}/trunk/${pom.artifactId}/?root=${labs.project} + </maven.scm.url> + <maven.scm.developerConnection> + scm:svn:svn+ssh://${username}@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.developerConnection> + <maven.scm.connection> + scm:svn:svn://anonymous@${labs.host}/svnroot/${labs.project}/${labs.project}/trunk/${pom.artifactId} + </maven.scm.connection> + </properties> + <build> <plugins> @@ -93,4 +111,5 @@ <url>${maven.scm.url}</url> </scm> + </project>

1 0