February 2009 - Jrst-commits - mailman.cloud.codelutin.com

r266 - jrst/trunk/src/main/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org 17 Feb '09

17 Feb '09

Author: chatellier Date: 2009-02-17 13:29:30 +0000 (Tue, 17 Feb 2009) New Revision: 266 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java Log: Fix some checktyle Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-02-11 10:24:29 UTC (rev 265) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-02-17 13:29:30 UTC (rev 266) @@ -274,13 +274,13 @@ public class JRSTReader { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(JRSTReader.class); + private static Log log = LogFactory.getLog(JRSTReader.class); - boolean ERROR_MISSING_ITEM = false; + protected boolean ERROR_MISSING_ITEM = false; - static int MAX_SECTION_DEPTH = -1000; + protected static int MAX_SECTION_DEPTH = -1000; - static protected Map<String, JRSTDirective> defaultDirectives = null; + protected static Map<String, JRSTDirective> defaultDirectives = null; protected Map<String, JRSTDirective> directives = new HashMap<String, JRSTDirective>(); @@ -434,17 +434,16 @@ if (matcher.matches()) { pattern = Pattern.compile("\\p{Digit}+"); matcher = pattern.matcher(matcher.group()); - if (matcher.find()) + if (matcher.find()) { depth = Integer.parseInt(matcher.group()); + } } int levelInit = 0; try { levelInit = Integer.parseInt(eTitle.getFirst().attributeValue( "level")); } catch (NumberFormatException eee) { - log - .error( - "Can't parse level in: " + log.error("Can't parse level in: " + eTitle.getFirst().asXML(), eee); return; } @@ -460,11 +459,13 @@ int level = Integer.parseInt(el.attributeValue("level")); level = level - levelInit; el.addAttribute("level", "" + level); - if (depth == -1) + if (depth == -1) { title.add(el); + } else { - if (depth > level) + if (depth > level) { title.add(el); + } } } e.addAttribute("class", "contents"); @@ -492,8 +493,9 @@ */ private Element composeLineContent(LinkedList<Element> title, String num) { Element result = DocumentHelper.createElement(BULLET_LIST); - if (sectnum) + if (sectnum) { result.addAttribute("class", "auto-toc"); + } Element item = null; int cnt = 0; while (!title.isEmpty()) { @@ -611,8 +613,9 @@ // les eléments a enlever (deja parser : header, footer...) item = lexer.peekRemove(); - if (itemEquals("remove", item)) + if (itemEquals("remove", item)) { lexer.remove(); + } // le titre du doc item = lexer.peekTitle(); @@ -738,8 +741,9 @@ } // on ajoute le footer a la fin - if (footer != null) + if (footer != null) { result.add(footer); + } return result; } @@ -874,8 +878,9 @@ } else if (itemEquals("footnotes", item)) { lexer.remove(); Element[] list = composeFootnote(item); - for (Element l : list) + for (Element l : list) { parent.add(l); + } } else if (itemEquals(COMMENT, item)) { lexer.remove(); Element list = composeComment(item); @@ -1022,8 +1027,9 @@ } boolean[] labels = new boolean[labelMax]; - for (int i = 0; i < labels.length; i++) + for (int i = 0; i < labels.length; i++) { labels[i] = false; + } for (int i = 0; i < lblFootnotes.size(); i++) { labels[(Integer) lblFootnotes.get(i) - 1] = true; } @@ -1042,10 +1048,12 @@ efootnote.addAttribute("backrefs", "id" + idMax); if (type.equals("num") || type.equals("autoNumLabel")) { name = footnote.attributeValue("name"); - if (type.equals("autoNumLabel")) + if (type.equals("autoNumLabel")) { id = name; - else + } + else { label = name; + } } if (type.equals("autoNum") || type.equals("autoNumLabel")) { boolean done = false; @@ -1056,10 +1064,12 @@ label = "" + (i + 1); } } - if (!done) + if (!done) { label = "" + (labels.length + 1); - if (type.equals("autoNum")) + } + if (type.equals("autoNum")) { name = label; + } } if (type.equals("autoSymbol")) { @@ -1080,8 +1090,9 @@ } result[cnt].addElement("label").setText("" + label); efootnote.addAttribute("label", "" + label); - if (!type.equals("autoSymbol")) + if (!type.equals("autoSymbol")) { lblFootnotes.add(Integer.parseInt(label)); + } efootnote.addAttribute("type", type); eFootnotes.add(efootnote); String text = footnote.getText(); @@ -1187,10 +1198,11 @@ result = DocumentHelper.createElement(SIDEBAR); result.addElement(TITLE).addAttribute("inline", "true").setText( item.attributeValue(TITLE)); - if (item.attributeValue("subExiste").equals("true")) + if (item.attributeValue("subExiste").equals("true")) { result.addElement(SUBTITLE).addAttribute("inline", "true").setText( item.attributeValue(SUBTITLE)); - + } + String text = item.getText(); Document doc = newJRSTReader(new StringReader(text)); result.appendContent(doc.getRootElement()); @@ -1226,9 +1238,10 @@ for (int i = 0; i < lineDone.length; i++) lineDone[i] = false; for (Element l : lines) { - if (levels[cnt] == 0) + if (levels[cnt] == 0) { result.addElement(LINE).addAttribute("inline", "true").setText( l.getText()); + } else { if (!lineDone[cnt]) { Element newItem = DocumentHelper.createElement(LINE_BLOCK); @@ -1239,8 +1252,9 @@ eLine.addAttribute("level", "" + (levels[i] - 1)); eLine.setText(lines.get(i).getText()); lineDone[i] = true; - } else + } else { done = true; + } } Element eLineBlock = result.addElement(LINE_BLOCK); @@ -1322,10 +1336,11 @@ result.addAttribute("class", admonitionClass); result.addElement(TITLE).addAttribute("inline", "true").setText( title.trim()); - } else + } else { result = DocumentHelper.createElement(item.attributeValue("type") .toLowerCase()); - + } + String text = item.getText(); Document doc = newJRSTReader(new StringReader(text)); result.appendContent(doc.getRootElement()); @@ -1341,8 +1356,9 @@ private Node composeDirective(Element item) { Node result = item; String type = item.attributeValue(JRSTLexer.DIRECTIVE_TYPE); - if (type.equals("sectnum")) + if (type.equals("sectnum")) { sectnum = true; + } JRSTDirective directive = getDirective(type); if (directive == null) { directive = getDefaultDirective(type); @@ -2045,8 +2061,9 @@ label = "" + (j + 1); } } - if (!trouve) + if (!trouve) { label = "" + (lbls.length + 1); + } footnote.addAttribute("auto", "1"); for (int j = 0; j < eFootnotes.size(); j++) { Element eFootnote = (Element) eFootnotes.get(j); @@ -2139,8 +2156,9 @@ trouve = true; } } - if (!trouve) + if (!trouve) { hyper.addAttribute("refid", ref); + } hyper.setText(ref); text = txtDebut + hyper.asXML() + " " + txtFin; matcher = REGEX_HYPERLINK_REFERENCE.matcher(text);

1 0

r265 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 10:24:29 +0000 (Wed, 11 Feb 2009) New Revision: 265 Modified: jrst/trunk/pom.xml Log: ajout repository codelutin dans les poms des projets Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-11 10:24:27 UTC (rev 264) +++ jrst/trunk/pom.xml 2009-02-11 10:24:29 UTC (rev 265) @@ -206,6 +206,23 @@ <url>${maven.scm.url}</url> </scm> +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> +  <profiles> <profile>

1 0

r264 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 10:24:27 +0000 (Wed, 11 Feb 2009) New Revision: 264 Modified: maven-jrst-plugin/trunk/pom.xml Log: ajout repository codelutin dans les poms des projets Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-10 13:50:46 UTC (rev 263) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-11 10:24:27 UTC (rev 264) @@ -143,7 +143,7 @@ <repository> <id>codelutin-repository</id> <name>CodeLutinRepository</name> - <url>${labs.builder.url}</url> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> <snapshots> <enabled>true</enabled> <checksumPolicy>warn</checksumPolicy>

1 0

r263 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 10 Feb '09

10 Feb '09

Author: tchemit Date: 2009-02-10 13:50:46 +0000 (Tue, 10 Feb 2009) New Revision: 263 Modified: maven-jrst-plugin/trunk/pom.xml Log: utilisation de lutinproject 3.4 plutot que lutinpluginproject Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-10 13:50:17 UTC (rev 262) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-10 13:50:46 UTC (rev 263) @@ -18,7 +18,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>jrst</artifactId> - <version>0.8.4-SNAPSHOT</version> + <version>${jrst.version}</version> <scope>compile</scope> </dependency> <dependency>

1 0

r262 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 10 Feb '09

10 Feb '09

Author: tchemit Date: 2009-02-10 13:50:17 +0000 (Tue, 10 Feb 2009) New Revision: 262 Modified: maven-jrst-plugin/trunk/pom.xml Log: utilisation de lutinproject 3.4 plutot que lutinpluginproject Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-10 13:40:34 UTC (rev 261) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-10 13:50:17 UTC (rev 262) @@ -8,7 +8,7 @@  <parent> <groupId>org.codelutin</groupId> - <artifactId>lutinpluginproject</artifactId> + <artifactId>lutinproject</artifactId> <version>3.4-SNAPSHOT</version> </parent>

1 0

r261 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 10 Feb '09

10 Feb '09

Author: tchemit Date: 2009-02-10 13:40:34 +0000 (Tue, 10 Feb 2009) New Revision: 261 Modified: maven-jrst-plugin/trunk/changelog.txt maven-jrst-plugin/trunk/pom.xml Log: utilisation de lutinproject 3.4 plutot que lutinpluginproject Modified: maven-jrst-plugin/trunk/changelog.txt =================================================================== --- maven-jrst-plugin/trunk/changelog.txt 2009-02-05 22:01:26 UTC (rev 260) +++ maven-jrst-plugin/trunk/changelog.txt 2009-02-10 13:40:34 UTC (rev 261) @@ -1,5 +1,5 @@ ver-0-8-4 chatellier 200902xx - * 20090205 [chemit] use lutinpluginproject-3.4 + * 20090210 [chemit] use lutinproject-3.4 * 20090205 Set default locale to 'en' * 20090205 Remove some required setting for parameter with default values * 20090205 Write javadoc in english Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-05 22:01:26 UTC (rev 260) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-10 13:40:34 UTC (rev 261) @@ -24,9 +24,24 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinpluginutil</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + </dependencies>  @@ -55,6 +70,8 @@ <maven.site.locales>fr,en</maven.site.locales> <jrst.version>0.8.4-SNAPSHOT</jrst.version> + + <maven.version>2.0.9</maven.version> </properties> <build> @@ -63,6 +80,19 @@ <plugins> +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> +  <plugin> <groupId>org.codelutin</groupId> @@ -89,6 +119,16 @@ </build> +  + <reporting> + <plugins> +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + </plugins> + </reporting> +    @@ -98,6 +138,23 @@ <url>${maven.scm.url}</url> </scm> +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>${labs.builder.url}</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> +  <profiles> <profile>

1 0

r260 - in jrst/trunk: . src/main src/main/assembly
by tchemit＠users.labs.libre-entreprise.org 05 Feb '09

05 Feb '09

Author: tchemit Date: 2009-02-05 22:01:26 +0000 (Thu, 05 Feb 2009) New Revision: 260 Added: jrst/trunk/src/main/assembly/ jrst/trunk/src/main/assembly/deps.xml jrst/trunk/src/main/assembly/full.xml Modified: jrst/trunk/changelog.txt jrst/trunk/pom.xml Log: use lutinproject 3.4, make assembly Modified: jrst/trunk/changelog.txt =================================================================== --- jrst/trunk/changelog.txt 2009-02-05 21:58:47 UTC (rev 259) +++ jrst/trunk/changelog.txt 2009-02-05 22:01:26 UTC (rev 260) @@ -6,7 +6,7 @@ * Re add i18n plugin on build * Reenable tests during maven build * Move test to junit 4 - * switch to lutinproject 3.3 + * switch to lutinproject 3.4 ver-0.8.3 chemit 20081009 Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-05 21:58:47 UTC (rev 259) +++ jrst/trunk/pom.xml 2009-02-05 22:01:26 UTC (rev 260) @@ -1,107 +1,22 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> -  <modelVersion>4.0.0</modelVersion> -  +  +  +  + <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> -  <artifactId>jrst</artifactId> - <name>JRst</name> - -  - <packaging>jar</packaging> - -  <version>0.8.4-SNAPSHOT</version> -  - <description>Parser RST en Java.</description> - <inceptionYear>2004</inceptionYear> - - <properties> -  - <labs.id>54</labs.id> - -  - <labs.project>jrst</labs.project> - -  - <maven.site.locales>fr,en</maven.site.locales> - </properties> - -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - - <build> - <plugins> -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>org.codelutin.jrst.JRST</mainClass> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> - <configuration> - <link>http://java.sun.com/javase/6/docs/api/index.html</link> - <link>http://topia.labs.libre-entreprise.org/apidocs/</link> - <link>http://lutinutil.labs.libre-entreprise.org/apidocs/</link> - </configuration> - </plugin> - </plugins> - </build> - -  <dependencies> <dependency> <groupId>commons-lang</groupId> @@ -112,7 +27,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>1.0.2</version> + <version>${lutinutil.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -166,4 +81,178 @@ <scope>runtime</scope> </dependency> </dependencies> + +  +  +  + + <name>JRst</name> + <description>Parser RST en Java.</description> + <inceptionYear>2004</inceptionYear> + +  +  +  + <packaging>jar</packaging> + + <properties> +  + <labs.id>54</labs.id> + +  + <labs.project>jrst</labs.project> + +  + <maven.site.locales>fr,en</maven.site.locales> + </properties> + + <build> + + <defaultGoal>install</defaultGoal> + + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>org.codelutin.jrst.JRST</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + <executions> + <execution> + <id>copy-dependencies</id> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + +  + </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <id>create-assembly</id> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + + </build> + +  +  +  +  + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> + +  + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assembly</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + </project> Added: jrst/trunk/src/main/assembly/deps.xml =================================================================== --- jrst/trunk/src/main/assembly/deps.xml (rev 0) +++ jrst/trunk/src/main/assembly/deps.xml 2009-02-05 22:01:26 UTC (rev 260) @@ -0,0 +1,34 @@ +<assembly> + <id>deps</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>junit:junit</exclude> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> +  + <source>target/${project.build.finalName}.jar</source> + </file> + <file> + <source>target/classes/THIRD-PARTY.txt</source> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: jrst/trunk/src/main/assembly/full.xml =================================================================== --- jrst/trunk/src/main/assembly/full.xml (rev 0) +++ jrst/trunk/src/main/assembly/full.xml 2009-02-05 22:01:26 UTC (rev 260) @@ -0,0 +1,38 @@ +<assembly> + <id>full</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> +  + <source>target/${project.build.finalName}.jar</source> + </file> + <file> + <source>target/classes/THIRD-PARTY.txt</source> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file

1 0

r259 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 05 Feb '09

05 Feb '09

Author: tchemit Date: 2009-02-05 21:58:47 +0000 (Thu, 05 Feb 2009) New Revision: 259 Modified: maven-jrst-plugin/trunk/changelog.txt maven-jrst-plugin/trunk/pom.xml Log: use lutinproject 3.4 Modified: maven-jrst-plugin/trunk/changelog.txt =================================================================== --- maven-jrst-plugin/trunk/changelog.txt 2009-02-05 18:11:01 UTC (rev 258) +++ maven-jrst-plugin/trunk/changelog.txt 2009-02-05 21:58:47 UTC (rev 259) @@ -1,4 +1,5 @@ ver-0-8-4 chatellier 200902xx + * 20090205 [chemit] use lutinpluginproject-3.4 * 20090205 Set default locale to 'en' * 20090205 Remove some required setting for parameter with default values * 20090205 Write javadoc in english Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-05 18:11:01 UTC (rev 258) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-05 21:58:47 UTC (rev 259) @@ -9,10 +9,9 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinpluginproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> -  <artifactId>maven-jrst-plugin</artifactId> <dependencies> @@ -52,11 +51,44 @@  <labs.project>jrst</labs.project> -  +  <maven.site.locales>fr,en</maven.site.locales> + <jrst.version>0.8.4-SNAPSHOT</jrst.version> </properties> + <build> + + <defaultGoal>install</defaultGoal> + + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> +    @@ -66,5 +98,42 @@ <url>${maven.scm.url}</url> </scm> +  + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + </project> -

1 0

r258 - maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin
by chatellier＠users.labs.libre-entreprise.org 05 Feb '09

05 Feb '09

Author: chatellier Date: 2009-02-05 18:11:01 +0000 (Thu, 05 Feb 2009) New Revision: 258 Modified: maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java Log: Move @maven annotation at end Modified: maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java =================================================================== --- maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2009-02-05 18:03:16 UTC (rev 257) +++ maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2009-02-05 18:11:01 UTC (rev 258) @@ -44,9 +44,6 @@ * All other files will be put on <tt>target/generated-site</tt> in * same directory structure. * - * @goal jrst - * @phase pre-site - * * Created: 14 avril 2006 * * @author ruchaud @@ -54,6 +51,9 @@ * * Last update: $Date$ * by : $Author$ + * + * @goal jrst + * @phase pre-site */ public class JRstPlugin extends AbstractMojo {

1 0

r257 - in jrst/trunk/src/site: . en/rst/devel fr/rst/devel
by chatellier＠users.labs.libre-entreprise.org 05 Feb '09

05 Feb '09

Author: chatellier Date: 2009-02-05 18:03:16 +0000 (Thu, 05 Feb 2009) New Revision: 257 Modified: jrst/trunk/src/site/en/rst/devel/externalDoc.rst jrst/trunk/src/site/en/rst/devel/library.rst jrst/trunk/src/site/fr/rst/devel/docExterne.rst jrst/trunk/src/site/fr/rst/devel/librairies.rst jrst/trunk/src/site/site_fr.xml Log: Update jrst site Modified: jrst/trunk/src/site/en/rst/devel/externalDoc.rst =================================================================== --- jrst/trunk/src/site/en/rst/devel/externalDoc.rst 2009-02-05 18:03:06 UTC (rev 256) +++ jrst/trunk/src/site/en/rst/devel/externalDoc.rst 2009-02-05 18:03:16 UTC (rev 257) @@ -8,4 +8,4 @@ XSL used to convert the XML into RST : http://www.merten-home.de/FreeSoftware/xml2rst/ -To generate javadoc in RST form : http://java.sun.com/j2se/1.3/docs/tooldocs/javadoc/overview.html \ No newline at end of file +To generate javadoc in RST form : http://java.sun.com/javase/6/docs/technotes/guides/javadoc/doclet/overview.… \ No newline at end of file Modified: jrst/trunk/src/site/en/rst/devel/library.rst =================================================================== --- jrst/trunk/src/site/en/rst/devel/library.rst 2009-02-05 18:03:06 UTC (rev 256) +++ jrst/trunk/src/site/en/rst/devel/library.rst 2009-02-05 18:03:16 UTC (rev 257) @@ -26,6 +26,6 @@ Xmlunit_ used to compare two XML files to show their differences. .. _dom4j: http://www.dom4j.org -.. _javax.xml.transform: http://java.sun.com/j2se/1.4.2/docs/api/javax/xml/transform/package-summary… +.. _javax.xml.transform: http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.h… .. _SDoc: http://sdoc.sourceforge.net/wiki/pmwiki.php .. _Xmlunit: http://xmlunit.sourceforge.net/ Modified: jrst/trunk/src/site/fr/rst/devel/docExterne.rst =================================================================== --- jrst/trunk/src/site/fr/rst/devel/docExterne.rst 2009-02-05 18:03:06 UTC (rev 256) +++ jrst/trunk/src/site/fr/rst/devel/docExterne.rst 2009-02-05 18:03:16 UTC (rev 257) @@ -8,4 +8,4 @@ Un XSL permettant de convertir le XML en RST : http://www.merten-home.de/FreeSoftware/xml2rst/ -Pour la génération de la javaDoc en RST : http://java.sun.com/j2se/1.3/docs/tooldocs/javadoc/overview.html \ No newline at end of file +Pour la génération de la javaDoc en RST : http://java.sun.com/javase/6/docs/technotes/guides/javadoc/doclet/overview.… \ No newline at end of file Modified: jrst/trunk/src/site/fr/rst/devel/librairies.rst =================================================================== --- jrst/trunk/src/site/fr/rst/devel/librairies.rst 2009-02-05 18:03:06 UTC (rev 256) +++ jrst/trunk/src/site/fr/rst/devel/librairies.rst 2009-02-05 18:03:16 UTC (rev 257) @@ -25,6 +25,6 @@ Xmlunit_ permet de comparer deux fichiers XML pour mettre en évidences les différences. .. _dom4j: http://www.dom4j.org -.. _javax.xml.transform: http://java.sun.com/j2se/1.4.2/docs/api/javax/xml/transform/package-summary… +.. _javax.xml.transform: http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.h… .. _SDoc: http://sdoc.sourceforge.net/wiki/pmwiki.php .. _Xmlunit: http://xmlunit.sourceforge.net/ \ No newline at end of file Modified: jrst/trunk/src/site/site_fr.xml =================================================================== --- jrst/trunk/src/site/site_fr.xml 2009-02-05 18:03:06 UTC (rev 256) +++ jrst/trunk/src/site/site_fr.xml 2009-02-05 18:03:16 UTC (rev 257) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="JRst"> - + + <publishDate format="dd/MM/yyyy"/> + <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId>

1 0