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

r1621 - in trunk: . topia-soa
by tchemit＠users.nuiton.org Aug. 20, 2009

Aug. 20, 2009

Author: tchemit Date: 2009-08-20 17:10:13 +0200 (Thu, 20 Aug 2009) New Revision: 1621 Modified: trunk/pom.xml trunk/topia-soa/pom.xml Log: use thirdparty artifacts Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-18 16:43:52 UTC (rev 1620) +++ trunk/pom.xml 2009-08-20 15:10:13 UTC (rev 1621) @@ -87,9 +87,9 @@  <dependency> - <groupId>asm</groupId> + <groupId>org.nuiton.thirdparty</groupId> <artifactId>asm</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> Modified: trunk/topia-soa/pom.xml =================================================================== --- trunk/topia-soa/pom.xml 2009-08-18 16:43:52 UTC (rev 1620) +++ trunk/topia-soa/pom.xml 2009-08-20 15:10:13 UTC (rev 1621) @@ -72,7 +72,7 @@  <dependency> - <groupId>asm</groupId> + <groupId>org.nuiton.thirdparty</groupId> <artifactId>asm</artifactId> </dependency>

1 0

r1620 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by nrannou＠users.nuiton.org Aug. 18, 2009

Aug. 18, 2009

Author: nrannou Date: 2009-08-18 18:43:52 +0200 (Tue, 18 Aug 2009) New Revision: 1620 Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/DatabaseManager.java Log: add DatabaseManager configuration getter + usage of TMSVersion.hbm.xml Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/DatabaseManager.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/DatabaseManager.java 2009-08-16 09:24:36 UTC (rev 1619) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/DatabaseManager.java 2009-08-18 16:43:52 UTC (rev 1620) @@ -103,6 +103,14 @@ } /** + * Retourne la configuration Hibernate de la base. + * @return la configuration de la base + */ + public Configuration getDbConfiguration() { + return dbConfiguration; + } + + /** * @return une {@link Connection}, charge a l'appelant de la fermer par la * suite */ @@ -130,7 +138,7 @@ Transaction tx = session.beginTransaction(); // execute query - TMSVersion result = (TMSVersion) session.createCriteria(TMSVersionImpl.class).uniqueResult(); + TMSVersion result = (TMSVersion) session.createCriteria(TMSVersion.class).uniqueResult(); if (result != null) { version = new Version(result.getVersion().toString()); logger.debug("Query executed, version found : " + version.getVersion());

1 0

r1619 - in trunk: src/site topia-persistence/src/site topia-service-history/src/site topia-service-index/src/site topia-service-migration/src/site topia-service-replication/src/site topia-service-security/src/site topia-soa/src/site topia-ui/src/site
by tchemit＠users.nuiton.org Aug. 16, 2009

Aug. 16, 2009

Author: tchemit Date: 2009-08-16 11:24:36 +0200 (Sun, 16 Aug 2009) New Revision: 1619 Modified: trunk/src/site/site.xml trunk/topia-persistence/src/site/site.xml trunk/topia-service-history/src/site/site.xml trunk/topia-service-index/src/site/site.xml trunk/topia-service-migration/src/site/site.xml trunk/topia-service-replication/src/site/site.xml trunk/topia-service-security/src/site/site.xml trunk/topia-soa/src/site/site.xml trunk/topia-ui/src/site/site.xml Log: update skin Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> Modified: trunk/topia-persistence/src/site/site.xml =================================================================== --- trunk/topia-persistence/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/topia-persistence/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> Modified: trunk/topia-service-history/src/site/site.xml =================================================================== --- trunk/topia-service-history/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/topia-service-history/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> Modified: trunk/topia-service-index/src/site/site.xml =================================================================== --- trunk/topia-service-index/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/topia-service-index/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> Modified: trunk/topia-service-migration/src/site/site.xml =================================================================== --- trunk/topia-service-migration/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/topia-service-migration/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> Modified: trunk/topia-service-replication/src/site/site.xml =================================================================== --- trunk/topia-service-replication/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/topia-service-replication/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> Modified: trunk/topia-service-security/src/site/site.xml =================================================================== --- trunk/topia-service-security/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/topia-service-security/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> Modified: trunk/topia-soa/src/site/site.xml =================================================================== --- trunk/topia-soa/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/topia-soa/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> Modified: trunk/topia-ui/src/site/site.xml =================================================================== --- trunk/topia-ui/src/site/site.xml 2009-08-15 15:05:24 UTC (rev 1618) +++ trunk/topia-ui/src/site/site.xml 2009-08-16 09:24:36 UTC (rev 1619) @@ -6,7 +6,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft>

1 0

r1618 - trunk
by tchemit＠users.nuiton.org Aug. 15, 2009

Aug. 15, 2009

Author: tchemit Date: 2009-08-15 17:05:24 +0200 (Sat, 15 Aug 2009) New Revision: 1618 Modified: trunk/pom.xml Log: grrr test svn post-commit hook... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-15 15:04:21 UTC (rev 1617) +++ trunk/pom.xml 2009-08-15 15:05:24 UTC (rev 1618) @@ -139,7 +139,7 @@ <version>1.5.2</version> <scope>runtime</scope> </dependency> - +  <dependency> <groupId>com.h2database</groupId>

1 0

r1617 - trunk
by tchemit＠users.nuiton.org Aug. 15, 2009

Aug. 15, 2009

Author: tchemit Date: 2009-08-15 17:04:21 +0200 (Sat, 15 Aug 2009) New Revision: 1617 Modified: trunk/pom.xml Log: grrr test svn post-commit hook... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-15 15:03:37 UTC (rev 1616) +++ trunk/pom.xml 2009-08-15 15:04:21 UTC (rev 1617) @@ -139,7 +139,7 @@ <version>1.5.2</version> <scope>runtime</scope> </dependency> - +  <dependency> <groupId>com.h2database</groupId>

1 0

Migration du projet / Project migration
by root＠nuiton.com Aug. 4, 2009

Aug. 4, 2009

Bonjour à tous, Dans l'optique de dissocier au maximum les projets libres initiés par la société Code Lutin de celle-ci et permettre une meilleur implication de la communauté du libre dans ces derniers, nous vous annonçons que le site de développement du projet n'est plus hébergé sur le labs libre-entreprise mais sur la plateforme www.nuiton.org. La plupart de la migration a été réalisée, nous vous invitons à utiliser d'ors et déjà la plateforme http://www.nuiton.org (le projet sur le labs libre-entreprise n'est plus accessible publiquement) Les listes de diffusions ont été migrées et tous les utilisateurs ont normalement du être réabonnés aux nouvelles listes. La nouvelle adresse de cette liste: topia-commits(a)list.nuiton.org Nous sommes désolés des désagréments causés et vous remercions de votre soutien. Cordialement, L'équipe de développement. ---------------------------- Dear all, In order to separate the libre projects that Code Lutin has initiated and the company itself, and also to encourage the implication of the libre community, we recently moved the project's development site from the libre-entreprise labs to the www.nuiton.org platform. Most of the migration is complete, we invite you to use, from now on, the platform http://www.nuiton.org (the project on libre-entreprise labs is now longer publicly available). The mailing-lists have been migrated and everybody should have been automatically subscribing the new lists. New mail address for this list: topia-commits(a)list.nuiton.org We are sorry for the inconvenience, and thank you for your support. Best regards, The development team.

1 0

r1608 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.labs.libre-entreprise.org July 15, 2009

July 15, 2009

Author: echatellier Date: 2009-07-15 16:29:38 +0200 (Wed, 15 Jul 2009) New Revision: 1608 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java Log: package refactoring codelutin>nuiton Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-07-15 13:47:24 UTC (rev 1607) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-07-15 14:29:38 UTC (rev 1608) @@ -409,7 +409,7 @@ // tmp.addAll(<%=ref%>); // } /*{ - org.codelutin.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); + org.nuiton.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); if (findAllByProperties != null) { tmp.addAll(findAllByProperties);

1 0

r1607 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.labs.libre-entreprise.org July 15, 2009

July 15, 2009

Author: echatellier Date: 2009-07-15 15:47:24 +0200 (Wed, 15 Jul 2009) New Revision: 1607 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Log: Merge branche on trunk Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -377,7 +377,9 @@ String attrName = attr.getName(); String getterName = "get" + GeneratorUtil.capitalize(attrName); if (GeneratorUtil.isNMultiplicity(attr)) { -/*{ tmp.addAll(<%=getterName%>()); +/*{ if (<%=getterName%>() != null) { + tmp.addAll(<%=getterName%>()); + } }*/ } else { /*{ tmp.add(<%=getterName%>()); @@ -407,9 +409,11 @@ // tmp.addAll(<%=ref%>); // } /*{ - tmp.addAll(((TopiaContextImplementor)getTopiaContext()) - .getDAO(<%=assocClassFQN%>.class) - .findAllByProperties("<%=reverseAttrName%>", this)); + org.codelutin.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); + List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); + if (findAllByProperties != null) { + tmp.addAll(findAllByProperties); + } }*/ } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -101,12 +101,18 @@ String tableName = TopiaGeneratorUtil.getDBName(clazz); String isAbstract = clazz.isAbstract()?"true":"false"; String clazzFQN = clazz.getQualifiedName(); - + String optionalAttributes = ""; String schema = TopiaGeneratorUtil.getSchemaName(clazz, model); if (schema != null) { optionalAttributes += "schema=\"" + schema + "\" "; } + + //On précise au proxy de quelle interface hérite l'objet + String proxyTagValue = TopiaGeneratorUtil.findTagValue(TopiaGeneratorUtil.TAG_PROXY_INTERFACE, clazz, model); + if (proxyTagValue == null || !proxyTagValue.equals("none")) { + optionalAttributes += "proxy=\"" + clazzFQN + "\" "; + } if (haveSuper) { ObjectModelClass superClass = clazz.getSuperclasses().iterator().next(); @@ -115,15 +121,14 @@ log.debug("superClass for " + clazz.getQualifiedName() + " is " + superClassname); } String superClassDOType = TopiaGeneratorUtil.getDOType(superClassname, model); - //On précise au proxy de quelle interface hérite l'objet -/*{ <union-subclass name="<%=clazzDOType%>" extends="<%=superClassDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" proxy="<%=clazzFQN%>" <%=optionalAttributes%>> +/*{ <union-subclass name="<%=clazzDOType%>" extends="<%=superClassDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" <%=optionalAttributes%>>  }*/ // FIXME mieux gerer le cas haveSuper noneNaturalAttributes.addAll(clazz.getAttributes()); } else { -/*{ <class name="<%=clazzDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" proxy="<%=clazzFQN%>" <%=optionalAttributes%>> +/*{ <class name="<%=clazzDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" <%=optionalAttributes%>> <id name="topiaId" type="string" length="255" node="@topiaId"/> }*/ // on detecte les attributs des clef metiers Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -103,6 +103,15 @@ public static final String TAG_NOT_NULL = "notNull"; /** Tag pour spécifier la caractère embed-xml d'une association */ public static final String TAG_EMBED_XML = "embedXml"; + /** + * Tag pour configurer l'interface du proxy sur autre chose que l'implementation par defaut. + * + * Par defaut : + * null > generere le proxy sur l'interface de l'implementation + * Autre valeur : + * "none" > laisse la configuration par defaut d'hibernate + */ + public static final String TAG_PROXY_INTERFACE = "hibernateProxyInterface"; /** Tag pour spécifier le permissions à la création */ public static final String TAG_SECURITY_CREATE = "securityCreate"; /** Tag pour spécifier le permissions au chargement */

1 0

r1606 - in branches/2.1.6.x: . topia-persistence topia-soa topia-ui
by echatellier＠users.labs.libre-entreprise.org July 15, 2009

July 15, 2009

Author: echatellier Date: 2009-07-15 15:28:00 +0200 (Wed, 15 Jul 2009) New Revision: 1606 Modified: branches/2.1.6.x/pom.xml branches/2.1.6.x/topia-persistence/pom.xml branches/2.1.6.x/topia-soa/pom.xml branches/2.1.6.x/topia-ui/pom.xml Log: Prepare next development iteration Modified: branches/2.1.6.x/pom.xml =================================================================== --- branches/2.1.6.x/pom.xml 2009-07-15 13:25:23 UTC (rev 1605) +++ branches/2.1.6.x/pom.xml 2009-07-15 13:28:00 UTC (rev 1606) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.6.1</version> + <version>2.1.6.2-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -243,9 +243,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1</url> + <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x</url> </scm>  Modified: branches/2.1.6.x/topia-persistence/pom.xml =================================================================== --- branches/2.1.6.x/topia-persistence/pom.xml 2009-07-15 13:25:23 UTC (rev 1605) +++ branches/2.1.6.x/topia-persistence/pom.xml 2009-07-15 13:28:00 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1</version> + <version>2.1.6.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -130,9 +130,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-persistence</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-persistence</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-persiste…</url> + <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-pers…</url> </scm> Modified: branches/2.1.6.x/topia-soa/pom.xml =================================================================== --- branches/2.1.6.x/topia-soa/pom.xml 2009-07-15 13:25:23 UTC (rev 1605) +++ branches/2.1.6.x/topia-soa/pom.xml 2009-07-15 13:28:00 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1</version> + <version>2.1.6.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -134,9 +134,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-soa</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-soa</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-soa</url> + <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-soa</url> </scm> </project> Modified: branches/2.1.6.x/topia-ui/pom.xml =================================================================== --- branches/2.1.6.x/topia-ui/pom.xml 2009-07-15 13:25:23 UTC (rev 1605) +++ branches/2.1.6.x/topia-ui/pom.xml 2009-07-15 13:28:00 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1</version> + <version>2.1.6.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -107,9 +107,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-ui</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-ui</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-ui</url> + <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-ui</url> </scm> </project>

1 0

r1605 - in tags: . 2.1.6.1
by echatellier＠users.labs.libre-entreprise.org July 15, 2009

July 15, 2009

Author: echatellier Date: 2009-07-15 15:25:23 +0200 (Wed, 15 Jul 2009) New Revision: 1605 Added: tags/2.1.6.1/ Log: Tag 2.1.6.1 Property changes on: tags/2.1.6.1 ___________________________________________________________________ Added: svn:ignore + topia2.ipr .classpath *.iml .project target topia.ipr topia.iws THIRD-PARTY.txt .settings Added: svn:mergeinfo +

1 0