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 @@ <!--Jaxx--> <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 @@ <!-- main class in jar --> <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> <!-- default license to use --> <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> + <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> @@ -235,70 +283,43 @@ </activation> <build> <plugins> - <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> - <!--plugin> - <artifactId>maven-antrun-plugin</artifactId> + <!-- key store secrets availables --> + <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> + <!-- make webstart --> + <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> - <!--plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20090204</version> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - <configuration> - <force>false</force> - <dependencies> - <excludes> - <exclude>javax.help:javahelp</exclude> - <exclude>org.swinglabs:jxlayer</exclude> - </excludes> - </dependencies> - <libPath>lib</libPath> - <extensions> - <sun>sun.jnlp</sun> - <jxlayer>jxlayer.jnlp</jxlayer> - </extensions> - <jnlp> - <outputFile>launch-${project.artifactId}.jnlp</outputFile> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - </jnlp> - - <sign> - <keystore>${keystorepath}</keystore> - <keypass/> - <storepass>${keystorepass}</storepass> - <storetype/> - <alias>${keystorealias}</alias> - <validity/> - <dnameCn/> - <dnameOu/> - <dnameO/> - <dnameL/> - <dnameSt/> - <dnameC/> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> - - - <pack200>false</pack200> - <gzip>true</gzip> - <verbose>false</verbose> - </configuration> - </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 */ -@jaxx.runtime.DefaultApplicationContext.AutoLoad +@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' columnHeaderView='{treeToolBar}'--> <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; }