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

r1446 - topia/tags
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 07:58:05 +0000 (Mon, 11 May 2009) New Revision: 1446 Added: topia/tags/2.1.6/ Log: [maven-scm] copy for tag 2.1.6 Copied: topia/tags/2.1.6 (from rev 1445, topia/trunk)

1 0

r1445 - in topia/trunk: . topia-persistence topia-soa topia-ui
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 07:58:00 +0000 (Mon, 11 May 2009) New Revision: 1445 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: [maven-release-plugin] prepare release 2.1.6 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-05-11 07:56:10 UTC (rev 1444) +++ topia/trunk/pom.xml 2009-05-11 07:58:00 UTC (rev 1445) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.6-SNAPSHOT</version> + <version>2.1.6</version> <modules> <module>topia-persistence</module> @@ -243,9 +243,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/tags/2.1.6</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.6</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm>  Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-05-11 07:56:10 UTC (rev 1444) +++ topia/trunk/topia-persistence/pom.xml 2009-05-11 07:58:00 UTC (rev 1445) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6-SNAPSHOT</version> + <version>2.1.6</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -130,9 +130,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.6/topia-persistence</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.6/topia-persistence</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-05-11 07:56:10 UTC (rev 1444) +++ topia/trunk/topia-soa/pom.xml 2009-05-11 07:58:00 UTC (rev 1445) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6-SNAPSHOT</version> + <version>2.1.6</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -134,9 +134,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.6/topia-soa</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.6/topia-soa</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-05-11 07:56:10 UTC (rev 1444) +++ topia/trunk/topia-ui/pom.xml 2009-05-11 07:58:00 UTC (rev 1445) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6-SNAPSHOT</version> + <version>2.1.6</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -107,9 +107,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.6/topia-ui</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.6/topia-ui</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> </project>

1 0

r1444 - in topia/trunk: . topia-persistence/src/site topia-soa/src/site topia-ui/src/site
by tchemit＠users.labs.libre-entreprise.org 11 May '09

11 May '09

Author: tchemit Date: 2009-05-11 07:56:10 +0000 (Mon, 11 May 2009) New Revision: 1444 Modified: topia/trunk/changelog.txt topia/trunk/pom.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: * bump versions (lutinproject, lutinutil, lutinprocessor, maven-license-switcher-plugin) * use doxia-modules-jrst instead of maven-jrst-plugin * improve download section on site Modified: topia/trunk/changelog.txt =================================================================== --- topia/trunk/changelog.txt 2009-05-04 16:56:36 UTC (rev 1443) +++ topia/trunk/changelog.txt 2009-05-11 07:56:10 UTC (rev 1444) @@ -1,3 +1,11 @@ +2.2.0 + * migrate to nuiton + +2.1.6 chemit 20090511 + * bump versions (lutinproject, lutinutil, lutinprocessor, maven-license-switcher-plugin) + * use doxia-modules-jrst instead of maven-jrst-plugin + * improve download section on site + 2.1.5 chemit 20090420 * use lutinproject 3.5.3, doxia-module-jrst 1.0.0, maven-license-switcher 0.7, xom 1.1 * fix site (reports has disappeared) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-05-04 16:56:36 UTC (rev 1443) +++ topia/trunk/pom.xml 2009-05-11 07:56:10 UTC (rev 1444) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </parent> <artifactId>topia</artifactId> @@ -169,9 +169,9 @@  <generator.version>0.64</generator.version> - <processor.version>0.17</processor.version> - <lutinutil.version>1.0.4</lutinutil.version> - <license-switcher.version>0.7</license-switcher.version> + <processor.version>0.18</processor.version> + <lutinutil.version>1.0.6</lutinutil.version> + <topia.version>${project.version}</topia.version> <xmlrpc.version>3.1</xmlrpc.version> @@ -224,16 +224,12 @@ </plugin> <plugin> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <locales>fr</locales> - <siteDirectory>src/site</siteDirectory> - </configuration> + <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> <groupId>org.codelutin</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </dependency> </dependencies> </plugin> @@ -285,7 +281,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <version>0.8</version> <executions> <execution> <id>attach-licenses</id> Modified: topia/trunk/topia-persistence/src/site/site.xml =================================================================== --- topia/trunk/topia-persistence/src/site/site.xml 2009-05-04 16:56:36 UTC (rev 1443) +++ topia/trunk/topia-persistence/src/site/site.xml 2009-05-11 07:56:10 UTC (rev 1444) @@ -40,10 +40,12 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" - name="Télécharger la dernière version"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" - name="Voir toutes les versions"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> </menu> <menu name="Developpeur"> Modified: topia/trunk/topia-soa/src/site/site.xml =================================================================== --- topia/trunk/topia-soa/src/site/site.xml 2009-05-04 16:56:36 UTC (rev 1443) +++ topia/trunk/topia-soa/src/site/site.xml 2009-05-11 07:56:10 UTC (rev 1444) @@ -40,10 +40,12 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" - name="Télécharger la dernière version"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" - name="Voir toutes les versions"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> </menu> <menu name="Developpeur"> Modified: topia/trunk/topia-ui/src/site/site.xml =================================================================== --- topia/trunk/topia-ui/src/site/site.xml 2009-05-04 16:56:36 UTC (rev 1443) +++ topia/trunk/topia-ui/src/site/site.xml 2009-05-11 07:56:10 UTC (rev 1444) @@ -40,10 +40,12 @@ </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" - name="Télécharger la dernière version"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" - name="Voir toutes les versions"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> </menu> <menu ref="reports"/>

1 0

r1443 - in topia/trunk/topia-persistence: . src/main/java/org/codelutin/topia/persistence
by tchemit＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: tchemit Date: 2009-05-04 16:56:36 +0000 (Mon, 04 May 2009) New Revision: 1443 Removed: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java Modified: topia/trunk/topia-persistence/changelog.txt topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java Log: remove TopiaEntityEnumEntry use @Override in TopiaEntityAbstract Modified: topia/trunk/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2009-05-04 12:11:36 UTC (rev 1442) +++ topia/trunk/topia-persistence/changelog.txt 2009-05-04 16:56:36 UTC (rev 1443) @@ -1,3 +1,8 @@ +2.1.5 + +* 20090504 [chemit] - suppress deprecated class TopiaEntityEnumEntry + - improve TopiaEntityAbstract (fix javadoc, add @Override) + 2.1.4 xxxx 200903xx * 20090418 [chemit] - suppress deprecated generators - add a BeanGenerator Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java 2009-05-04 12:11:36 UTC (rev 1442) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java 2009-05-04 16:56:36 UTC (rev 1443) @@ -73,38 +73,42 @@ transient protected PropertyChangeSupport writeListeners = new PropertyChangeSupport( this); - /** + /* * (non-Javadoc) * * @see org.codelutin.topia.persistence.TopiaEntity#getTopiaId() */ + @Override public String getTopiaId() { return topiaId; } - /** + /* * (non-Javadoc) * * @see org.codelutin.topia.persistence.TopiaEntity#setTopiaId(String) */ + @Override public void setTopiaId(String v) { this.topiaId = v; } - /** + /* * (non-Javadoc) * * @see org.codelutin.topia.persistence.TopiaEntity#getTopiaVersion() */ + @Override public long getTopiaVersion() { return topiaVersion; } - /** + /* * (non-Javadoc) * * @see org.codelutin.topia.persistence.TopiaEntity#setTopiaVersion(long) */ + @Override public void setTopiaVersion(long v) { this.topiaVersion = v; } @@ -114,6 +118,7 @@ * * @see org.codelutin.topia.persistence.TopiaEntity#getTopiaCreateTime() */ + @Override public Date getTopiaCreateDate() { return topiaCreateDate; } @@ -123,21 +128,24 @@ * * @see org.codelutin.topia.persistence.TopiaEntity#setTopiaCreateTime(java.util.Date) */ + @Override public void setTopiaCreateDate(Date topiaCreateDate) { this.topiaCreateDate = topiaCreateDate; } - /** + /* * (non-Javadoc) * * @see org.codelutin.topia.persistence.TopiaEntity#getTopiaContext() */ + @Override public TopiaContext getTopiaContext() { return topiaContext; } /** * @param context The context to set. + * @throws TopiaException if any pb ? */ public void setTopiaContext(TopiaContext context) throws TopiaException { if (this.topiaContext == null) { @@ -147,6 +155,7 @@ } } + @Override public void postCreate() throws TopiaException { // do nothing by default } @@ -156,6 +165,7 @@ * * @see org.codelutin.topia.persistence.TopiaEntity#update() */ + @Override public void update() throws TopiaException { throw new UnsupportedOperationException(); } @@ -165,6 +175,7 @@ * * @see org.codelutin.topia.persistence.TopiaEntity#delete() */ + @Override public void delete() throws TopiaException { throw new UnsupportedOperationException(); } @@ -172,6 +183,7 @@ /* (non-Javadoc) * @see org.codelutin.topia.persistence.TopiaEntity#getComposite() */ + @Override public List<TopiaEntity> getComposite() throws TopiaException { throw new UnsupportedOperationException(); } @@ -179,6 +191,7 @@ /* (non-Javadoc) * @see org.codelutin.topia.persistence.TopiaEntity#getAggregate() */ + @Override public List<TopiaEntity> getAggregate() throws TopiaException { throw new UnsupportedOperationException(); } @@ -267,74 +280,90 @@ } } + @Override public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { writeListeners.addPropertyChangeListener(propertyName, listener); } + @Override public void addPropertyChangeListener(PropertyChangeListener listener) { writeListeners.addPropertyChangeListener(listener); } + @Override public void addVetoableChangeListener(String propertyName, VetoableChangeListener vetoable) { writeVetoables.addVetoableChangeListener(propertyName, vetoable); } + @Override public void addVetoableChangeListener(VetoableChangeListener vetoable) { writeVetoables.addVetoableChangeListener(vetoable); } + @Override public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { writeListeners.removePropertyChangeListener(propertyName, listener); } + @Override public void removePropertyChangeListener(PropertyChangeListener listener) { writeListeners.removePropertyChangeListener(listener); } + @Override public void removeVetoableChangeListener(String propertyName, VetoableChangeListener vetoable) { writeVetoables.removeVetoableChangeListener(propertyName, vetoable); } + @Override public void removeVetoableChangeListener(VetoableChangeListener vetoable) { writeVetoables.removeVetoableChangeListener(vetoable); } + @Override public void addPropertyListener(String propertyName, PropertyChangeListener listener) { readListeners.addPropertyChangeListener(propertyName, listener); } + @Override public void addPropertyListener(PropertyChangeListener listener) { readListeners.addPropertyChangeListener(listener); } + @Override public void addVetoableListener(String propertyName, VetoableChangeListener vetoable) { readVetoables.addVetoableChangeListener(propertyName, vetoable); } + @Override public void addVetoableListener(VetoableChangeListener vetoable) { readVetoables.addVetoableChangeListener(vetoable); } + @Override public void removePropertyListener(String propertyName, PropertyChangeListener listener) { readListeners.removePropertyChangeListener(propertyName, listener); } + @Override public void removePropertyListener(PropertyChangeListener listener) { readListeners.removePropertyChangeListener(listener); } + @Override public void removeVetoableListener(String propertyName, VetoableChangeListener vetoable) { readVetoables.removeVetoableChangeListener(propertyName, vetoable); } + @Override public void removeVetoableListener(VetoableChangeListener vetoable) { readVetoables.removeVetoableChangeListener(vetoable); } Deleted: 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 2009-05-04 12:11:36 UTC (rev 1442) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2009-05-04 16:56:36 UTC (rev 1443) @@ -1,178 +0,0 @@ -package org.codelutin.topia.persistence; - -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.framework.TopiaContextImplementor; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * @deprecated This class is used in deprecated generator {@link org.codelutin.topia.generator.EntityEnumGenerator} - * - * @author chemit */ -@Deprecated -public class TopiaEntityEnumEntry<T extends TopiaEntity> implements - java.io.Serializable { - - /** the contract class of the entity's type. */ - protected Class<T> contractClass; - - /** the concrete implementation class of the entity's type. */ - protected Class<T> implementationClass; - - private static final long serialVersionUID = 1L; - - public TopiaEntityEnumEntry(Class<T> contractClass) { - this.contractClass = contractClass; - } - - public Class<T> getContractClass() { - return contractClass; - } - - @SuppressWarnings({"unchecked"}) - public Class<T> getImplementationClass() { - if (implementationClass == null) { - try { - implementationClass = (Class<T>) Class.forName(contractClass - .getName() - + "Impl"); - } catch (ClassNotFoundException e) { - throw new IllegalArgumentException( - "could not find implementation for entity contract " - + contractClass); - } - } - return implementationClass; - } - - public TopiaDAO<T> getDAO(TopiaContext ctxt) throws TopiaException { - TopiaContextImplementor ci = (TopiaContextImplementor) ctxt; - return ci.getDAO(contractClass); - } - - public T create(TopiaContext ctxt) throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.create(); - } - - public T create(TopiaContext ctxt, Object... properties) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.create(properties); - } - - public T create(TopiaContext ctxt, Map<String, Object> properties) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.create(properties); - } - - public T update(T entity, TopiaContext ctxt) throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.update(entity); - } - - public void delete(T entity, TopiaContext ctxt) throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - dao.delete(entity); - } - - public int size(TopiaContext ctxt) throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.size(); - } - - public List<T> findAll(TopiaContext ctxt) throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findAll(); - } - - public List<T> findAllWithOrder(TopiaContext ctxt, String... propertyNames) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findAllWithOrder(propertyNames); - } - - public T findByTopiaId(String topiaId, TopiaContext ctxt) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findByTopiaId(topiaId); - } - - public T findByPrimaryKey(TopiaContext ctxt, Map<String, Object> keys) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findByPrimaryKey(keys); - } - - public T findByPrimaryKey(TopiaContext ctxt, Object... k) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findByPrimaryKey(k); - } - - public T findByProperty(TopiaContext ctxt, String propertyName, Object value) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findByProperty(propertyName, value); - } - - public T findByProperties(TopiaContext ctxt, String propertyName, - Object value, Object... others) throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findByProperties(propertyName, value, others); - } - - public T findByProperties(TopiaContext ctxt, Map<String, Object> properties) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findByProperties(properties); - } - - public List<T> findAllByProperty(TopiaContext ctxt, String propertyName, - 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 { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findAllByProperties(propertyName, value, others); - } - - public List<T> findAllByProperties(TopiaContext ctxt, - 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 { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findContainsProperties(properties); - } - - public T findContainsProperties(TopiaContext ctxt, String propertyName, - 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 { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findAllContainsProperties(properties); - } - - public List<T> findAllContainsProperties(TopiaContext ctxt, - String propertyName, Collection values, Object... others) - throws TopiaException { - TopiaDAO<T> dao = getDAO(ctxt); - return dao.findAllContainsProperties(propertyName, values, others); - } - -}

1 0

r1442 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by thimel＠users.labs.libre-entreprise.org 04 May '09

04 May '09

Author: thimel Date: 2009-05-04 12:11:36 +0000 (Mon, 04 May 2009) New Revision: 1442 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java Log: Add 'user' in class validations Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java 2009-04-30 14:06:48 UTC (rev 1441) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java 2009-05-04 12:11:36 UTC (rev 1442) @@ -78,26 +78,23 @@ model); attrValidator.addNameAndReason("next", "Le nom d'attribut \"next\" est incompatible avec HSQL"); - attrValidator - .addNameAndReason("value", + attrValidator.addNameAndReason("value", "Le nom d'attribut \"value\" est incompatible avec certains SGBD"); - attrValidator - .addNameAndReason("values", + attrValidator.addNameAndReason("values", "Le nom d'attribut \"values\" est incompatible avec certains SGBD"); - attrValidator - .addNameAndReason("begin", + attrValidator.addNameAndReason("begin", "Le nom d'attribut \"begin\" est incompatible avec certains SGBD"); - attrValidator - .addNameAndReason("end", + attrValidator.addNameAndReason("end", "Le nom d'attribut \"end\" est incompatible avec certains SGBD"); - attrValidator - .addNameAndReason("authorization", + attrValidator.addNameAndReason("authorization", "Le nom d'attribut \"authorization\" est incompatible avec certains SGBD"); validators.add(attrValidator); ClassNamesValidator classValidator = new ClassNamesValidator(model); classValidator.addNameAndReason("constraint", "Nom de classe incompatible avec certains SGBD"); + classValidator.addNameAndReason("user", + "Nom de classe incompatible avec certains SGBD"); validators.add(classValidator); validators.add(new TopiaJavaValidator(model));

1 0

r1441 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by thimel＠users.labs.libre-entreprise.org 30 Apr '09

30 Apr '09

Author: thimel Date: 2009-04-30 14:06:48 +0000 (Thu, 30 Apr 2009) New Revision: 1441 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java Log: Set deprecated on methods moved to eugene Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java 2009-04-29 15:25:52 UTC (rev 1440) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java 2009-04-30 14:06:48 UTC (rev 1441) @@ -29,28 +29,28 @@ package org.codelutin.topia.generator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + import org.apache.commons.lang.StringUtils; import org.codelutin.generator.Generator; import org.codelutin.generator.GeneratorUtil; import org.codelutin.generator.models.Model; import org.codelutin.generator.models.object.ObjectModel; +import org.codelutin.generator.models.object.ObjectModelAssociationClass; import org.codelutin.generator.models.object.ObjectModelAttribute; import org.codelutin.generator.models.object.ObjectModelClass; import org.codelutin.generator.models.object.ObjectModelElement; import org.codelutin.generator.models.object.ObjectModelInterface; import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; import org.codelutin.generator.models.object.ObjectModelParameter; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.Arrays; - /** Classe regroupant divers méthodes utiles pour la génération des entités */ public class TopiaGeneratorUtil extends GeneratorUtil { @@ -176,21 +176,17 @@ } /** - * Indique si l'élément spécifié dispose de documentation - * - * @param element l'élément à tester - * @return true s'il y a documentation, false sinon + * @see GeneratorUtil#hasDocumentation */ + @Deprecated public static boolean hasDocumentation(ObjectModelElement element) { return notEmpty(element.getDocumentation()); } /** - * Indique si la chaine de caratère n'est pas vide (null ou "") - * - * @param s la chaine de caractères à tester - * @return true si <code>s</code> n'est pas vide + * @see GeneratorUtil#notEmpty */ + @Deprecated public static boolean notEmpty(String s) { return (s != null && !"".equals(s)); } @@ -375,14 +371,9 @@ } /** - * Cherches et renvoie la valeur du tagvalue indique sur cet element, - * sinon sur le model. - * - * @param tagName le nom du tag - * @param element l'élément à tester - * @param model le modele utilisé - * @return la valeur du tagValue ou null + * @see GeneratorUtil#findTagValue */ + @Deprecated public static String findTagValue(String tagName, ObjectModelElement element, Model model) { if (element == null) {

1 0

r1440 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia
by fdesbois＠users.labs.libre-entreprise.org 29 Apr '09

29 Apr '09

Author: fdesbois Date: 2009-04-29 15:25:52 +0000 (Wed, 29 Apr 2009) New Revision: 1440 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java Log: Changement signature methode loadProperties Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java 2009-04-29 15:09:16 UTC (rev 1439) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java 2009-04-29 15:25:52 UTC (rev 1440) @@ -142,9 +142,8 @@ if (log.isInfoEnabled()) { log.info("Initialize of TopiaContext..."); } - Properties conf = new Properties(); try { - conf = loadProperties(conf); + Properties conf = loadProperties(); this.globalContext = TopiaContextFactory.getContext(conf); this.init = true; @@ -172,7 +171,7 @@ * @throws java.io.IOException * @throws java.net.URISyntaxException */ - protected abstract Properties loadProperties(Properties props) throws IOException, URISyntaxException; + protected abstract Properties loadProperties() throws IOException, URISyntaxException; /** * Chargement d'un fichier de propriété

1 0

r1439 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia
by fdesbois＠users.labs.libre-entreprise.org 29 Apr '09

29 Apr '09

Author: fdesbois Date: 2009-04-29 15:09:16 +0000 (Wed, 29 Apr 2009) New Revision: 1439 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java Log: Ajout retour a la methode loadProperties Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java 2009-04-28 16:28:49 UTC (rev 1438) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java 2009-04-29 15:09:16 UTC (rev 1439) @@ -144,7 +144,7 @@ } Properties conf = new Properties(); try { - loadProperties(conf); + conf = loadProperties(conf); this.globalContext = TopiaContextFactory.getContext(conf); this.init = true; @@ -172,7 +172,7 @@ * @throws java.io.IOException * @throws java.net.URISyntaxException */ - protected abstract void loadProperties(Properties props) throws IOException, URISyntaxException; + protected abstract Properties loadProperties(Properties props) throws IOException, URISyntaxException; /** * Chargement d'un fichier de propriété

1 0

r1438 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia
by fdesbois＠users.labs.libre-entreprise.org 28 Apr '09

28 Apr '09

Author: fdesbois Date: 2009-04-28 16:28:49 +0000 (Tue, 28 Apr 2009) New Revision: 1438 Added: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java Log: Outil pour faciliter la manipulation des transactions Topia ainsi que le chargement des propri?\195?\169t?\195?\169s Added: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java (rev 0) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java 2009-04-28 16:28:49 UTC (rev 1438) @@ -0,0 +1,261 @@ +/* *##% 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>. ##%*/ + +package org.codelutin.topia; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.util.Resource; + + /** + * ContextUtil.java + * + * Created: 17 avril 2009 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Revision: 1334 $ + * + * Outil pour la manipulation de la base de données et des contextes Topia + * Utilisation recommandé (Patron Singleton) : + * ------------------------------------------- + * + * public ContextUtilProject extends ContextUtil { + * + * private static ContextUtil instance = null; + * + * public static ContextUtil getInstance() { + * if(instance == null) { + * instance = new ContextUtilProject(); + * } + * return instance; + * } + * + * private ContextUtilProject() { + * super(ContextUtilProject.class); + * } + * + * @Override + * public void loadProperties(Properties props) throws IOException, URISyntaxException { + * loadFileProperties("TopiaContextImpl.properties",props); + * props.setProperty("topia.persistence.classes", ProjectModelDAOHelper.getImplementationClassesAsString()); + * } + * + * @Override // Initialisation BD à chaque création du contexte global + * protected void initDB() throws TopiaException { + * + * } + * + * } + * + * Utilisation de la transaction courante : + * ---------------------------------------- + * + * // Déclaration du contexte + * ContextUtil context = ContextUtilProject.getInstance(); + * + * // Récupération du dao avec transaction courante + * ObjectDAO dao = ProjectModelDAOHelper.getObjectDAO(context.transaction()); + * + * ... // traitement avec dao + * + * context.commit(); + * + * ... // traitement avec dao + * + * context.commit(); + * + * context.close(); + * + * Utilisation dans les tests unitaires : + * ------------------------------------ + * + * @BeforeClass + * public static void setUpClass() throws Exception { + * ContextUtilProject.getInstance().init(); + * } + * + * @AfterClass + * public static void tearDownClass() throws Exception { + * ContextUtilProject.getInstance().disconnect(); + * } + */ +public abstract class ContextUtil { + + /** + * Vérifie l'initialisation + */ + private boolean init; + + private static Log log = LogFactory.getLog(ContextUtil.class); + + /** + * Contexte global + */ + private TopiaContext globalContext; + + /** + * Transaction courante + */ + private TopiaContext currTransaction; + + /** + * Constructeur avec Class correspondant à la sous-classe qui hérite de ContextUtil + * @param current + */ + protected ContextUtil(Class current) { + ContextUtil.log = LogFactory.getLog(current); + init(); + } + + protected ContextUtil() { + init(); + } + + /** + * Initialisation du TopiaContext global + * loadProperties est définit par les sous-classes pour + * charger le fichier de configuration et les classes pour Hibernate + * Une initialisation de la base de données est possible via la méthode + * initDB() à redéfinir par les sous-classes + */ + public void init() { + if (!this.init) { + if (log.isInfoEnabled()) { + log.info("Initialize of TopiaContext..."); + } + Properties conf = new Properties(); + try { + loadProperties(conf); + + this.globalContext = TopiaContextFactory.getContext(conf); + this.init = true; + if (log.isInfoEnabled()) { + log.info("Context Ready ! Initialize DB if needed..."); + } + this.initDB(); + } catch (Exception ex) { + log.error("Initialize error !!",ex); + } + } + } + + /** + * Initialisation de la base de données à redéfinir + * @throws org.codelutin.topia.TopiaException + */ + protected void initDB() throws TopiaException { + + } + + /** + * Chargement du ou des fichiers de propriétés nécessaires à Topia + * @param props + * @throws java.io.IOException + * @throws java.net.URISyntaxException + */ + protected abstract void loadProperties(Properties props) throws IOException, URISyntaxException; + + /** + * Chargement d'un fichier de propriété + * @param filename nom du fichier + * @param props propriétés à charger + * @throws java.net.URISyntaxException + * @throws java.io.IOException + */ + protected void loadFileProperties(String filename, Properties props) + throws URISyntaxException, IOException { + URL url = Resource.getURL(filename); + if (log.isDebugEnabled()) { + log.debug(url); + } + props.load(url.openStream()); + } + + public boolean isInit() { + return this.init; + } + + /** + * Retourne le contexte global pour créer les transactions + * @return Le contexte global + */ + public TopiaContext getContext() { + if (!this.init) { + this.init(); + } + return this.globalContext; + } + + /** + * Fermeture de la connexion à la BD + */ + public void disconnect() { + try { + if (this.init) { + this.globalContext.closeContext(); + if (log.isInfoEnabled()) { + log.info("Context closed"); + } + this.init = false; + } + } catch (TopiaException ex) { + log.error("Disconnect error !!",ex); + } + } + + /** + * Récupération transaction courante (ou création) + * @return + * @throws org.codelutin.topia.TopiaException + */ + public TopiaContext transaction() throws TopiaException { + if (!this.init) { + this.init(); + } + if (this.currTransaction == null || this.currTransaction.isClosed()) { + this.currTransaction = this.globalContext.beginTransaction(); + } + return this.currTransaction; + } + + /** + * Commit de la transaction courante + * @throws org.codelutin.topia.TopiaException + */ + public void commit() throws TopiaException { + this.transaction().commitTransaction(); + } + + public void rollback() throws TopiaException { + this.transaction().rollbackTransaction(); + } + + /** + * Fermeture de la transaction courante + * @throws org.codelutin.topia.TopiaException + */ + public void close() throws TopiaException { + if (this.init && this.currTransaction != null) { + this.currTransaction.closeContext(); + } + } +}

1 0

r1437 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 21 Apr '09

21 Apr '09

Author: tchemit Date: 2009-04-21 09:15:55 +0000 (Tue, 21 Apr 2009) New Revision: 1437 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/BeanGenerator.java Log: ajout commentaires Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/BeanGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/BeanGenerator.java 2009-04-20 14:39:09 UTC (rev 1436) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/BeanGenerator.java 2009-04-21 09:15:55 UTC (rev 1437) @@ -77,6 +77,9 @@ if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN)) { return; } + // + // première phase : calcul des variables + // String copyright = TopiaGeneratorUtil.getCopyright(model); String clazzName = clazz.getName(); String abstractStr = isAbstract(clazz)?"abstract ":" "; @@ -154,6 +157,11 @@ java.util.Collections.sort(attributes,comp); java.util.Collections.sort(multipleAttr,comp); } + + // + // seconde phase : génération + // + if (TopiaGeneratorUtil.notEmpty(copyright)) { /*{<%=copyright%> }*/

1 0