August 2011 - Jrst-commits - mailman.cloud.codelutin.com

r618 - trunk
by tchemit＠users.nuiton.org 19 Aug '11

19 Aug '11

Author: tchemit Date: 2011-08-19 18:29:05 +0200 (Fri, 19 Aug 2011) New Revision: 618 Url: http://nuiton.org/repositories/revision/jrst/618 Log: Update mavenpom4redmineAndCentral to 3.0.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 13:18:36 UTC (rev 617) +++ trunk/pom.xml 2011-08-19 16:29:05 UTC (rev 618) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> </parent> <artifactId>jrst</artifactId>

1 0

r617 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 15:18:36 +0200 (Thu, 18 Aug 2011) New Revision: 617 Url: http://nuiton.org/repositories/revision/jrst/617 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-08-18 13:18:34 UTC (rev 616) +++ trunk/doxia-module-jrst/pom.xml 2011-08-18 13:18:36 UTC (rev 617) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-08-18 13:18:34 UTC (rev 616) +++ trunk/jrst/pom.xml 2011-08-18 13:18:36 UTC (rev 617) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-08-18 13:18:34 UTC (rev 616) +++ trunk/jrst-doc/pom.xml 2011-08-18 13:18:36 UTC (rev 617) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-08-18 13:18:34 UTC (rev 616) +++ trunk/maven-jrst-plugin/pom.xml 2011-08-18 13:18:36 UTC (rev 617) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 13:18:34 UTC (rev 616) +++ trunk/pom.xml 2011-08-18 13:18:36 UTC (rev 617) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <modules> <module>jrst</module> @@ -404,11 +404,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.4</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.4 + scm:svn:http://svn.nuiton.org/svn/jrst/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.4</url> + <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> <profiles>

1 0

r616 - tags
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 15:18:34 +0200 (Thu, 18 Aug 2011) New Revision: 616 Url: http://nuiton.org/repositories/revision/jrst/616 Log: [maven-release-plugin] copy for tag jrst-1.4 Added: tags/jrst-1.4/

1 0

r615 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 15:18:33 +0200 (Thu, 18 Aug 2011) New Revision: 615 Url: http://nuiton.org/repositories/revision/jrst/615 Log: [maven-release-plugin] prepare release jrst-1.4 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-08-18 13:13:22 UTC (rev 614) +++ trunk/doxia-module-jrst/pom.xml 2011-08-18 13:18:33 UTC (rev 615) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-08-18 13:13:22 UTC (rev 614) +++ trunk/jrst/pom.xml 2011-08-18 13:18:33 UTC (rev 615) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-08-18 13:13:22 UTC (rev 614) +++ trunk/jrst-doc/pom.xml 2011-08-18 13:18:33 UTC (rev 615) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-08-18 13:13:22 UTC (rev 614) +++ trunk/maven-jrst-plugin/pom.xml 2011-08-18 13:18:33 UTC (rev 615) @@ -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>jrst</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 13:13:22 UTC (rev 614) +++ trunk/pom.xml 2011-08-18 13:18:33 UTC (rev 615) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #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> @@ -39,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> <modules> <module>jrst</module> @@ -406,11 +404,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.4</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jrst/trunk + scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.4 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.4</url> </scm> <profiles>

1 0

r614 - trunk
by hudson＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: hudson Date: 2011-08-18 15:13:22 +0200 (Thu, 18 Aug 2011) New Revision: 614 Url: http://nuiton.org/repositories/revision/jrst/614 Log: [maven-release-plugin] rollback the release of jrst-1.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 13:09:40 UTC (rev 613) +++ trunk/pom.xml 2011-08-18 13:13:22 UTC (rev 614) @@ -382,11 +382,6 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> - <scmwebeditorUrl>http://localhost:8080/scmwebeditor/checkout.action - </scmwebeditorUrl> - <nuitonSkinVersion>1.0.6-SNAPSHOT</nuitonSkinVersion> - - </properties> <build> @@ -403,29 +398,6 @@ </plugins> </pluginManagement> - - <plugins> - -  - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-surefire-workdir</id> - <phase>generate-test-sources</phase> - <configuration> - <target> - <mkdir dir="target/surefire-workdir"/> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build>  @@ -445,12 +417,6 @@  <profile> <id>extra-modules</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> <modules> <module>maven-jrst-plugin</module>

1 0

r613 - trunk
by tchemit＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: tchemit Date: 2011-08-18 15:09:40 +0200 (Thu, 18 Aug 2011) New Revision: 613 Url: http://nuiton.org/repositories/revision/jrst/613 Log: fix pom :( Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 13:07:48 UTC (rev 612) +++ trunk/pom.xml 2011-08-18 13:09:40 UTC (rev 613) @@ -445,16 +445,17 @@  <profile> <id>extra-modules</id> - activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <modules> - <module>maven-jrst-plugin</module> - </modules> - </profile> -</profiles> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - </project> + <modules> + <module>maven-jrst-plugin</module> + </modules> + </profile> + </profiles> + +</project>

1 0

r612 - trunk
by tchemit＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: tchemit Date: 2011-08-18 15:07:48 +0200 (Thu, 18 Aug 2011) New Revision: 612 Url: http://nuiton.org/repositories/revision/jrst/612 Log: let's build the extra module at release time + reformat pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 12:40:00 UTC (rev 611) +++ trunk/pom.xml 2011-08-18 13:07:48 UTC (rev 612) @@ -382,7 +382,8 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> - <scmwebeditorUrl>http://localhost:8080/scmwebeditor/checkout.action</scmwebeditorUrl> + <scmwebeditorUrl>http://localhost:8080/scmwebeditor/checkout.action + </scmwebeditorUrl> <nuitonSkinVersion>1.0.6-SNAPSHOT</nuitonSkinVersion> @@ -404,7 +405,8 @@ <plugins> -  + +  <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -423,11 +425,7 @@ </executions> </plugin> </plugins> - - - - </build>  @@ -447,11 +445,16 @@  <profile> <id>extra-modules</id> + activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <modules> + <module>maven-jrst-plugin</module> + </modules> + </profile> +</profiles> - <modules> - <module>maven-jrst-plugin</module> - </modules> - </profile> - </profiles> - -</project> + </project>

1 0

r611 - trunk
by kcardineaud＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: kcardineaud Date: 2011-08-18 14:40:00 +0200 (Thu, 18 Aug 2011) New Revision: 611 Url: http://nuiton.org/repositories/revision/jrst/611 Log: #1682 Tests are failing - The tests failed because the target/surefire-workdir directory was still not created Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 12:24:08 UTC (rev 610) +++ trunk/pom.xml 2011-08-18 12:40:00 UTC (rev 611) @@ -382,6 +382,10 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> + <scmwebeditorUrl>http://localhost:8080/scmwebeditor/checkout.action</scmwebeditorUrl> + <nuitonSkinVersion>1.0.6-SNAPSHOT</nuitonSkinVersion> + + </properties> <build> @@ -398,6 +402,32 @@ </plugins> </pluginManagement> + + <plugins> +  + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-surefire-workdir</id> + <phase>generate-test-sources</phase> + <configuration> + <target> + <mkdir dir="target/surefire-workdir"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + + + + </build>

1 0

r610 - trunk/jrst/src/main/java/org/nuiton/jrst
by sletellier＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: sletellier Date: 2011-08-18 14:24:08 +0200 (Thu, 18 Aug 2011) New Revision: 610 Url: http://nuiton.org/repositories/revision/jrst/610 Log: Retrieve outputEncoding and inputEncoding for generate method Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-08-18 12:11:06 UTC (rev 609) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-08-18 12:24:08 UTC (rev 610) @@ -27,20 +27,7 @@ import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.Writer; +import java.io.*; import java.net.URL; import java.util.HashMap; import java.util.List; @@ -284,10 +271,11 @@ public static void generate(String xslListOrOutType, File fileIn, File fileOut, Overwrite overwrite) throws Exception { - generate(xslListOrOutType, fileIn, fileOut, UTF_8, overwrite); + + generate(xslListOrOutType, fileIn, UTF_8, fileOut, UTF_8, overwrite); } - public static void generate(String xslListOrOutType, File fileIn, + public static void generate(String xslListOrOutType, File fileIn, String inputEncoding, File fileOut, String outputEncoding, Overwrite overwrite) throws Exception { if (fileOut != null @@ -299,12 +287,20 @@ log.info("Don't generate file " + fileOut + ", because already exists"); } else { + + // In URL url = fileIn.toURI().toURL(); - Reader reader = new InputStreamReader(url.openStream(), outputEncoding); - FileWriter writer = new FileWriter(fileOut); + Reader reader = new InputStreamReader(url.openStream(), inputEncoding); + + // Out + FileOutputStream outputStream = new FileOutputStream(fileOut); + OutputStreamWriter writer = new OutputStreamWriter(outputStream, outputEncoding); + + // Generate String result = generateString(xslListOrOutType, reader); fileOut.getAbsoluteFile().getParentFile().mkdirs(); + // generation PDF if (xslListOrOutType.equals("pdf")) { FopFactory fopFactory = FopFactory.newInstance();

1 0

r609 - trunk/jrst/src/main/java/org/nuiton/jrst
by sletellier＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: sletellier Date: 2011-08-18 14:11:06 +0200 (Thu, 18 Aug 2011) New Revision: 609 Url: http://nuiton.org/repositories/revision/jrst/609 Log: Retrieve outputEncoding param for generate method Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-08-18 09:25:35 UTC (rev 608) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-08-18 12:11:06 UTC (rev 609) @@ -284,7 +284,12 @@ public static void generate(String xslListOrOutType, File fileIn, File fileOut, Overwrite overwrite) throws Exception { + generate(xslListOrOutType, fileIn, fileOut, UTF_8, overwrite); + } + public static void generate(String xslListOrOutType, File fileIn, + File fileOut, String outputEncoding, Overwrite overwrite) throws Exception { + if (fileOut != null && fileOut.exists() && (overwrite == Overwrite.NEVER || (overwrite == Overwrite.IFNEWER && FileUtil @@ -295,7 +300,7 @@ + ", because already exists"); } else { URL url = fileIn.toURI().toURL(); - Reader reader = new InputStreamReader(url.openStream(), UTF_8); + Reader reader = new InputStreamReader(url.openStream(), outputEncoding); FileWriter writer = new FileWriter(fileOut); String result = generateString(xslListOrOutType, reader);

1 0