Author: tchemit Date: 2013-03-12 10:33:46 +0100 (Tue, 12 Mar 2013) New Revision: 582 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/582 Log: improve bundle files Modified: trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/assembly/i18n.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-12 09:10:25 UTC (rev 581) +++ trunk/tutti-ui-swing/pom.xml 2013-03-12 09:33:46 UTC (rev 582) @@ -72,6 +72,12 @@ <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> + <license.bundleThirdPartyPath> + META-INF/tutti-THIRD-PARTY.txt + </license.bundleThirdPartyPath> + <license.bundleLicensePath> + META-INF/tutti-LICENSE.txt + </license.bundleLicensePath> <maven.jar.main.class> fr.ifremer.tutti.ui.swing.RunTutti @@ -97,17 +103,17 @@ </includes> </resource> <resource> - <directory>src/main/filtered-resources/help</directory> - <filtering>true</filtering> + <directory>src/main/resources</directory> <includes> - <include>*.config</include> - <include>*.properties</include> + <include>**/*</include> </includes> </resource> + <!-- FIXME-TC Remove this when i18n will do it for use--> <resource> - <directory>src/main/resources</directory> + <directory>${maven.gen.dir}/resources</directory> + <filtering>false</filtering> <includes> - <include>**/*</include> + <include>**/*.csv</include> </includes> </resource> </resources> Modified: trunk/tutti-ui-swing/src/main/assembly/i18n.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/i18n.xml 2013-03-12 09:10:25 UTC (rev 581) +++ trunk/tutti-ui-swing/src/main/assembly/i18n.xml 2013-03-12 09:33:46 UTC (rev 582) @@ -38,6 +38,7 @@ <outputDirectory/> <includes> <include>tutti-i18n*.properties</include> + <include>tutti-i18n*.csv</include> </includes> </fileSet> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-12 09:33:46 UTC (rev 582) @@ -276,7 +276,7 @@ context.getConfig().getApplicationConfig(); String iconPath = applicationConfig.getOption("application.icon.path"); - String name = "tutti-ui-swing"; + String name = "tutti"; String licensePath = "META-INF/" + name + "-LICENSE.txt"; String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt";