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

r2651 - in tags: . topia-2.6.13
by maven-release＠users.nuiton.org 27 Aug '12

27 Aug '12

Author: maven-release Date: 2012-08-27 19:45:36 +0200 (Mon, 27 Aug 2012) New Revision: 2651 Url: http://nuiton.org/repositories/revision/topia/2651 Log: [maven-release-plugin] copy for tag topia-2.6.13 Added: tags/topia-2.6.13/ Property changes on: tags/topia-2.6.13 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2650 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 27 Aug '12

27 Aug '12

Author: maven-release Date: 2012-08-27 19:45:34 +0200 (Mon, 27 Aug 2012) New Revision: 2650 Url: http://nuiton.org/repositories/revision/topia/2650 Log: [maven-release-plugin] prepare release topia-2.6.13 Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-service-migration/pom.xml branches/topia-2.6.x/topia-service-replication/pom.xml branches/topia-2.6.x/topia-service-security/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-08-27 17:41:45 UTC (rev 2649) +++ branches/topia-2.6.x/pom.xml 2012-08-27 17:45:34 UTC (rev 2650) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.13-SNAPSHOT</version> + <version>2.6.13</version> <modules> <module>topia-persistence</module> @@ -452,9 +452,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6.x</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.13</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.13</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.13</url> </scm> <distributionManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-08-27 17:41:45 UTC (rev 2649) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-08-27 17:45:34 UTC (rev 2650) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.13-SNAPSHOT</version> + <version>2.6.13</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-08-27 17:41:45 UTC (rev 2649) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-08-27 17:45:34 UTC (rev 2650) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.13-SNAPSHOT</version> + <version>2.6.13</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-08-27 17:41:45 UTC (rev 2649) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-08-27 17:45:34 UTC (rev 2650) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.13-SNAPSHOT</version> + <version>2.6.13</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-security/pom.xml 2012-08-27 17:41:45 UTC (rev 2649) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2012-08-27 17:45:34 UTC (rev 2650) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.13-SNAPSHOT</version> + <version>2.6.13</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2649 - in branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia: . framework
by echatellier＠users.nuiton.org 27 Aug '12

27 Aug '12

Author: echatellier Date: 2012-08-27 19:41:45 +0200 (Mon, 27 Aug 2012) New Revision: 2649 Url: http://nuiton.org/repositories/revision/topia/2649 Log: fixes #2284 : Add clearCache method on topia context to clear hibernate cache Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-08-23 15:27:31 UTC (rev 2648) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2012-08-27 17:41:45 UTC (rev 2649) @@ -363,6 +363,13 @@ void clear(boolean dropDatabase) throws TopiaException; /** + * Clear persistence implementation cache. + * + * @since 2.6.13 + */ + void clearCache() throws TopiaException; + + /** * l'inverse de la methode {@link #backup(File,boolean)}. * * @param file le fichier ou prendre les informations, il peut-etre Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-08-23 15:27:31 UTC (rev 2648) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-08-27 17:41:45 UTC (rev 2649) @@ -1400,7 +1400,18 @@ } } + /** + * Clear hibernate cache to free memory. + * + * @see http://docs.jboss.org/hibernate/orm/3.5/reference/en-US/html/transactions.h… + * @since 2.6.13 + */ @Override + public void clearCache() throws TopiaException { + getHibernate().clear(); + } + + @Override public List<Class<?>> getPersistenceClasses() { return persistenceClasses; }

1 0

r2648 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: maven-release Date: 2012-08-23 17:27:31 +0200 (Thu, 23 Aug 2012) New Revision: 2648 Url: http://nuiton.org/repositories/revision/topia/2648 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-service-migration/pom.xml branches/topia-2.6.x/topia-service-replication/pom.xml branches/topia-2.6.x/topia-service-security/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-08-23 15:27:29 UTC (rev 2647) +++ branches/topia-2.6.x/pom.xml 2012-08-23 15:27:31 UTC (rev 2648) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.12</version> + <version>2.6.13-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -452,9 +452,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.12</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.12</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.12</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6.x</url> </scm> <distributionManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-08-23 15:27:29 UTC (rev 2647) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-08-23 15:27:31 UTC (rev 2648) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.12</version> + <version>2.6.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-08-23 15:27:29 UTC (rev 2647) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-08-23 15:27:31 UTC (rev 2648) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.12</version> + <version>2.6.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-08-23 15:27:29 UTC (rev 2647) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-08-23 15:27:31 UTC (rev 2648) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.12</version> + <version>2.6.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-security/pom.xml 2012-08-23 15:27:29 UTC (rev 2647) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2012-08-23 15:27:31 UTC (rev 2648) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.12</version> + <version>2.6.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2647 - in tags: . topia-2.6.12
by maven-release＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: maven-release Date: 2012-08-23 17:27:29 +0200 (Thu, 23 Aug 2012) New Revision: 2647 Url: http://nuiton.org/repositories/revision/topia/2647 Log: [maven-release-plugin] copy for tag topia-2.6.12 Added: tags/topia-2.6.12/ Property changes on: tags/topia-2.6.12 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2646 - in branches/topia-2.6.x: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: maven-release Date: 2012-08-23 17:27:27 +0200 (Thu, 23 Aug 2012) New Revision: 2646 Url: http://nuiton.org/repositories/revision/topia/2646 Log: [maven-release-plugin] prepare release topia-2.6.12 Modified: branches/topia-2.6.x/pom.xml branches/topia-2.6.x/topia-persistence/pom.xml branches/topia-2.6.x/topia-service-migration/pom.xml branches/topia-2.6.x/topia-service-replication/pom.xml branches/topia-2.6.x/topia-service-security/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-08-23 15:20:54 UTC (rev 2645) +++ branches/topia-2.6.x/pom.xml 2012-08-23 15:27:27 UTC (rev 2646) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.12-SNAPSHOT</version> + <version>2.6.12</version> <modules> <module>topia-persistence</module> @@ -452,9 +452,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/topia-2.6.x</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.12</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.12</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.12</url> </scm> <distributionManagement> Modified: branches/topia-2.6.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.6.x/topia-persistence/pom.xml 2012-08-23 15:20:54 UTC (rev 2645) +++ branches/topia-2.6.x/topia-persistence/pom.xml 2012-08-23 15:27:27 UTC (rev 2646) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.12-SNAPSHOT</version> + <version>2.6.12</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-migration/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-migration/pom.xml 2012-08-23 15:20:54 UTC (rev 2645) +++ branches/topia-2.6.x/topia-service-migration/pom.xml 2012-08-23 15:27:27 UTC (rev 2646) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.12-SNAPSHOT</version> + <version>2.6.12</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-replication/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-replication/pom.xml 2012-08-23 15:20:54 UTC (rev 2645) +++ branches/topia-2.6.x/topia-service-replication/pom.xml 2012-08-23 15:27:27 UTC (rev 2646) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.12-SNAPSHOT</version> + <version>2.6.12</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/topia-2.6.x/topia-service-security/pom.xml =================================================================== --- branches/topia-2.6.x/topia-service-security/pom.xml 2012-08-23 15:20:54 UTC (rev 2645) +++ branches/topia-2.6.x/topia-service-security/pom.xml 2012-08-23 15:27:27 UTC (rev 2646) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.12-SNAPSHOT</version> + <version>2.6.12</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2645 - in branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence: csv csv/in csv/out metadata
by tchemit＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: tchemit Date: 2012-08-23 17:20:54 +0200 (Thu, 23 Aug 2012) New Revision: 2645 Url: http://nuiton.org/repositories/revision/topia/2645 Log: fix missing dependencies + license header Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java 2012-08-23 15:08:49 UTC (rev 2644) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java 2012-08-23 15:20:54 UTC (rev 2645) @@ -1,4 +1,27 @@ package org.nuiton.topia.persistence.csv.in; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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>. + * #L% + */ import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java 2012-08-23 15:08:49 UTC (rev 2644) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java 2012-08-23 15:20:54 UTC (rev 2645) @@ -4,4 +4,28 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.6.12 */ -package org.nuiton.topia.persistence.csv.in; \ No newline at end of file +package org.nuiton.topia.persistence.csv.in; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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>. + * #L% + */ Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java 2012-08-23 15:08:49 UTC (rev 2644) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java 2012-08-23 15:20:54 UTC (rev 2645) @@ -4,4 +4,28 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.6.12 */ -package org.nuiton.topia.persistence.csv.out; \ No newline at end of file +package org.nuiton.topia.persistence.csv.out; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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>. + * #L% + */ Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java 2012-08-23 15:08:49 UTC (rev 2644) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java 2012-08-23 15:20:54 UTC (rev 2645) @@ -4,4 +4,28 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.6.12 */ -package org.nuiton.topia.persistence.csv; \ No newline at end of file +package org.nuiton.topia.persistence.csv; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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>. + * #L% + */ Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java 2012-08-23 15:08:49 UTC (rev 2644) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java 2012-08-23 15:20:54 UTC (rev 2645) @@ -4,4 +4,28 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.6.12 */ -package org.nuiton.topia.persistence.metadata; \ No newline at end of file +package org.nuiton.topia.persistence.metadata; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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>. + * #L% + */

1 0

r2644 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in
by tchemit＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: tchemit Date: 2012-08-23 17:08:49 +0200 (Thu, 23 Aug 2012) New Revision: 2644 Url: http://nuiton.org/repositories/revision/topia/2644 Log: fixes #2266: Add some api about import / export in csv format (last javadoc and import methods) Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java 2012-08-23 07:45:42 UTC (rev 2643) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java 2012-08-23 15:08:49 UTC (rev 2644) @@ -22,13 +22,28 @@ */ public interface ImportStrategy<T extends TopiaEntityEnum> { + /** @return the model factory (will be used to produce the model to import). */ ImportModelFactory<T> getModelFactory(); - <E extends TopiaEntity> void importTable(Import<E> importer, - TableMeta<T> meta, - Reader reader, + /** + * Import a table given a {@code importer}. with an optional csv result. + * + * @param meta type of table to import + * @param importer the csv importer + * @param csvResult optional object where to put csv import result + * @throws TopiaException if any db problem + */ + <E extends TopiaEntity> void importTable(TableMeta<T> meta, Import<E> importer, CsvImportResult<T> csvResult) throws TopiaException; + /** + * Import a association given a {@code importer}. with an optional csv result. + * + * @param meta type of association to import + * @param importer the csv importer + * @param csvResult optional object where to put csv import result + * @throws TopiaException if any db problem + */ void importAssociation(AssociationMeta<T> meta, ImportToMap importer, CsvImportResult<T> csvResult) throws TopiaException; Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2012-08-23 07:45:42 UTC (rev 2643) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2012-08-23 15:08:49 UTC (rev 2644) @@ -24,6 +24,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -148,7 +149,7 @@ * @param <E> type of data * @throws TopiaException if any db problem while storing datas * @throws IOException if any pb while reading csv data - * @see ImportStrategy#importTable(Import, TableMeta, Reader, CsvImportResult) + * @see ImportStrategy#importTable(TableMeta, Import, CsvImportResult) */ public static <T extends TopiaEntityEnum, E extends TopiaEntity> void importTable(Reader reader, ImportStrategy<T> importStrategy, @@ -163,9 +164,7 @@ ImportModel<E> model = importStrategy.getModelFactory().buildForImport(meta); Import<E> importer = Import.newImport(model, reader); try { - importStrategy.importTable(importer, - meta, - reader, + importStrategy.importTable(meta, importer, csvResult); } finally { importer.close(); @@ -184,7 +183,7 @@ * @param <T> type of entity enum * @throws TopiaException if any db problem while storing datas * @throws IOException if any pb while reading csv data - * @see ImportStrategy#importTable(Import, TableMeta, Reader, CsvImportResult) + * @see ImportStrategy#importAssociation(AssociationMeta, ImportToMap, CsvImportResult) */ public static <T extends TopiaEntityEnum> void importAssociation(Reader reader, ImportStrategy<T> importStrategy, @@ -214,7 +213,7 @@ Import<E> importer, CsvImportResult<T> csvResult) throws TopiaException { - for (TopiaEntity entity : importer) { + for (E entity : importer) { Map<String, Object> properties = meta.prepareCreate( entity, entity.getTopiaId()); @@ -228,13 +227,35 @@ } } + public static <T extends TopiaEntityEnum, E extends TopiaEntity> Iterable<E> importAllEntitiesAndReturnThem(TopiaDAO<E> dao, + TableMeta<T> meta, + Import<E> importer, + CsvImportResult<T> csvResult) throws TopiaException { + + List<E> result = Lists.newArrayList(); + for (E entity : importer) { + + Map<String, Object> properties = meta.prepareCreate( + entity, entity.getTopiaId()); + E entityToSave = dao.create(properties); + + meta.copy(entity, entityToSave); + + if (csvResult != null) { + csvResult.incrementsNumberUpdated(); + } + result.add(entityToSave); + } + return result; + } + public static <T extends TopiaEntityEnum, E extends TopiaEntity> void importNotExistingEntities(TopiaDAO<E> dao, TableMeta<T> meta, Map<String, TopiaEntity> universe, Import<E> importer, CsvImportResult<T> csvResult) throws TopiaException { - for (TopiaEntity entity : importer) { + for (E entity : importer) { String topiaId = entity.getTopiaId();

1 0

r2643 - branches/topia-2.6.x
by tchemit＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: tchemit Date: 2012-08-23 09:45:42 +0200 (Thu, 23 Aug 2012) New Revision: 2643 Url: http://nuiton.org/repositories/revision/topia/2643 Log: fixes #2261: updates to nuiton-utils 2.6 Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-08-22 22:01:47 UTC (rev 2642) +++ branches/topia-2.6.x/pom.xml 2012-08-23 07:45:42 UTC (rev 2643) @@ -60,7 +60,7 @@  <eugeneVersion>2.5</eugeneVersion> - <nuitonUtilsVersion>2.6-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6</nuitonUtilsVersion> <processorPluginVersion>1.2.2</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion>

1 0

r2642 - in branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv: . in
by tchemit＠users.nuiton.org 22 Aug '12

22 Aug '12

Author: tchemit Date: 2012-08-23 00:01:47 +0200 (Thu, 23 Aug 2012) New Revision: 2642 Url: http://nuiton.org/repositories/revision/topia/2642 Log: still some stuff to add for import/export :( Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java 2012-08-22 16:04:01 UTC (rev 2641) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java 2012-08-22 22:01:47 UTC (rev 2642) @@ -68,6 +68,19 @@ } }; + public static final ValueParserFormatter<Date> DAY_TIME_SECOND_MILI_WITH_TIMESTAMP = + new DateValue("dd/MM/yyyy HH:mm:ss.SSSS") { + + @Override + public Date parse(String value) throws ParseException { + + Date parse = super.parse(value); + if (parse != null) { + parse = new Timestamp(parse.getTime()); + } + return parse; + } + }; public static final AssociationValueParser ASSOCIATION_VALUE_PARSER = new AssociationValueParser(); public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, String propertyName, Map<String, E> universe) { Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2012-08-22 16:04:01 UTC (rev 2641) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2012-08-22 22:01:47 UTC (rev 2642) @@ -23,6 +23,7 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -360,4 +361,103 @@ tx.executeSQL(builder.toString()); } } + + public static <T extends TopiaEntityEnum> void importNMAssociation(TopiaContext tx, + AssociationMeta<T> meta, + Map<String, TopiaEntity> universe, + ImportToMap importer, + CsvImportResult<T> csvResult, + int nbRowBuffer) throws TopiaException { + + T source = meta.getSource(); + T target = meta.getTarget(); + + StringBuilder builder = new StringBuilder(); + + + String targetTableName = target.getContract().getSimpleName(); + String sourceTableName = source.getContract().getSimpleName(); + + // relation *-* + String table = TopiaEntityHelper.getNormalizedAssociationTableName( + sourceTableName, targetTableName); + + String updateString = String.format(INSERT_ASSOCIATION, table, sourceTableName, targetTableName); + + if (log.isDebugEnabled()) { + log.debug("Will apply " + updateString); + } + int compt = 0; + for (Map<String, Object> row : importer) { + String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String[] associations = (String[]) row.get("target"); + for (String association : associations) { + if (StringUtils.isNotEmpty(association)) { + TopiaEntity targetEntity = universe.get(association); + Preconditions.checkNotNull(targetEntity, "Could not find target entity from id: " + association); + builder.append(String.format(updateString, topiaId, targetEntity.getTopiaId())).append('\n'); + compt++; + if (compt % nbRowBuffer == 0) { + // flush it + tx.executeSQL(builder.toString()); + builder = new StringBuilder(); + } + } + } + if (csvResult != null) { + csvResult.incrementsNumberUpdated(); + } + } + if (builder.length() > 0) { + tx.executeSQL(builder.toString()); + } + } + + public static <T extends TopiaEntityEnum> void importAssociation(TopiaContext tx, + AssociationMeta<T> meta, + Map<String, TopiaEntity> universe, + ImportToMap importer, + CsvImportResult<T> csvResult, + int nbRowBuffer) throws TopiaException { + + T source = meta.getSource(); + T target = meta.getTarget(); + + StringBuilder builder = new StringBuilder(); + + String targetTableName = target.getContract().getSimpleName(); + String sourceTableName = source.getContract().getSimpleName(); + String table = targetTableName; + + String updateString = String.format(UPDATE_ASSOCIATION, table, sourceTableName); + + if (log.isDebugEnabled()) { + log.debug("Will apply " + updateString); + } + int compt = 0; + for (Map<String, Object> row : importer) { + String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String[] associations = (String[]) row.get("target"); + for (String association : associations) { + if (StringUtils.isNotEmpty(association)) { + + TopiaEntity targetEntity = universe.get(association); + Preconditions.checkNotNull(targetEntity, "Could not find target entity from id: " + association); + builder.append(String.format(updateString, topiaId, targetEntity.getTopiaId())).append('\n'); + compt++; + if (compt % nbRowBuffer == 0) { + // flush it + tx.executeSQL(builder.toString()); + builder = new StringBuilder(); + } + } + } + if (csvResult != null) { + csvResult.incrementsNumberUpdated(); + } + } + if (builder.length() > 0) { + tx.executeSQL(builder.toString()); + } + } }

1 0