Author: fdesbois Date: 2009-10-14 14:54:34 +0200 (Wed, 14 Oct 2009) New Revision: 2715 Modified: trunk/doc/ trunk/doc/Doc technique.odt trunk/lima-main/pom.xml trunk/pom.xml Log: - Cleaning non used dependency for topia-soa - Remove jnlp and jlfgr Property changes on: trunk/doc ___________________________________________________________________ Added: svn:ignore + .~lock.Doc technique.odt# .~lock.exemples.odt# Modified: trunk/doc/Doc technique.odt =================================================================== (Binary files differ) Modified: trunk/lima-main/pom.xml =================================================================== --- trunk/lima-main/pom.xml 2009-10-14 12:54:32 UTC (rev 2714) +++ trunk/lima-main/pom.xml 2009-10-14 12:54:34 UTC (rev 2715) @@ -79,11 +79,6 @@ </dependency> <dependency> - <groupId>com.sun</groupId> - <artifactId>jlfgr</artifactId> - </dependency> - - <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> </dependency> @@ -117,7 +112,6 @@ <!-- jaxx configuration --> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> <!--Main class in JAR --> <maven.jar.main.class>org.chorem.lima.Main</maven.jar.main.class> @@ -128,8 +122,6 @@ <keystorepass>${codelutin.keystorepass}</keystorepass> <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> <jnlpCodebase>${project.url}</jnlpCodebase> - <!-- to test jnlp file locally --> - <!--jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase--> </properties> <packaging>jar</packaging> @@ -186,47 +178,19 @@ <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> - <!--id>javaActionConfig</id--> - <goals> - <goal>parserJavaActionConfig</goal> - <goal>parserJava</goal> - <goal>bundle</goal> - </goals> + <id>java</id> <configuration> - <treateDefaultEntry>false</treateDefaultEntry> <entries> <entry> - <specificGoal>parserJavaActionConfig</specificGoal> - <basedir>${maven.src.dir}/main/java</basedir> - <includes> - <param>org\/chorem\/lima\/ui\/actions\/**\/*Action.java</param> - </includes> - <excludes> - <param>org\/chorem\/lima\/ui\/actions\/**\/*AbstractAction.java</param> - </excludes> - </entry> - <entry> - <specificGoal>parserJava</specificGoal> <basedir>${maven.gen.dir}/java</basedir> </entry> </entries> </configuration> - </execution> - <!--execution> - <id>java</id> - <configuration> - <entries> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${maven.gen.dir}/java</basedir> - </entry> - </entries> - </configuration> <goals> <goal>parserJava</goal> <goal>bundle</goal> </goals> - </execution--> + </execution> </executions> </plugin> @@ -236,7 +200,11 @@ <executions> <execution> <id>copy-dependencies</id> + <configuration> + <silent>true</silent> + </configuration> </execution> + </executions> </plugin> @@ -275,60 +243,6 @@ </activation> <build> <plugins> - <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> - <!--plugin> - - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>JnlpSun</id> - <phase>verify</phase> - <configuration> - <tasks> - <mkdir dir="${jnlp.build.directory}"/> - <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/jxlayer-3.0.1.jar" - verbose="${maven.verbose}" - todir="${jnlp.build.directory}/lib" failonerror="false"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <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> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin--> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> @@ -346,63 +260,6 @@ </execution> </executions> </plugin> - - <!--plugin> - <groupId>org.codehaus.mojo.webstart</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>org.swinglabs:jxlayer</exclude> - </excludes> - </dependencies> - <libPath>lib</libPath> - <extensions> - <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/pom.xml =================================================================== --- trunk/pom.xml 2009-10-14 12:54:32 UTC (rev 2714) +++ trunk/pom.xml 2009-10-14 12:54:34 UTC (rev 2715) @@ -124,11 +124,11 @@ <artifactId>dom4j</artifactId> <version>1.6.1</version> </dependency> - <dependency> + <!--dependency> <groupId>com.sun</groupId> <artifactId>jlfgr</artifactId> <version>1.0</version> - </dependency> + </dependency--> <dependency> <groupId>net.sf.opencsv</groupId> @@ -280,6 +280,8 @@ </releases> </repository> + + <!-- depot des snapshots nuiton --> <repository>