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

r2774 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org 19 Jul '13

19 Jul '13

Author: athimel Date: 2013-07-19 17:21:11 +0200 (Fri, 19 Jul 2013) New Revision: 2774 Url: http://nuiton.org/projects/topia/repository/revisions/2774 Log: refs #2747 New method isPersisted has been added to TopiaEntity, link it with TopiaDAOImpl#delete Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-19 15:18:19 UTC (rev 2773) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-19 15:21:11 UTC (rev 2774) @@ -412,6 +412,7 @@ public void delete(E e) throws TopiaException { try { getSession().delete(e); + e.notifyDeleted(); getContext().getFiresSupport().warnOnDeleteEntity(e); } catch (HibernateException eee) { throw new TopiaException(eee);

1 0

r2773 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/persistence test/java/org/nuiton/topiatest/deletetest
by athimel＠users.nuiton.org 19 Jul '13

19 Jul '13

Author: athimel Date: 2013-07-19 17:18:19 +0200 (Fri, 19 Jul 2013) New Revision: 2773 Url: http://nuiton.org/projects/topia/repository/revisions/2773 Log: Avoid any instruction on return statement (TopiaDaoImpl) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-19 14:49:51 UTC (rev 2772) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-19 15:18:19 UTC (rev 2773) @@ -276,14 +276,16 @@ public <U extends TopiaEntity> List<U> findUsages(Class<U> type, E e) throws TopiaException { // must be implemented by specialized dao - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException( + "This method must be overided in generated DAO"); } @Override public Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E e) throws TopiaException { // must be implemented by specialized dao - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException( + "This method must be overided in generated DAO"); } @Override @@ -425,7 +427,8 @@ @Override public E findByTopiaId(String id) throws TopiaException { - return query(Restrictions.idEq(id)); + E result = query(Restrictions.idEq(id)); + return result; } @Override @@ -449,7 +452,8 @@ @Override public E findByProperties(Map<String, Object> properties) throws TopiaException { - return query(Restrictions.allEq(properties)); + E result = query(Restrictions.allEq(properties)); + return result; } @Override @@ -492,7 +496,8 @@ @Override public List<E> findAllByProperties(Map<String, Object> properties) throws TopiaException { - return queryAll(Restrictions.allEq(properties)); + List<E> result = queryAll(Restrictions.allEq(properties)); + return result; } private List<E> queryAll(Criterion criterion) throws TopiaException { @@ -674,13 +679,15 @@ Preconditions.checkNotNull(StringUtils.isNotBlank(hql)); Preconditions.checkArgument(hql.toUpperCase().trim().startsWith("SELECT COUNT(")); - return findByQuery(Long.class, hql, params); + Long result = findByQuery(Long.class, hql, params); + return result; } @Override public E findByQuery(String hql, Object... params) throws TopiaException { - return findByQuery(getEntityClass(), hql, params); + E result = findByQuery(getEntityClass(), hql, params); + return result; } @Override @@ -701,7 +708,8 @@ public List<E> findAllByQuery(String hql, Object... params) throws TopiaException { - return findAllByQuery(getEntityClass(), hql, params); + List<E> result = findAllByQuery(getEntityClass(), hql, params); + return result; } @Override @@ -719,14 +727,16 @@ @Override public Iterable<E> findAllLazyByQuery(String hql, Object... params) throws TopiaException { - return findAllLazyByQuery(batchSize, hql, params); + Iterable<E> result = findAllLazyByQuery(batchSize, hql, params); + return result; } @Override public <R> Iterable<R> findAllLazyByQuery(Class<R> type, String hql, Object... params) throws TopiaException { - return findAllLazyByQuery(type, batchSize, hql, params); + Iterable<R> result = findAllLazyByQuery(type, batchSize, hql, params); + return result; } @Override @@ -747,12 +757,13 @@ batchSize, hql, params); - return new Iterable<R>() { + Iterable<R> result = new Iterable<R>() { @Override public Iterator<R> iterator() { return iterator; } }; + return result; } @Override @@ -773,11 +784,12 @@ int startIndex, int endIndex, Object... params) throws TopiaException { - return findAllByQueryWithBound(getEntityClass(), + List<E> result = findAllByQueryWithBound(getEntityClass(), hql, startIndex, endIndex, params); + return result; } @Override @@ -806,10 +818,11 @@ TopiaPagerBean pager, Object... params) throws TopiaException { - return findAllByQueryAndPager(getEntityClass(), + List<E> result = findAllByQueryAndPager(getEntityClass(), hql, pager, params); + return result; } @Override @@ -829,8 +842,9 @@ * @return hibernate session * @throws TopiaException if any pb */ - Session getSession() throws TopiaException { - return getContext().getHibernate(); + protected Session getSession() throws TopiaException { + Session result = getContext().getHibernate(); + return result; } /** @@ -840,7 +854,7 @@ * @return the meta-data of the entity * @throws TopiaException if any pb */ - ClassMetadata getClassMetadata() throws TopiaException { + protected ClassMetadata getClassMetadata() throws TopiaException { ClassMetadata meta = getContext().getHibernateFactory() .getClassMetadata(entityClass); if (meta == null) { @@ -896,8 +910,9 @@ @Override public boolean hasNext() { - return data.hasNext() || // no more data - pager.getPageIndex() < pager.getPagesNumber(); + boolean result = data.hasNext() || // no more data + pager.getPageIndex() < pager.getPagesNumber(); + return result; } @Override Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2013-07-19 14:49:51 UTC (rev 2772) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2013-07-19 15:18:19 UTC (rev 2773) @@ -92,7 +92,7 @@ /** @deprecated since 3.0, will be removed in 3.1, unused */ @Deprecated String AGGREGATE = "aggregate"; - + /** * Unique technical Id of the entity. This id contains the full qualified * name of the entity interface. This id has also an index and his used to @@ -147,6 +147,24 @@ void setTopiaCreateDate(Date date); /** + * This method must be used to know if the current entity is present on the + * persistent support. If the entity is not yet persisted or if the entity + * has been removed, this method will return false. + * + * @return true if the entity is persisted and not yet deleted + * @since 3.0 + */ + boolean isPersisted(); + + /** + * Notifies the current entity instance than it has been removed from the + * persistent support. + * + * @since 3.0 + */ + void notifyDeleted(); + + /** * @return all object that must be deleted if this object is deleted * @throws TopiaException if any pb */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2013-07-19 14:49:51 UTC (rev 2772) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2013-07-19 15:18:19 UTC (rev 2773) @@ -56,6 +56,8 @@ protected Date topiaCreateDate = new Date(); + transient protected boolean deleted = false; + transient protected TopiaFiresSupport fireSupport; transient protected VetoableChangeSupport readVetoables; @@ -145,6 +147,20 @@ } @Override + public boolean isPersisted() { + // Is or was the entity persisted ? + boolean result = topiaId != null; + // Is the entity deleted ? + result &= !deleted; + return result; + } + + @Override + public void notifyDeleted() { + deleted = true; + } + + @Override public List<TopiaEntity> getComposite() throws TopiaException { throw new UnsupportedOperationException(); } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2013-07-19 14:49:51 UTC (rev 2772) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java 2013-07-19 15:18:19 UTC (rev 2773) @@ -40,12 +40,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topiatest.Gender; import org.nuiton.topiatest.Personne; import org.nuiton.topiatest.PersonneDAO; @@ -174,4 +176,31 @@ } + /** + * Test than deleting entities will modify isPersisted() result + */ + @Test + public void testIsPersisted() { + log.debug("START TEST : testIsPersisted"); + + TopiaContext transaction = db.beginTransaction(); + + PersonneDAO dao = TopiaTestDAOHelper.getPersonneDAO(transaction); + + Personne person = dao.newInstance(); + Assert.assertNull(person.getTopiaId()); + + person.setName("Arno"); + person.setGender(Gender.MALE); + Assert.assertFalse(person.isPersisted()); + + Personne person2 = dao.create(person); + Assert.assertTrue(person.isPersisted()); + Assert.assertTrue(person2.isPersisted()); + + dao.delete(person2); + Assert.assertFalse(person.isPersisted()); + Assert.assertFalse(person2.isPersisted()); + } + }

1 0

r2772 - trunk
by athimel＠users.nuiton.org 19 Jul '13

19 Jul '13

Author: athimel Date: 2013-07-19 16:49:51 +0200 (Fri, 19 Jul 2013) New Revision: 2772 Url: http://nuiton.org/projects/topia/repository/revisions/2772 Log: refs #2775 Update to mavenpom=2.4.13 ; nuiton-i18n=2.5.2 ; Hibernate=4.2.3.Final Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-19 13:34:57 UTC (rev 2771) +++ trunk/pom.xml 2013-07-19 14:49:51 UTC (rev 2772) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.11</version> + <version>3.4.13</version> </parent> <artifactId>topia</artifactId> @@ -61,10 +61,11 @@  <eugeneVersion>2.6.4-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <nuitonI18nVersion>2.5.1</nuitonI18nVersion> + <nuitonUtilsCsvVersion>2.6.12.1</nuitonUtilsCsvVersion>  + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <processorPluginVersion>1.3</processorPluginVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.2.2.Final</hibernateVersion> + <hibernateVersion>4.2.3.Final</hibernateVersion> <sl4jVersion>1.7.5</sl4jVersion> <h2Version>1.3.172</h2Version> <hamcrestVersion>1.3</hamcrestVersion> @@ -115,7 +116,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonUtilsCsvVersion}</version> </dependency> <dependency>

1 0

r2771 - in trunk: . topia-service-security topia-service-security/src/main/java/org/nuiton/topia/security/util topia-service-security/src/main/java/org/nuiton/topia/taas
by athimel＠users.nuiton.org 19 Jul '13

19 Jul '13

Author: athimel Date: 2013-07-19 15:34:57 +0200 (Fri, 19 Jul 2013) New Revision: 2771 Url: http://nuiton.org/projects/topia/repository/revisions/2771 Log: fixes #2501 Remove any sun.misc.* usage Modified: trunk/pom.xml trunk/topia-service-security/pom.xml trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-14 20:13:25 UTC (rev 2770) +++ trunk/pom.xml 2013-07-19 13:34:57 UTC (rev 2771) @@ -157,6 +157,12 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.8</version> + </dependency> +  Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-07-14 20:13:25 UTC (rev 2770) +++ trunk/topia-service-security/pom.xml 2013-07-19 13:34:57 UTC (rev 2771) @@ -63,6 +63,11 @@ </dependency> <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2013-07-14 20:13:25 UTC (rev 2770) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2013-07-19 13:34:57 UTC (rev 2771) @@ -37,6 +37,7 @@ package org.nuiton.topia.security.util; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -52,7 +53,6 @@ import org.nuiton.topia.security.entities.user.TopiaUser; import org.nuiton.topia.security.entities.user.TopiaUserImpl; import org.nuiton.topia.security.jaas.TopiaLoginModule; -import sun.misc.BASE64Encoder; import javax.security.auth.Subject; import java.security.AccessController; @@ -119,8 +119,7 @@ MessageDigest digest = MessageDigest.getInstance("SHA"); byte[] bytes = msg.getBytes(); bytes = digest.digest(bytes); - BASE64Encoder encoder = new sun.misc.BASE64Encoder(); - String msgHashed = encoder.encode(bytes); + String msgHashed = Base64.encodeBase64String(bytes); return msgHashed; } catch (NoSuchAlgorithmException nsee) { return msg; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2013-07-14 20:13:25 UTC (rev 2770) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2013-07-19 13:34:57 UTC (rev 2771) @@ -46,6 +46,7 @@ import javax.security.auth.Subject; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -95,8 +96,7 @@ MessageDigest digest = MessageDigest.getInstance("SHA"); byte[] bytes = msg.getBytes(); bytes = digest.digest(bytes); - sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder(); - String msgHashed = encoder.encode(bytes); + String msgHashed = Base64.encodeBase64String(bytes); return msgHashed; } catch (NoSuchAlgorithmException nsee) { return msg;

1 0

Jenkins build is back to normal : topia » ToPIA :: Service Replication #1503
by admin+hudson＠codelutin.com 15 Jul '13

15 Jul '13

See <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-repli…>

1 0

Jenkins build is back to normal : topia » ToPIA :: Service Security #1503
by admin+hudson＠codelutin.com 15 Jul '13

15 Jul '13

See <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-secur…>

1 0

Jenkins build is back to normal : topia » ToPIA :: Persistence #1503
by admin+hudson＠codelutin.com 15 Jul '13

15 Jul '13

See <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-persistence/1…>

1 0

Jenkins build is back to normal : topia » ToPIA :: Service Migration #1503
by admin+hudson＠codelutin.com 15 Jul '13

15 Jul '13

See <http://ci.nuiton.org/jenkins/job/topia/org.nuiton.topia$topia-service-migra…>

1 0

Jenkins build is back to normal : topia » ToPIA #1503
by admin+hudson＠codelutin.com 15 Jul '13

15 Jul '13

See <http://ci.nuiton.org/jenkins/job/topia/org.nuiton$topia/1503/>

1 0

Build failed in Jenkins: topia #1502
by admin+hudson＠codelutin.com 15 Jul '13

15 Jul '13

See <http://ci.nuiton.org/jenkins/job/topia/1502/changes> Changes: [Tony Chemit] refs #2751: Improve TopiaDAO create methods (test if id is not blanck instead of just not null) [Tony Chemit] refs #552: Clean api [Tony Chemit] fixes #2088: remove i18n from ToPIA [Tony Chemit] fixes #2759: Fix back behaviour before version 2.8 around TopiaUtil.isSchemaExist [Tony Chemit] fixes #2341: Add warning about 'analyze' keyword [Tony Chemit] fixes #2758: Improved TopiaConnectionProvider [Tony Chemit] fixes #2757: ConnectionProvider is not closed when closing root context [Tony Chemit] fixes #2755: Creating a schema should not droping it just before fixes #2756: Does not use hardcoded cast to hibernate implementation [Tony Chemit] fix javadoc [Tony Chemit] refs #2752: Add generics support on TopiaContext#find*() methods (add also on findUnique and findByTopiaId) fix migration doc ------------------------------------------ Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/topia/ws/> Updating http://svn.nuiton.org/svn/topia/trunk at revision '2013-07-14T11:37:08.759 +0200' U topia-service-security/pom.xml U topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java U topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java D topia-service-migration/src/main/resources/i18n U topia-service-migration/pom.xml U topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java U topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java U topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java D topia-service-replication/src/main/resources/i18n U topia-service-replication/pom.xml U src/site/rst/migrate_to_3.0.rst U pom.xml U topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java U topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java U topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java U topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java U topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java U topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java U topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java U topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java U topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java U topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java D topia-persistence/src/main/resources/i18n U topia-persistence/pom.xml At revision 2767 Parsing POMs Modules changed, recalculating dependency graph [trunk] $ /opt/jdk/bin/java -XX:MaxPermSize=256m -Xmx448m -Dhudson.DNSMultiCast.disabled=true -Djava.awt.headless=true -XX:-UseGCOverheadLimit -cp /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-agent-1.2.jar:/opt/maven3/boot/plexus-classworlds-2.4.jar org.jvnet.hudson.maven3.agent.Maven3Main /opt/maven3 /opt/repository/apache-tomcat-7.0.40/webapps/jenkins/WEB-INF/lib/remoting-2.23.jar /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-1.2.jar 32809 Error: Could not find or load main class org.jvnet.hudson.maven3.agent.Maven3Main ERROR: Failed to launch Maven. Exit code = 1

1 1