- Wikitty-commits - mailman.cloud.codelutin.com

r1595 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 22 Oct '14

22 Oct '14

Author: maven-release Date: 2014-10-22 10:56:36 +0200 (Wed, 22 Oct 2014) New Revision: 1595 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1595 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -9,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> <packaging>pom</packaging> <name>Wikitty</name> @@ -173,10 +173,10 @@ </modules>  <scm> - <connection>scm:svn:http://svn.nuiton.org/wikitty/tags/wikitty-3.11</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/wikitty/tags/wikitty-3.11 + <connection>scm:svn:http://svn.nuiton.org/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/wikitty/trunk </developerConnection> - <url>https://forge.nuiton.org/projects/wikitty/repository/show/tags/wikitty-3.11</url> + <url>https://forge.nuiton.org/projects/wikitty/repository/show/trunk</url> </scm> <distributionManagement> <site> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-api/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-dto/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-generators/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-hessian-client/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-hessian-server/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-jdbc/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-perf-test/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-solr/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2014-10-22 08:56:26 UTC (rev 1594) +++ trunk/wikitty-struts/pom.xml 2014-10-22 08:56:36 UTC (rev 1595) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1594 - in tags: . wikitty-3.11
by maven-release＠users.nuiton.org 22 Oct '14

22 Oct '14

Author: maven-release Date: 2014-10-22 10:56:26 +0200 (Wed, 22 Oct 2014) New Revision: 1594 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1594 Log: [maven-release-plugin] copy for tag wikitty-3.11 Added: tags/wikitty-3.11/ Property changes on: tags/wikitty-3.11 ___________________________________________________________________ Added: svn:mergeinfo + /branches/2.0-eugene2:164-179 Added: svn:ignore + .settings .project target *.iml *.ipr *.iws

1 0

r1593 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 22 Oct '14

22 Oct '14

Author: maven-release Date: 2014-10-22 10:56:17 +0200 (Wed, 22 Oct 2014) New Revision: 1593 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1593 Log: [maven-release-plugin] prepare release wikitty-3.11 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> @@ -10,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> <packaging>pom</packaging> <name>Wikitty</name> @@ -174,10 +173,10 @@ </modules>  <scm> - <connection>scm:svn:http://svn.nuiton.org/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/wikitty/tags/wikitty-3.11</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/wikitty/tags/wikitty-3.11 </developerConnection> - <url>https://forge.nuiton.org/projects/wikitty/repository/show/trunk</url> + <url>https://forge.nuiton.org/projects/wikitty/repository/show/tags/wikitty-3.11</url> </scm> <distributionManagement> <site> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-api/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-dto/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-generators/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-hessian-client/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-hessian-server/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-jdbc/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-perf-test/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-solr/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) +++ trunk/wikitty-struts/pom.xml 2014-10-22 08:56:17 UTC (rev 1593) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1592 - trunk
by ymartel＠users.nuiton.org 22 Oct '14

22 Oct '14

Author: ymartel Date: 2014-10-22 10:24:06 +0200 (Wed, 22 Oct 2014) New Revision: 1592 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1592 Log: update scm Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) +++ trunk/pom.xml 2014-10-22 08:24:06 UTC (rev 1592) @@ -174,15 +174,15 @@ </modules>  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>https://forge.nuiton.org/projects/wikitty/repository/show/trunk</url> </scm> <distributionManagement> <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>doc.${platform}</id> + <url>scpexe://forge.${platform}/var/lib/doc/${platform}/${projectId}/${project.version}</url> </site> </distributionManagement>

1 0

r1591 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 21 Oct '14

21 Oct '14

Author: maven-release Date: 2014-10-21 17:06:40 +0200 (Tue, 21 Oct 2014) New Revision: 1591 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1591 Log: [maven-release-plugin] rollback the release of wikitty-3.11 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> @@ -9,7 +10,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> <packaging>pom</packaging> <name>Wikitty</name> @@ -173,10 +174,10 @@ </modules>  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.11</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.11 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.11</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm> <distributionManagement> <site> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-api/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-dto/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-generators/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-hessian-client/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-hessian-server/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-jdbc/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-perf-test/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-solr/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) +++ trunk/wikitty-struts/pom.xml 2014-10-21 15:06:40 UTC (rev 1591) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1590 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 21 Oct '14

21 Oct '14

Author: maven-release Date: 2014-10-21 16:51:28 +0200 (Tue, 21 Oct 2014) New Revision: 1590 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1590 Log: [maven-release-plugin] prepare release wikitty-3.11 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> @@ -10,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> <packaging>pom</packaging> <name>Wikitty</name> @@ -174,10 +173,10 @@ </modules>  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.11</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.11 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.11</url> </scm> <distributionManagement> <site> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-api/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-dto/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-generators/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-hessian-client/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-hessian-server/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-jdbc/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-perf-test/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-solr/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) +++ trunk/wikitty-struts/pom.xml 2014-10-21 14:51:28 UTC (rev 1590) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<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> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.11-SNAPSHOT</version> + <version>3.11</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1589 - in trunk: . wikitty-api wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 01 Aug '14

01 Aug '14

Author: bpoussin Date: 2014-08-01 11:50:53 +0200 (Fri, 01 Aug 2014) New Revision: 1589 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1589 Log: add expression support when convert string to number (ex: 2+2*2=6) Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-30 16:25:48 UTC (rev 1588) +++ trunk/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) @@ -263,6 +263,13 @@ <version>2.3.8</version> </dependency> +  + <dependency> + <groupId>net.objecthunter</groupId> + <artifactId>exp4j</artifactId> + <version>0.4.0.ALPHA-3</version> + </dependency> +  <dependency> <groupId>commons-fileupload</groupId> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2014-07-30 16:25:48 UTC (rev 1588) +++ trunk/wikitty-api/pom.xml 2014-08-01 09:50:53 UTC (rev 1589) @@ -150,6 +150,12 @@ <artifactId>smackx</artifactId> </dependency> +  + <dependency> + <groupId>net.objecthunter</groupId> + <artifactId>exp4j</artifactId> + </dependency> +  <dependency> <groupId>junit</groupId> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2014-07-30 16:25:48 UTC (rev 1588) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2014-08-01 09:50:53 UTC (rev 1589) @@ -28,20 +28,9 @@ import java.beans.PropertyDescriptor; import java.io.File; import java.io.IOException; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.wikitty.entities.BusinessEntity; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyField; -import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.BusinessEntityImpl; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; -import java.lang.reflect.Constructor; import java.math.BigDecimal; import java.math.BigInteger; import java.net.Inet4Address; @@ -50,7 +39,6 @@ import java.net.NetworkInterface; import java.security.Key; import java.text.DecimalFormat; -import java.text.NumberFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -60,7 +48,6 @@ import java.util.Collections; import java.util.Date; import java.util.Enumeration; -import java.util.Formatter; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -70,27 +57,35 @@ import java.util.Set; import java.util.TimeZone; import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; import net.iharder.Base64; +import net.objecthunter.exp4j.ExpressionBuilder; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.converters.DateTimeConverter; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringEscapeUtils; - +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.FastDateFormat; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyField; +import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.generator.WikittyTransformerUtil; +import org.nuiton.wikitty.services.WikittyServiceEnhanced; /** * Util static method for wikitty. @@ -565,6 +560,9 @@ /** * Get value as BigDecimal. * + * If value is String, mathematical evaluation is done. + * ex: 2+2*2 create BigDecimal(6) as result + * * @param value null and empty string are casted to '0' value. * @throws WikittyException on NumberFormatException or if value object can't be casted to number. * @@ -577,38 +575,47 @@ } else if (value instanceof BigDecimal) { result = (BigDecimal) value; } else { - String s = value.toString(); - // suppression de tous les blancs pour un parsing plus sur - s = StringUtils.deleteWhitespace(s); - s = StringUtils.remove(s, nbsp); + String all = value.toString(); try { - // on commence par essayer par la methode la plus simple - result = new BigDecimal(s); - } catch (NumberFormatException eee) { - // on essaie avec un parse, en dernier ressort - // si jamais le nombre etait localise (ex: 99,987.76) + double d = new ExpressionBuilder(all).build().evaluate(); + result = new BigDecimal(d); + } catch (Exception eee) { + String s = all; + // suppression de tous les blancs pour un parsing plus sur + s = StringUtils.deleteWhitespace(s); + s = StringUtils.remove(s, nbsp); try { - DecimalFormat parser = new DecimalFormat(); - // on veut des BigDecimal en resultat et pas un Double - parser.setParseBigDecimal(true); + // on commence par essayer par la methode la plus simple + result = new BigDecimal(s); + } catch (NumberFormatException yyy) { + // on essaie avec un parse, en dernier ressort + // si jamais le nombre etait localise (ex: 99,987.76) + try { + DecimalFormat parser = new DecimalFormat(); + // on veut des BigDecimal en resultat et pas un Double + parser.setParseBigDecimal(true); - Number n = parser.parse(s); - // meme si on demande au parser un BigDecimal, il retourne - // certaine fois un Double (NaN, Infinit, ...). - // mais dans ce cas la, ca revient a une erreur de parsing - // qui explosera avec le cast - result = (BigDecimal)n; - } catch (Exception zzz) { - // on fait suivre eee et non pas zzz car l'erreur initial - // est bien eee, zzz est juste le fallback, et certain fois - // on aurait un ClassCastException qui n'a rien a voir, - // mais on log tout de meme zzz - log.debug(String.format( - "Can't convert value '%s(%s)' to numeric, this exception is not throw but just logged", - value, getClass(value)), zzz); - throw new WikittyException( - String.format("Can't convert value '%s(%s)' to numeric", - value, getClass(value)), eee); + Number n = parser.parse(s); + // meme si on demande au parser un BigDecimal, il retourne + // certaine fois un Double (NaN, Infinit, ...). + // mais dans ce cas la, ca revient a une erreur de parsing + // qui explosera avec le cast + result = (BigDecimal)n; + } catch (Exception zzz) { + // on fait suivre eee et non pas yyy ou zzz car l'erreur initial + // est bien eee, yyy et zzz sont juste le fallback, et certain fois + // on aurait un ClassCastException qui n'a rien a voir, + // mais on log tout de meme zzz + log.debug(String.format( + "Try one, can't convert value '%s(%s)' to numeric, this exception is not throw but just logged", + value, getClass(value)), yyy); + log.debug(String.format( + "Try two, can't convert value '%s(%s)' to numeric, this exception is not throw but just logged", + value, getClass(value)), zzz); + throw new WikittyException( + String.format("Can't convert value '%s(%s)' to numeric", + value, getClass(value)), eee); + } } } }

1 0

r1588 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 30 Jul '14

30 Jul '14

Author: bpoussin Date: 2014-07-30 18:25:48 +0200 (Wed, 30 Jul 2014) New Revision: 1588 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1588 Log: add support for math date for NOW and TODAY Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2014-07-30 13:50:45 UTC (rev 1587) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2014-07-30 16:25:48 UTC (rev 1588) @@ -707,12 +707,30 @@ // try to convert to Date String v = String.valueOf(value); if (StringUtils.startsWithIgnoreCase(v, DATE_NOW)) { - result = new Date(); - v = StringUtils.substringAfter(v, DATE_NOW); + try { + Date tryDate = new Date(); + v = StringUtils.substringAfter(v, DATE_NOW); + result = dateModifier(tryDate, v); + } catch (ParseException eee) { + if (log.isDebugEnabled()) { + log.debug(String.format( + "Can't convert value '%s' of type '%s' to Date because math date is wrong", + value, getClass(value)), eee); + } + } } else if (StringUtils.startsWithIgnoreCase(v, DATE_TODAY)) { - result = new Date(); - result = DateUtil.setMinTimeOfDay(result); - v = StringUtils.substringAfter(v, DATE_TODAY); + try { + Date tryDate = new Date(); + tryDate = DateUtil.setMinTimeOfDay(tryDate); + v = StringUtils.substringAfter(v, DATE_TODAY); + result = dateModifier(tryDate, v); + } catch (ParseException eee) { + if (log.isDebugEnabled()) { + log.debug(String.format( + "Can't convert value '%s' of type '%s' to Date because math date is wrong", + value, getClass(value)), eee); + } + } } else { for (String pattern : DATE_FORMAT_ALLOWED) { // remove ' from pattern because 'T' is 3 char in patten and 1 in value @@ -722,16 +740,12 @@ } String tmp = StringUtils.substring(v, 0, pattern.length()); try { - result = DateUtils.parseDate(tmp, pattern); + Date tryDate = DateUtils.parseDate(tmp, pattern); // parse success String ajust = StringUtils.substring(v, pattern.length()); // try to interpret and of date (ex: +3Years) - if (StringUtils.length(ajust) > 0) { - DateMathParser parser = new DateMathParser(TimeZone.getDefault(), Locale.getDefault()); - parser.setNow(result); - result = parser.parseMath(ajust); - } + result = dateModifier(tryDate, ajust); break; } catch (ParseException eee) { if (log.isDebugEnabled()) { @@ -757,6 +771,19 @@ return result; } + static private Date dateModifier(Date date, String modifier) throws ParseException { + Date result = date; + + // try to interpret and of date (ex: +3Years) + if (StringUtils.length(modifier) > 0) { + DateMathParser parser = new DateMathParser(TimeZone.getDefault(), Locale.getDefault()); + parser.setNow(result); + result = parser.parseMath(modifier); + } + + return result; + } + /** * Return wikitty id and not wikitty objet because this method can be call * on server or client side and it's better to keep conversion between id

1 0

r1587 - in trunk/wikitty-api/src/main/java/org/nuiton/wikitty: . entities
by bpoussin＠users.nuiton.org 30 Jul '14

30 Jul '14

Author: bpoussin Date: 2014-07-30 15:50:45 +0200 (Wed, 30 Jul 2014) New Revision: 1587 Url: http://forge.nuiton.org/projects/wikitty/repository/revisions/1587 Log: - no add null object in collection - "" for date become null date (permit reset to default in web form) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2014-02-14 13:52:55 UTC (rev 1586) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2014-07-30 13:50:45 UTC (rev 1587) @@ -696,7 +696,9 @@ */ static public Date toDate(Object value) { Date result = null; - if (value != null) { + // poussin 20140730 pour null ou chaine vide on laisse a null + // c'est util pour les formulaires web qui sont soumis avec des champs sans valeurs + if (value != null && !"".equals(value)) { if (value instanceof Date) { result = (Date) value; } else if (value instanceof Calendar) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2014-02-14 13:52:55 UTC (rev 1586) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2014-07-30 13:50:45 UTC (rev 1587) @@ -187,12 +187,18 @@ // copy all value in new collections if (value instanceof Collection) { for ( Object o : (Collection<?>) value ) { - col.add( getContainedValidObject(o) ); + Object tmp = getContainedValidObject(o); + if (tmp != null) { + col.add( tmp ); + } } } else { // is Array for ( Object o : (Object[]) value ) { - col.add( getContainedValidObject(o) ); + Object tmp = getContainedValidObject(o); + if (tmp != null) { + col.add( tmp ); + } } } result = col;

1 0

Jenkins build is back to normal : wikitty-nightly #2
by admin+ci-nuiton.org＠codelutin.com 19 Feb '14

19 Feb '14

See <http://ci.nuiton.org/jenkins/job/wikitty-nightly/2/>

1 0