- I18n-commits - mailman.cloud.codelutin.com

r1682 - in trunk: . nuiton-i18n-api nuiton-i18n-editor
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:38:44 +0100 (Mon, 02 Nov 2009) New Revision: 1682 Modified: trunk/ trunk/nuiton-i18n-api/ trunk/nuiton-i18n-editor/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target + target *.iml Property changes on: trunk/nuiton-i18n-api ___________________________________________________________________ Modified: svn:ignore - target velocity.log maven.log .eclipse .classpath lutinutil.iml lutinutil.ipr lutinutil.iws .settings .project + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Property changes on: trunk/nuiton-i18n-editor ___________________________________________________________________ Modified: svn:ignore - target .project .classpath *.log + target .project .classpath *.log *.iml

1 0

r1681 - trunk/maven-i18n-plugin
by tchemit＠users.nuiton.org 01 Nov '09

01 Nov '09

Author: tchemit Date: 2009-11-01 17:24:22 +0100 (Sun, 01 Nov 2009) New Revision: 1681 Modified: trunk/maven-i18n-plugin/ Log: svn ignore Property changes on: trunk/maven-i18n-plugin ___________________________________________________________________ Modified: svn:ignore - .project .classpath .settings target *.ipr *.iws + .project .classpath .settings target *.ipr *.iml *.iws

1 0

r1680 - in trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor: . ui/project
by tchemit＠users.nuiton.org 22 Oct '09

22 Oct '09

Author: tchemit Date: 2009-10-22 12:59:35 +0200 (Thu, 22 Oct 2009) New Revision: 1680 Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx Log: move context entry def static methods to jaxx.runtime.Util Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2009-10-22 10:59:35 UTC (rev 1680) @@ -23,7 +23,6 @@ import java.io.IOException; import javax.swing.SwingUtilities; -import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.SwingUtil; import jaxx.runtime.Util; import org.apache.commons.logging.Log; @@ -61,7 +60,7 @@ log.info(_("i18neditor.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); - Util.checkJAXXContextEntry(context, JAXXContextEntryDef.newDef(I18nEditorConfig.class)); + Util.checkJAXXContextEntry(context, Util.newContextEntryDef(I18nEditorConfig.class)); I18nEditorConfig config = context.getContextValue(I18nEditorConfig.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-22 10:59:35 UTC (rev 1680) @@ -21,6 +21,7 @@ import java.beans.PropertyChangeListener; import java.util.List; import java.util.Locale; +import jaxx.runtime.Util; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,11 +45,11 @@ //------------------------------------------- // UI instances //------------------------------------------- - public static final JAXXContextEntryDef<I18nEditorUI> MAIN_UI_ENTRY_DEF = JAXXContextEntryDef.newDef("mainui", I18nEditorUI.class); - public static final JAXXContextEntryDef<I18nProject> PROJECT_DEF = JAXXContextEntryDef.newDef(I18nProject.class); - private static final JAXXContextEntryDef<String> SELECTED_KEY_DEF = JAXXContextEntryDef.newDef("selectedKey", String.class); - private static final JAXXContextEntryDef<String> RE_SELECTED_KEY_DEF = JAXXContextEntryDef.newDef("reSelectedKey", String.class); - private static final JAXXContextEntryDef<TreeModelMode> TREE_MODEL_MODE_DEF = JAXXContextEntryDef.newDef(TreeModelMode.class); + public static final JAXXContextEntryDef<I18nEditorUI> MAIN_UI_ENTRY_DEF = Util.newContextEntryDef("mainui", I18nEditorUI.class); + public static final JAXXContextEntryDef<I18nProject> PROJECT_DEF = Util.newContextEntryDef(I18nProject.class); + private static final JAXXContextEntryDef<String> SELECTED_KEY_DEF = Util.newContextEntryDef("selectedKey", String.class); + private static final JAXXContextEntryDef<String> RE_SELECTED_KEY_DEF = Util.newContextEntryDef("reSelectedKey", String.class); + private static final JAXXContextEntryDef<TreeModelMode> TREE_MODEL_MODE_DEF = Util.newContextEntryDef(TreeModelMode.class); public static final String PROJECT_PROPERTY = "project"; public static final String SELECTED_PACKAGES_PROPERTY = "selectedPackages"; public static final String SELECTED_BUNDLES_PROPERTY = "selectedBundles"; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2009-10-16 17:00:52 UTC (rev 1679) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2009-10-22 10:59:35 UTC (rev 1680) @@ -35,7 +35,7 @@ import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.WizardOperationState; import jaxx.runtime.swing.wizard.WizardUtil; -import static jaxx.runtime.context.JAXXContextEntryDef.newDef; +import static jaxx.runtime.Util.newContextEntryDef; import static jaxx.runtime.Util.checkJAXXContextEntry; import org.nuiton.i18n.editor.I18nEditorContext; @@ -58,9 +58,9 @@ super(owner); // verification du context parent - checkJAXXContextEntry(parentContext, newDef(ProjectUIModel.class)); - checkJAXXContextEntry(parentContext, newDef("apply", Runnable.class)); - checkJAXXContextEntry(parentContext, newDef("cancel", Runnable.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef(ProjectUIModel.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef("apply", Runnable.class)); + checkJAXXContextEntry(parentContext, newContextEntryDef("cancel", Runnable.class)); if (owner != null) { setContextValue(owner, "parent");

1 0

r1679 - in trunk/nuiton-i18n-editor: . src/main/java/org/nuiton/i18n/editor src/main/java/org/nuiton/i18n/editor/ui src/main/java/org/nuiton/i18n/editor/ui/project
by tchemit＠users.nuiton.org 16 Oct '09

16 Oct '09

Author: tchemit Date: 2009-10-16 19:00:52 +0200 (Fri, 16 Oct 2009) New Revision: 1679 Modified: trunk/nuiton-i18n-editor/pom.xml trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx Log: use JAXX-2.0.x Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/pom.xml 2009-10-16 17:00:52 UTC (rev 1679) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.0.0-rc-5-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> @@ -34,13 +34,13 @@  <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing</artifactId> + <artifactId>jaxx-runtime</artifactId> <version>${jaxx.version}</version> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing-widget</artifactId> + <artifactId>jaxx-widgets</artifactId> <version>${jaxx.version}</version> </dependency> @@ -58,8 +58,8 @@ <licenses> <license> <name>GPL</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> + <url>${maven.license.file}</url> + <distribution>local</distribution> </license> </licenses> @@ -73,8 +73,8 @@  <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> - <jaxx.version>1.7.1-SNAPSHOT</jaxx.version> - <lutinutil.version>1.1.0-rc-9-SNAPSHOT</lutinutil.version> + <jaxx.version>2.0.0-SNAPSHOT</jaxx.version> + <lutinutil.version>1.1.2-SNAPSHOT</lutinutil.version>  <license.licenseName>gpl_v3</license.licenseName> @@ -135,10 +135,7 @@ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <configuration> - <copyToMETA_INF>true</copyToMETA_INF> - </configuration> + <artifactId>maven-license-plugin</artifactId> <executions> <execution> <id>attach-licenses</id> @@ -176,12 +173,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <silent>true</silent> - </configuration> <executions> <execution> - <id>copy-dependencies</id> + <id>copy-deps</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <silent>true</silent> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> </execution> </executions> @@ -191,7 +195,41 @@ <pluginManagement> <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <configuration> + <jnlpExtensions> + <jnlpExtension> + <name>sun</name> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <includes> + <include>javax.help:javahelp</include> + </includes> + </jnlpExtension> + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer </title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> + </configuration> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> + <copyToMETA_INF>true</copyToMETA_INF> + </configuration> + </plugin> + + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -211,7 +249,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.2-rc-1</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin> @@ -220,6 +258,16 @@ </pluginManagement> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + </plugin> + </plugins> + </reporting> +    @@ -235,70 +283,43 @@ </activation> <build> <plugins> -  -  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> <executions> - <-execution> - <id>JnlpSun</id> - <phase>verify</phase> - <configuration> - <tasks> - <mkdir dir="${jnlp.build.directory}"/> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="javahelp-2.0.02.jar"/> - <filter token="url" value="${jnlpCodebase}"/> - </filterset> - </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="jxlayer-3.0.1.jar"/> - <filter token="url" value="${jnlpCodebase}"/> - </filterset> - </copy> - <copy file="${project.build.directory}/lib/javahelp-2.0.02.jar" - verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" - failonerror="false"/> - <copy file="${project.build.directory}/lib/jxlayer-3.0.1.jar" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}/lib" failonerror="false"/> - </tasks> - </configuration> + <execution> + <id>get-keystore</id> <goals> - <goal>run</goal> + <goal>share-server-secret</goal> </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> <execution> - <id>JnlpToSite</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.site.gen.dir}/resources"/> - <copy todir="${maven.site.gen.dir}/resources" verbose="true" - failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**"/> - </fileset> - <fileset dir="target"> - <include name="${project.build.finalName}-bin.zip"/> - </fileset> - - </copy> - </tasks> - </configuration> + <id>generate-jnlp</id> + <phase>package</phase> <goals> - <goal>run</goal> + <goal>jnlp-inline</goal> </goals> </execution> </executions> - </plugin--> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -318,64 +339,6 @@ </executions> </plugin> -  </plugins> </build> </profile> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2009-10-16 17:00:52 UTC (rev 1679) @@ -23,7 +23,7 @@ import java.io.IOException; import javax.swing.SwingUtilities; -import jaxx.runtime.JAXXContextEntryDef; +import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.SwingUtil; import jaxx.runtime.Util; import org.apache.commons.logging.Log; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java 2009-10-16 17:00:52 UTC (rev 1679) @@ -44,9 +44,9 @@ * et quel est son type (local ou pas). * * @author chemit - * @see jaxx.runtime.DefaultApplicationContext.AutoLoad + * @see jaxx.runtime.context.DefaultApplicationContext.AutoLoad */ -(a)jaxx.runtime.DefaultApplicationContext.AutoLoad +(a)jaxx.runtime.context.DefaultApplicationContext.AutoLoad public class I18nEditorConfig extends org.nuiton.util.ApplicationConfig { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2009-10-16 17:00:52 UTC (rev 1679) @@ -21,7 +21,7 @@ import java.beans.PropertyChangeListener; import java.util.List; import java.util.Locale; -import jaxx.runtime.JAXXContextEntryDef; +import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.editor.project.I18nProject; @@ -37,7 +37,7 @@ * * @author chemit */ -public class I18nEditorContext extends jaxx.runtime.DefaultApplicationContext { +public class I18nEditorContext extends jaxx.runtime.context.DefaultApplicationContext { /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(I18nEditorContext.class); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2009-10-16 17:00:52 UTC (rev 1679) @@ -279,8 +279,8 @@ <JToggleButton id='toFlatMode'/> <JSeparator orientation='vertical'/> <javax.swing.Box.Filler constructorParams='SwingUtil.newMinDimension(), SwingUtil.newMinDimension(), SwingUtil.newMaxXDimension()'/> - <JButton id='collapseAll' onActionPerformed='collapseAll((PropertieNode)tree.getSelectionValue())'/> - <JButton id='expandAll' onActionPerformed='expandAll((PropertieNode)tree.getSelectionValue())'/> + <JButton id='collapseAll' onActionPerformed='collapseAll((PropertieNode)tree.getSelectionPath().getLastPathComponent())'/> + <JButton id='expandAll' onActionPerformed='expandAll((PropertieNode)tree.getSelectionPath().getLastPathComponent())'/> </JToolBar> <PropertiesTreeModel id='treeModel' mode='{context.getTreeModelMode()}'/> @@ -295,8 +295,8 @@  <JScrollPane id='keysView'> <JTree id="tree" constructorParams='treeModel' - onKeyReleased='updateSelectedKey((PropertieNode) tree.getSelectionValue())' - onMouseClicked='updateSelectedKey((PropertieNode) tree.getSelectionValue())' + onKeyReleased='updateSelectedKey((PropertieNode) tree.getSelectionPath().getLastPathComponent())' + onMouseClicked='updateSelectedKey((PropertieNode) tree.getSelectionPath().getLastPathComponent())' cellRenderer='{ new DefaultTreeCellRenderer() { private static final long serialVersionUID=1L; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java 2009-10-16 17:00:52 UTC (rev 1679) @@ -43,7 +43,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import jaxx.runtime.DefaultApplicationContext.AutoLoad; +import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.editor.config.ConfigUI; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2009-10-16 16:44:14 UTC (rev 1678) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2009-10-16 17:00:52 UTC (rev 1679) @@ -32,10 +32,10 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.MyDefaultCellEditor; +import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.WizardOperationState; import jaxx.runtime.swing.wizard.WizardUtil; -import static jaxx.runtime.JAXXContextEntryDef.newDef; +import static jaxx.runtime.context.JAXXContextEntryDef.newDef; import static jaxx.runtime.Util.checkJAXXContextEntry; import org.nuiton.i18n.editor.I18nEditorContext; @@ -65,11 +65,7 @@ if (owner != null) { setContextValue(owner, "parent"); } - if (parentContext instanceof jaxx.runtime.JAXXInitialContext) { - ((jaxx.runtime.JAXXInitialContext)parentContext).to(this); - } else { - setContextValue(parentContext); - } + SwingUtil.initContext(this, parentContext); contextInitialized = true; }

1 0

r1678 - in trunk/maven-i18n-plugin/src/main: java/org/nuiton/i18n/plugin/parser/impl resources
by tchemit＠users.nuiton.org 16 Oct '09

16 Oct '09

Author: tchemit Date: 2009-10-16 18:44:14 +0200 (Fri, 16 Oct 2009) New Revision: 1678 Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfig.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java trunk/maven-i18n-plugin/src/main/resources/log4j.properties Log: clean javadoc + fix logger Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java 2009-10-16 16:44:14 UTC (rev 1678) @@ -134,10 +134,6 @@ } } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.core.Parser#parseLine(java.io.File, java.lang.String) - */ @Override public void parseLine(File srcFile, String line) { String keysSet = filter.parse(line); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfig.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfig.java 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfig.java 2009-10-16 16:44:14 UTC (rev 1678) @@ -49,11 +49,6 @@ return "java-action-config.getter"; } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) - */ - public String extract(String i18nString) { Matcher matcher = MATCH_PATTERN.matcher(i18nString.trim()); if (matcher.matches()) { @@ -62,10 +57,6 @@ return null; } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.core.Parser#parseLine(java.io.File, java.lang.String) - */ @Override public void parseLine(File srcFile, String line) { String key = extract(line); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java 2009-10-16 16:44:14 UTC (rev 1678) @@ -101,10 +101,6 @@ this.rulesJaxx = rulesJaxx; } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) - */ @Override public String extract(String i18nString) { return i18nString.length() == 0 ? null : i18nString; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java 2009-10-16 16:44:14 UTC (rev 1678) @@ -93,10 +93,6 @@ return "swixat.rules"; } - /* - * (non-Javadoc) - * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) - */ @Override public String extract(String i18nString) { return i18nString; Modified: trunk/maven-i18n-plugin/src/main/resources/log4j.properties =================================================================== --- trunk/maven-i18n-plugin/src/main/resources/log4j.properties 2009-10-11 11:27:44 UTC (rev 1677) +++ trunk/maven-i18n-plugin/src/main/resources/log4j.properties 2009-10-16 16:44:14 UTC (rev 1678) @@ -6,5 +6,5 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.codelutin.util=INFO -log4j.logger.org.codelutin.i18n.plugin=INFO +log4j.logger.org.nuiton.util=WARN +log4j.logger.org.nuiton.i18n.plugin=INFO

1 0

r1677 - in trunk: . nuiton-i18n-api
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 13:27:44 +0200 (Sun, 11 Oct 2009) New Revision: 1677 Modified: trunk/nuiton-i18n-api/pom.xml trunk/pom.xml Log: - use jrst.Version - use redmine.releaseFiles to collect files to send to redmine - bump junit, i18n and processor versions Modified: trunk/nuiton-i18n-api/pom.xml =================================================================== --- trunk/nuiton-i18n-api/pom.xml 2009-10-10 16:37:32 UTC (rev 1676) +++ trunk/nuiton-i18n-api/pom.xml 2009-10-11 11:27:44 UTC (rev 1677) @@ -51,10 +51,10 @@ <packaging>jar</packaging> <properties> +  - <redmine.releaseFiles>target/${project.artifactId}-${project.version}-deps.zip, - target/${project.artifactId}-${project.version}-full.zip - </redmine.releaseFiles> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 16:37:32 UTC (rev 1676) +++ trunk/pom.xml 2009-10-11 11:27:44 UTC (rev 1677) @@ -202,7 +202,7 @@  <projectId>i18n</projectId> - <processor.version>1.0.1-SNAPSHOT</processor.version> + <processor.version>1.0.1</processor.version> </properties>

1 0

r1676 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 18:37:32 +0200 (Sat, 10 Oct 2009) New Revision: 1676 Modified: trunk/pom.xml Log: utilisation de mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-09 14:32:33 UTC (rev 1675) +++ trunk/pom.xml 2009-10-10 16:37:32 UTC (rev 1676) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>i18n</artifactId>

1 0

r1675 - trunk
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 16:32:33 +0200 (Fri, 09 Oct 2009) New Revision: 1675 Modified: trunk/pom.xml Log: - use helper 1.0.3 (from mavenpom) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-29 11:41:17 UTC (rev 1674) +++ trunk/pom.xml 2009-10-09 14:32:33 UTC (rev 1675) @@ -202,9 +202,6 @@  <projectId>i18n</projectId> -  - <helper.version>1.1.0-SNAPSHOT</helper.version> - <processor.version>1.0.1-SNAPSHOT</processor.version> </properties>

1 0

r1674 - in trunk: . maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/event maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: tchemit Date: 2009-09-29 13:41:17 +0200 (Tue, 29 Sep 2009) New Revision: 1674 Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/SourceEntry.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nPlugin.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Bundle.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Generate.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Getter.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/I18nLogger.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParser.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/event/KeysModifier.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidation.java trunk/pom.xml Log: use maven-helper-plugin 1.1.0 Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nPlugin.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nPlugin.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nPlugin.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -28,7 +28,7 @@ import java.util.Locale; import java.util.Properties; import java.util.SortedSet; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Classe permettant d'obenir les parametres pendant les différentes phases Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Bundle.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Bundle.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Bundle.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -44,10 +44,10 @@ import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; import org.nuiton.i18n.bundle.I18nBundleEntry; -import org.nuiton.util.PluginHelper.SortedProperties; +import org.nuiton.io.SortedProperties; import org.nuiton.i18n.bundle.I18nBundleFactory; -import org.nuiton.util.DependencyUtil; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.DependencyUtil; +import org.nuiton.plugin.PluginHelper; /** * Créer un bundle pour une application finale. Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Generate.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Generate.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Generate.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -19,7 +19,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.nuiton.util.PluginHelper.SortedProperties; +import org.nuiton.io.SortedProperties; import java.io.File; import java.io.FileOutputStream; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Getter.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Getter.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/Getter.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.Locale; -import org.nuiton.util.PluginHelper; -import org.nuiton.util.PluginHelper.SortedProperties; +import org.nuiton.plugin.PluginHelper; +import org.nuiton.io.SortedProperties; /** * Recupere les différents fichiers des parsers en un fichier de proprietes. Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/I18nLogger.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/I18nLogger.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/I18nLogger.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -18,12 +18,11 @@ */ package org.nuiton.i18n.plugin; -import org.nuiton.util.SourceEntry; import org.apache.maven.plugin.logging.SystemStreamLog; import java.beans.Introspector; import java.io.File; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * Le logger utilisé par les mojo. * Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/SourceEntry.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/SourceEntry.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/SourceEntry.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -0,0 +1,264 @@ +/* + * *##% + * Maven helper plugin + * Copyright (C) 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package org.nuiton.i18n.plugin; + +import org.nuiton.io.FileUpdater; +import org.apache.maven.plugin.logging.Log; +import org.codehaus.plexus.util.DirectoryScanner; + +import java.io.File; +import java.lang.annotation.Annotation; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * A simple model for a sourceEntry represents by a basedir and includes and/or exlucdes pattern. + * + * The class offers the usefull method : + * {@link #getIncludedFiles(File, String[], String[])} + * + * to obtain the list of files from + * the {@link #basedir} directory which respects the {@link #includes} and/or + * {@link #excludes} patterns using an internal {@link DirectoryScanner} object. + * + * Note : The class does not extends <code>DirectoryScanner</code> since we DO not want + * to expose his methods. + * + * @author tony + */ +public class SourceEntry { + /** + * If you want to restrict use of the entry, set the class name goal to + * this property via {@link #setSpecificGoal(String)}. + * + * If let to <code>null</code>, all goals can use this entry. + */ + protected String specificGoal = null; + + protected File basedir; + + protected String[] includes; + protected String[] excludes; + /** Files to be find */ + protected String[] files; + + protected String[] skipFiles; + + protected String skipMessage; + + protected FileUpdater updater; + + public String[] getExcludes() { + return excludes; + } + + public void setExcludes(String[] excludes) { + this.excludes = excludes; + } + + public String[] getIncludes() { + return includes; + } + + public void setIncludes(String[] includes) { + this.includes = includes; + } + + public File getBasedir() { + return basedir; + } + + public void setBasedir(File basedir) { + this.basedir = basedir; + } + + public String getSpecificGoal() { + return specificGoal; + } + + public void setSpecificGoal(String specificGoal) { + this.specificGoal = specificGoal; + } + + public boolean useForGoal(String goal) { + return specificGoal == null || specificGoal.equalsIgnoreCase(goal); + } + + public boolean hasSrc() { + return basedir != null; + } + + public boolean hasIncludes() { + return includes != null && includes.length > 0; + } + + public boolean hasExcludes() { + return excludes != null && excludes.length > 0; + } + + /** + * Test if a file is up to date and not to be treated. + * + * + * @param file the file path to test + * @return <code>true</code> if file is up to date and do not need to be parsed + * @see FileUpdater + */ + public final boolean isFileUptodate(File file) { + return updater != null && updater.isFileUpToDate(file); + } + + public String[] getIncludedFiles(File defaultBasedir, String[] defaultIncludes, String[] defaultExcludes) { + // normalized entry + if (!hasSrc()) { + setBasedir(defaultBasedir); + } + if (!hasIncludes()) { + setIncludes(defaultIncludes); + } + if (!hasExcludes()) { + setExcludes(defaultExcludes); + } + // init directory scanner + DirectoryScanner ds = new DirectoryScanner(); + ds.setBasedir(getBasedir()); + ds.setIncludes(getIncludes()); + if (hasExcludes()) { + ds.setExcludes(getExcludes()); + } + // scan + ds.scan(); + // get found files + String[] foundFiles; + foundFiles = ds.getIncludedFiles(); + return foundFiles; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("basedir:").append(basedir); + if (includes != null) { + sb.append(", includes:").append(Arrays.toString(includes)); + } + if (excludes != null) { + sb.append(", excludes:").append(Arrays.toString(excludes)); + } + return sb.toString(); + } + + public String[] getIncludedFiles(File basedir, String[] defaultIncludes, String[] defaultExcludes, URLClassLoader loader, List<String> annotationClass, Log log) { + List<String> result = new ArrayList<String>(); + + for (String s : getIncludedFiles(basedir, defaultIncludes, defaultExcludes)) { + if (filterByAnnotation(s, loader, annotationClass, log)) { + result.add(s); + } + } + return result.toArray(new String[result.size()]); + } + + protected boolean filterByAnnotation(String file, URLClassLoader loader, List<String> annotationClass, Log log) { + + + Annotation annotation = getAnnotation(file, loader, annotationClass, log); + + boolean result = annotation != null; + + if (result && log.isDebugEnabled()) { + log.debug("find i18n annotated file : " + file); + } + return result; + } + + protected String getFQN(String file) { + String filePath = file; + filePath = filePath.substring(0, filePath.length() - ".java".length()); + String replaceEx = File.separator.equals("\\") ? "\\\\" : File.separator; + return filePath.replaceAll(replaceEx, "."); + } + + public Class<?> getClass(String file, URLClassLoader loader, Log log) { + String fqn = getFQN(file); + try { + return loader.loadClass(fqn); + + } catch (Throwable e) { + log.warn("could not find class " + fqn + " " + e); + return null; + } + } + + public Annotation getAnnotation(String file, URLClassLoader loader, List<String> annotationClass, Log log) { + + Class<?> currentClass = getClass(file, loader, log); + + try { + Annotation[] annos = currentClass.getAnnotations(); + if (annos != null && annos.length > 0) { + for (Annotation anno : annos) { + if (annotationClass.contains(anno.annotationType().getName())) { + return anno; + } + } + } + } catch (Throwable e) { + log.warn("could not find annotation for " + file + " " + e); + } + return null; + + } + + public Class<?> getClass(File file, URLClassLoader loader, Log log) { + String f = file.getAbsolutePath().substring(basedir.getAbsolutePath().length() + 1); + return getClass(f, loader, log); + } + + public Annotation getAnnotation(File file, URLClassLoader loader, List<String> annotationClass, Log log) { + String f = file.getAbsolutePath().substring(basedir.getAbsolutePath().length() + 1); + return getAnnotation(f, loader, annotationClass, log); + } + + public String getSkipMessage() { + return skipMessage; + } + + public String[] getFiles() { + return files; + } + + public String[] getSkipFiles() { + return skipFiles; + } + + public int getFoudFiles() { + return skipFiles.length + files.length; + } + + public FileUpdater getUpdater() { + return updater; + } + + public void setUpdater(FileUpdater updater) { + this.updater = updater; + } +} Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/SourceEntry.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParser.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParser.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -21,14 +21,14 @@ import org.apache.maven.plugin.MojoFailureException; import org.nuiton.i18n.plugin.AbstractI18nPlugin; import org.nuiton.i18n.plugin.I18nLogger; -import org.nuiton.util.PluginHelper.SortedProperties; +import org.nuiton.io.SortedProperties; import org.nuiton.i18n.plugin.parser.event.KeysModifier; -import org.nuiton.util.FileUpdater; +import org.nuiton.io.FileUpdater; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.nuiton.util.SourceEntry; +import org.nuiton.i18n.plugin.SourceEntry; /** * Abstract implementation for parsing goal. Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -3,7 +3,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.nuiton.util.SourceEntry; +import org.nuiton.i18n.plugin.SourceEntry; /** * Customized {@link SourceEntry} for parsers goals. Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/event/KeysModifier.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/event/KeysModifier.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/event/KeysModifier.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -39,7 +39,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.nuiton.util.PluginHelper; +import org.nuiton.plugin.PluginHelper; /** * IHM permettant de modifier les clés de traduction en direct dans les fichiers Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJava.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -19,12 +19,12 @@ package org.nuiton.i18n.plugin.parser.impl; import org.apache.maven.project.MavenProject; -import org.nuiton.util.SourceEntry; +import org.nuiton.i18n.plugin.SourceEntry; import org.nuiton.i18n.plugin.parser.AbstractI18nParser; import org.nuiton.i18n.plugin.parser.ParserEvent; import org.nuiton.i18n.plugin.parser.ParserException; -import org.nuiton.util.FileUpdater; -import org.nuiton.util.FileUpdaterHelper; +import org.nuiton.io.FileUpdater; +import org.nuiton.io.FileUpdaterHelper; import java.io.File; import java.io.FileInputStream; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJaxx.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -18,9 +18,9 @@ package org.nuiton.i18n.plugin.parser.impl; -import org.nuiton.util.SourceEntry; -import org.nuiton.util.FileUpdater; -import org.nuiton.util.FileUpdaterHelper; +import org.nuiton.i18n.plugin.SourceEntry; +import org.nuiton.io.FileUpdater; +import org.nuiton.io.FileUpdaterHelper; import java.io.File; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserSwixat.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -18,8 +18,8 @@ package org.nuiton.i18n.plugin.parser.impl; -import org.nuiton.util.SourceEntry; -import org.nuiton.util.FileUpdater; +import org.nuiton.i18n.plugin.SourceEntry; +import org.nuiton.io.FileUpdater; /** * Recuperation des chaines à traduire depuis les fichiers xml Swixat. Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidation.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidation.java 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidation.java 2009-09-29 11:41:17 UTC (rev 1674) @@ -19,9 +19,9 @@ import java.io.IOException; import java.net.URLConnection; -import org.nuiton.util.SourceEntry; -import org.nuiton.util.FileUpdater; -import org.nuiton.util.MirroredFileUpdater; +import org.nuiton.i18n.plugin.SourceEntry; +import org.nuiton.io.FileUpdater; +import org.nuiton.io.MirroredFileUpdater; import java.io.File; import java.net.SocketTimeoutException; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-26 02:17:37 UTC (rev 1673) +++ trunk/pom.xml 2009-09-29 11:41:17 UTC (rev 1674) @@ -202,6 +202,9 @@  <projectId>i18n</projectId> +  + <helper.version>1.1.0-SNAPSHOT</helper.version> + <processor.version>1.0.1-SNAPSHOT</processor.version> </properties>

1 0

r1673 - trunk/nuiton-i18n-api
by tchemit＠users.nuiton.org 26 Sep '09

26 Sep '09

Author: tchemit Date: 2009-09-26 04:17:37 +0200 (Sat, 26 Sep 2009) New Revision: 1673 Modified: trunk/nuiton-i18n-api/pom.xml Log: adding redmine extra files Modified: trunk/nuiton-i18n-api/pom.xml =================================================================== --- trunk/nuiton-i18n-api/pom.xml 2009-09-26 01:48:41 UTC (rev 1672) +++ trunk/nuiton-i18n-api/pom.xml 2009-09-26 02:17:37 UTC (rev 1673) @@ -50,6 +50,13 @@ <packaging>jar</packaging> + <properties> +  + <redmine.releaseFiles>target/${project.artifactId}-${project.version}-deps.zip, + target/${project.artifactId}-${project.version}-full.zip + </redmine.releaseFiles> + </properties> + <build> <defaultGoal>install</defaultGoal>

1 0