Author: tchemit Date: 2008-10-07 18:32:55 +0000 (Tue, 07 Oct 2008) New Revision: 1527 Added: isis-fish/branches/arbo-maven/src/main/assembly/ isis-fish/branches/arbo-maven/src/main/assembly/go.bat isis-fish/branches/arbo-maven/src/main/assembly/go.sh isis-fish/branches/arbo-maven/src/main/assembly/unix.xml isis-fish/branches/arbo-maven/src/main/assembly/windows.xml Modified: isis-fish/branches/arbo-maven/pom.xml Log: make automatic bin zip for unix and windows Modified: isis-fish/branches/arbo-maven/pom.xml =================================================================== --- isis-fish/branches/arbo-maven/pom.xml 2008-10-07 16:46:13 UTC (rev 1526) +++ isis-fish/branches/arbo-maven/pom.xml 2008-10-07 18:32:55 UTC (rev 1527) @@ -491,7 +491,6 @@ <keystorepath>../../../CodeLutinKeystore</keystorepath> <keystorealias>CodeLutin</keystorealias> <keystorepass>codelutin</keystorepass> - </properties> <build> @@ -568,13 +567,13 @@ </dependency> </dependencies> </plugin> + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>${jaxx.version}</version> <executions> - <execution> - <!--phase>generate-sources</phase--> + <execution> <goals> <goal>generate</goal> </goals> @@ -592,7 +591,55 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + <specificGoal>parserJava</specificGoal> + <excludes> + <param>fr\/ifremer\/isisfish\/entities\/**</param> + </excludes> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>${maven.jar.main.class}</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> <executions> <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> @@ -610,10 +657,10 @@ </filterset> </copy> <copy - file="${project.build.directory}/dependency/mail-1.4.jar" + file="${project.build.directory}/lib/mail-1.4.jar" todir="${project.basedir}/target/resources/jnlp/"/> <copy - file="${project.build.directory}/dependency/activation-1.1.jar" + file="${project.build.directory}/lib/activation-1.1.jar" todir="${project.basedir}/target/resources/jnlp/"/> </tasks> </configuration> @@ -655,17 +702,13 @@ <dependencies> <excludes> <exclude>javax.mail:mail</exclude> - <exclude> - javax.activation:activation - </exclude> + <exclude>javax.activation:activation</exclude> </excludes> </dependencies> <jnlp> <!--<resources>${project.basedir}/src/jnlp</resources>--> <outputFile>isis-fish-v3.jnlp</outputFile> - <mainClass> - fr.ifremer.isisfish.IsisFish - </mainClass> + <mainClass>${maven.jar.main.class}</mainClass> </jnlp> <sign> @@ -697,91 +740,32 @@ </configuration> </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>copy-dependencies</goal> - </goals> - </execution> - </executions> -<!-- <executions> - <execution> - <id>copy-dependencies</id> - <phase>compile</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory> - ${project.build.directory}/dependency - </outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots> - false - </overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - </executions> --> - </plugin> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - <specificGoal>parserJava</specificGoal> - <!--includes> - <param>**\/*UI.java</param> - </includes--> - <excludes> - <param>fr\/ifremer\/isisfish\/entities\/**a</param> - </excludes> - </entry> - </entries> + <descriptors> + <descriptor>src/main/assembly/unix.xml</descriptor> + <descriptor>src/main/assembly/windows.xml</descriptor> + </descriptors> </configuration> <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> + <execution> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass> - fr.ifremer.isisfish.IsisFish - </mainClass> - <!-- <manifestFile>/path/to/MANIFEST.MF</manifestFile> --> - <addClasspath>true</addClasspath> - <addExtensions/> - <classpathPrefix/> - <!-- - <manifestEntries> - <Class-Path>./</Class-Path> - </manifestEntries> - --> - </manifest> - </archive> - </configuration> - </plugin> + </plugins> </build> - - <!--Librairies--> - <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> @@ -826,7 +810,7 @@ <os> <family>unix</family> </os> - </activation> + </activation> <dependencies> <dependency> <groupId>jdesktop</groupId> Added: isis-fish/branches/arbo-maven/src/main/assembly/go.bat =================================================================== --- isis-fish/branches/arbo-maven/src/main/assembly/go.bat (rev 0) +++ isis-fish/branches/arbo-maven/src/main/assembly/go.bat 2008-10-07 18:32:55 UTC (rev 1527) @@ -0,0 +1 @@ +java -Xmx512M -Xms512M -Dlog4j.configuration=file:$rep/src/resources/log4j.properties" # -Dlog4j.debug -jar ${project.artifact.file.name} %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file Copied: isis-fish/branches/arbo-maven/src/main/assembly/go.sh (from rev 1522, isis-fish/branches/arbo-maven/go.sh) =================================================================== --- isis-fish/branches/arbo-maven/src/main/assembly/go.sh (rev 0) +++ isis-fish/branches/arbo-maven/src/main/assembly/go.sh 2008-10-07 18:32:55 UTC (rev 1527) @@ -0,0 +1,4 @@ +#!/bin/sh + +MX=512M +java -Xmx$MX -Xms$MX -jar ${project.artifact.file.name} "$@" \ No newline at end of file Property changes on: isis-fish/branches/arbo-maven/src/main/assembly/go.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Added: isis-fish/branches/arbo-maven/src/main/assembly/unix.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/assembly/unix.xml (rev 0) +++ isis-fish/branches/arbo-maven/src/main/assembly/unix.xml 2008-10-07 18:32:55 UTC (rev 1527) @@ -0,0 +1,52 @@ +<assembly> + <id>unix</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <!--dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*:jar:*</include> + </includes> + <scope>runtime</scope> + </dependencySet> + </dependencySets--> + + <fileSets> + + <fileSet> + <directory>target/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly</directory> + <filtered>true</filtered> + <outputDirectory>/</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>go.sh</include> + </includes> + </fileSet> + + </fileSets> +</assembly> \ No newline at end of file Added: isis-fish/branches/arbo-maven/src/main/assembly/windows.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/assembly/windows.xml (rev 0) +++ isis-fish/branches/arbo-maven/src/main/assembly/windows.xml 2008-10-07 18:32:55 UTC (rev 1527) @@ -0,0 +1,53 @@ +<assembly> + <id>windows</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <!--dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*:jar:*</include> + </includes> + <scope>runtime</scope> + </dependencySet> + </dependencySets--> + + <fileSets> + + <fileSet> + <directory>target/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly</directory> + <filtered>true</filtered> + <outputDirectory>/</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>go.bat</include> + </includes> + </fileSet> + + </fileSets> +</assembly> \ No newline at end of file