Author: tchemit Date: 2008-07-28 20:00:01 +0000 (Mon, 28 Jul 2008) New Revision: 1256 Added: branches/maven2_multimodule/isis-fish/isis-fish-commandline/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/pom.xml branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/main/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/main/java/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/main/resources/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/main/resources/i18n/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/site/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/site/en/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/site/en/rst/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/site/en/rst/user/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/site/fr/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/site/fr/rst/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/site/fr/rst/user/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/test/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/test/java/ branches/maven2_multimodule/isis-fish/isis-fish-commandline/src/test/resources/ branches/maven2_multimodule/isis-fish/isis-fish-entities/ branches/maven2_multimodule/isis-fish/isis-fish-entities/pom.xml branches/maven2_multimodule/isis-fish/isis-fish-entities/src/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/java/fr/ifremer/isisfish/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/resources/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/main/xmi/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/site/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/test/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/test/java/ branches/maven2_multimodule/isis-fish/isis-fish-entities/src/test/resources/ branches/maven2_multimodule/isis-fish/isis-fish-main/ branches/maven2_multimodule/isis-fish/isis-fish-main/pom.xml branches/maven2_multimodule/isis-fish/isis-fish-main/src/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/java/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/java/fr/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/java/fr/ifremer/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/java/fr/ifremer/isisfish/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/resources/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/resources/i18n/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/resources/log4j.properties branches/maven2_multimodule/isis-fish/isis-fish-main/src/site/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/test/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/test/java/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/test/java/fr/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/test/java/fr/ifremer/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/test/java/fr/ifremer/isisfish/ branches/maven2_multimodule/isis-fish/isis-fish-main/src/test/resources/ branches/maven2_multimodule/isis-fish/isis-fish-ui/ branches/maven2_multimodule/isis-fish/isis-fish-ui/pom.xml branches/maven2_multimodule/isis-fish/isis-fish-ui/src/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/main/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/main/java/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/main/java/fr/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/main/java/fr/ifremer/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/main/java/fr/ifremer/isisfish/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/main/resources/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/main/resources/i18n/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/main/uimodel/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/site/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/test/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/test/java/ branches/maven2_multimodule/isis-fish/isis-fish-ui/src/test/resources/ Log: prepare isis-fish multi modules (entities, ui, commandline, main) Added: branches/maven2_multimodule/isis-fish/isis-fish-commandline/pom.xml =================================================================== --- branches/maven2_multimodule/isis-fish/isis-fish-commandline/pom.xml (rev 0) +++ branches/maven2_multimodule/isis-fish/isis-fish-commandline/pom.xml 2008-07-28 20:00:01 UTC (rev 1256) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>ifremer</groupId> + <artifactId>isis-fish-pom</artifactId> + <version>3.1.6-SNAPSHOT</version> + </parent> + + <artifactId>isis-fish-commandline</artifactId> + + <dependencies> + + <dependency> + <groupId>org.codelutin.commandline</groupId> + <artifactId>commandline-core</artifactId> + </dependency> + + </dependencies> + + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>isis-fish-commandline</name> + <version>3.1.6-SNAPSHOT</version> + <description>isis-fish commandline module</description> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + + <build> + <plugins> + + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <phase>compile</phase> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codelutin.commandline</groupId> + <artifactId>maven-commandline-plugin</artifactId> + <version>${commandline.version}</version> + <configuration> + <prefix>Lima</prefix> + <packageName>fr.ifremer.isisfish.commandline</packageName> + <i18nPrefix>isisfish</i18nPrefix> + </configuration> + <executions> + <execution> + <id>genJava</id> + <goals> + <goal>genJava</goal> + </goals> + <configuration> + <source>${maven.src.dir}/main/resources/IsisFish_init.properties</source> + <out>${maven.gen.dir}/java</out> + <concreteContextFQN>fr.ifremer.isisfish.IsisContext</concreteContextFQN> + <concreteConfig>false</concreteConfig> + <_projectName>Isis-Fish</_projectName> + <_configFileName>.isis-config-3</_configFileName> + <_version>${current.version}</_version> + <_projectName>Isis-Fish</_projectName> + <_projectURL>http://isis-fish.labs.libre-entreprise.org</_projectURL> + <_organisationName>Ifremer - Codelutin</_organisationName> + <_organisationURL>http://codelutin.com</_organisationURL> + <_copyright>Copyright Ifremer Codelutin 1999 - 2008</_copyright> + </configuration> + </execution> + <execution> + <id>genRst</id> + <goals> + <goal>genRst</goal> + </goals> + <configuration> + <rstFilePath>${maven.src.dir}/site/@bundle@/rst/v3/user</rstFilePath> + <out>${basedir}/target/classes</out> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinutil</artifactId> + <version>0.29-SNAPSHOT</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </build> + +</project> Added: branches/maven2_multimodule/isis-fish/isis-fish-entities/pom.xml =================================================================== --- branches/maven2_multimodule/isis-fish/isis-fish-entities/pom.xml (rev 0) +++ branches/maven2_multimodule/isis-fish/isis-fish-entities/pom.xml 2008-07-28 20:00:01 UTC (rev 1256) @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>ifremer</groupId> + <artifactId>isis-fish-pom</artifactId> + <version>3.1.6-SNAPSHOT</version> + </parent> + + <artifactId>isis-fish-dto</artifactId> + + <dependencies> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>topia</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinmatrix</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>topia</artifactId> + <scope>compile</scope> + <!-- use javassist instead of cglib --> + <exclusions> + <exclusion> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>topia-service</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinmatrix</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>compile</scope> + </dependency> + + </dependencies> + + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>isis-fish-entites</name> + <version>3.1.6-SNAPSHOT</version> + <description>isis-fish entities module</description> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + + <build> + <plugins> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> + </plugin> + + <!--plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-processor-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <srcDir>${basedir}/src/main</srcDir> + <destDir>${maven.src.dir}/main</destDir> + <includes> + <include>**/*.java</include> + </includes> + <filters> + org.codelutin.processor.filters.GeneratorTemplatesFilter, + org.codelutin.processor.filters.ActiveLogsCodeFilter + </filters> + <verbose>${maven.verbose}</verbose> + </configuration> + </plugin--> + + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <configuration> + <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> + <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> + <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> + <extractedPackages>fr.ifremer.isisfish</extractedPackages> + <!--Config generator--> + <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>${maven.gen.dir}/java</destDirGen> + <defaultPackage>fr.ifremer.isisfish</defaultPackage> + <copyVersionDir>${maven.gen.dir}/resources/oldmappings/%MODELNAME%</copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <copyOverwrite>true</copyOverwrite> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + <goal>copyVersionFiles</goal> + </goals> + + </execution> + </executions> + <dependencies> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>topia</artifactId> + <version>2.0.26-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + + +</project> Added: branches/maven2_multimodule/isis-fish/isis-fish-main/pom.xml =================================================================== --- branches/maven2_multimodule/isis-fish/isis-fish-main/pom.xml (rev 0) +++ branches/maven2_multimodule/isis-fish/isis-fish-main/pom.xml 2008-07-28 20:00:01 UTC (rev 1256) @@ -0,0 +1,595 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>ifremer</groupId> + <artifactId>isis-fish-pom</artifactId> + <version>3.1.6-SNAPSHOT</version> + </parent> + + <artifactId>isis-fish-main</artifactId> + + <dependencies> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> + </dependency> + + <dependency> + <groupId>ifremer</groupId> + <artifactId>isis-fish-entities</artifactId> + </dependency> + + <dependency> + <groupId>ifremer</groupId> + <artifactId>isis-fish-ui</artifactId> + </dependency> + + <dependency> + <groupId>ifremer</groupId> + <artifactId>isis-fish-commandline</artifactId> + </dependency> + + <dependency> + <groupId>jdesktop</groupId> + <artifactId>jdic</artifactId> + </dependency> + + <!--Librairies CodeLutin--> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinutilextra</artifactId> + <scope>compile</scope> + </dependency> + + <!--dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinmatrix</artifactId> + <scope>compile</scope> + </dependency--> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinxml</artifactId> + <scope>compile</scope> + </dependency> + + <!-- librairie commandline --> + <dependency> + <groupId>org.codelutin.commandline</groupId> + <artifactId>commandline-ui</artifactId> + <scope>compile</scope> + <!--scope>compile</scope--> + </dependency> + + <!-- + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidgetnetbeans</artifactId> + <scope>compile</scope> + </dependency> + --> + + <!--SwiXat--> + <dependency> + <groupId>swixat</groupId> + <artifactId>swixat</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.swixml</groupId> + <artifactId>swixml</artifactId> + <scope>compile</scope> + </dependency> + + + <!--Commons--> + <dependency> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-math</groupId> + <artifactId>commons-math</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <scope>compile</scope> + </dependency> + + <!--Other--> + + <dependency> + <groupId>jfreechart</groupId> + <artifactId>jfreechart</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>jcommon</groupId> + <artifactId>jcommon</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>xmlrpc</groupId> + <artifactId>xmlrpc</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.netbeans.lib</groupId> + <artifactId>cvsclient</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>openmap</groupId> + <artifactId>openmap</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>sshtools</groupId> + <artifactId>j2ssh-common</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>sshtools</groupId> + <artifactId>j2ssh-core</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>springframework</groupId> + <artifactId>spring-core</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>springframework</groupId> + <artifactId>spring-beans</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinj2r</artifactId> + <scope>compile</scope> + </dependency> + + <!-- Change this dependence if you change database --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>compile</scope> + </dependency> + <!-- + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.0</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>mckoi</groupId> + <artifactId>mckoi</artifactId> + <version>1.0.2</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>7.4.1-jdbc3</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.1.2.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbyLocale_fr</artifactId> + <version>10.1.2.1</version> + <scope>runtime</scope> + </dependency> + --> + + <!-- aspectj --> + <!-- on utilise aspectwerkz + <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>1.5.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.5.3</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjlib</artifactId> + <version>1.5.3</version> + <scope>compile</scope> + </dependency> + --> + + <!-- aspectwerkz --> + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz-jdk5</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>aspectwerkz</groupId> + <artifactId>aspectwerkz-core</artifactId> + <scope>compile</scope> + </dependency> + <!-- + | + | Dependance qui devrait etre resolues seules, mais qui ne le sont + | pas car un fichier pom.xml (aspectwerkz-core) du repository est mauvais + | + +--> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>asm-attrs</groupId> + <artifactId>asm-attrs</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>asm-util</groupId> + <artifactId>asm-util</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>jrexx</groupId> + <artifactId>jrexx</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>qdox</groupId> + <artifactId>qdox</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>trove</groupId> + <artifactId>trove</artifactId> + <scope>compile</scope> + </dependency> + + <!-- ssj pour les calculs stockastiques --> + <!--dependency> + <groupId>ssj</groupId> + <artifactId>ssj</artifactId> + <version>2.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>Blas</artifactId> + <version>20060531</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>colt</artifactId> + <version>1.1.0.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>interpreter</artifactId> + <version>1.6.8</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>language</artifactId> + <version>1.6.7</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>logger</artifactId> + <version>1.6.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>ssj</groupId> + <artifactId>optimization</artifactId> + <version>20060613</version> + <scope>compile</scope> + </dependency--> + + <!-- fin ssj pour les calculs stockastiques --> + + <!-- subversion --> + <dependency> + <groupId>org.tmatesoft</groupId> + <artifactId>svnkit</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <scope>compile</scope> + </dependency> + + + </dependencies> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>isis-fish-main</name> + <version>3.1.6-SNAPSHOT</version> + <description>Isis-fish main module</description> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <properties> + <!--Main class in JAR --> + <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> + </properties> + + <packaging>jar</packaging> + + <build> + <plugins> + <!-- Compile phase --> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>CopyGenJavaVersSrcBuild</id> + <phase>process-sources</phase> + <configuration> + <tasks> + <copy + todir="${basedir}/target/src-build/java" + verbose="${maven.verbose}" + overwrite="false"> + <fileset + dir="${basedir}/target/gen/java"/> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> + <execution> + <id>JnlpSun</id> + <phase>package</phase> + <configuration> + <tasks> + <copy + file="${maven.src.dir}/main/jnlp/sun.jnlp" + todir="${project.build.directory}/jnlp/"> + <filterset> + <filter token="mail" + value="mail-1.3.3.jar"/> + <filter token="activation" + value="activation-1.0.2.jar"/> + </filterset> + </copy> + <copy + file="${project.build.directory}/dependency/mail-1.3.3.jar" + todir="${project.build.directory}/jnlp/"/> + <copy + file="${project.build.directory}/dependency/activation-1.0.2.jar" + todir="${project.build.directory}/jnlp/"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <!--execution> + <id>MakeManualScreenShots</id> + <phase>package</phase> + <configuration> + <tasks> + <exec executable="${project.basedir}/doc/manual/prepareManual.sh" + dir="${project.basedir}/doc/manual/"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution--> + </executions> + </plugin> + + <!-- Creation du fichier principal jnlp sans les libs signees par Sun --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-1</version> + <executions> + <execution> + <phase>deploy</phase> + <goals> + <goal>jnlp</goal> + </goals> + </execution> + </executions> + <configuration> + <dependencies> + <excludes> + <exclude>javax.mail:mail</exclude> + <exclude> + javax.activation:activation + </exclude> + </excludes> + </dependencies> + <jnlp> + <!--<resources>${project.basedir}/src/jnlp</resources>--> + <outputFile>isis-fish-v3.jnlp</outputFile> + <mainClass> + ${maven.jar.main.class} + </mainClass> + </jnlp> + + <sign> + <keystore>${keystorepath}</keystore> + <keypass/> + <storepass>${keystorepass}</storepass> + <storetype/> + <alias>${keystorealias}</alias> + <validity/> + + <dnameCn/> + <dnameOu/> + <dnameO/> + <dnameL/> + <dnameSt/> + <dnameC/> + + <verify>true</verify> + </sign> + + <keystore> + <delete>false</delete> + <gen>false</gen> + </keystore> + + <pack200>false</pack200> + <gzip>true</gzip> + <verbose>false</verbose> + </configuration> + </plugin> + + <!-- Package phase --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + <addClasspath>true</addClasspath> + <addExtensions/> + <classpathPrefix>./dependency/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + +</project> Added: branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/resources/log4j.properties =================================================================== --- branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/resources/log4j.properties (rev 0) +++ branches/maven2_multimodule/isis-fish/isis-fish-main/src/main/resources/log4j.properties 2008-07-28 20:00:01 UTC (rev 1256) @@ -0,0 +1,9 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X +# package level +log4j.logger.fr.ifremer.isisfish=INFO Added: branches/maven2_multimodule/isis-fish/isis-fish-ui/pom.xml =================================================================== --- branches/maven2_multimodule/isis-fish/isis-fish-ui/pom.xml (rev 0) +++ branches/maven2_multimodule/isis-fish/isis-fish-ui/pom.xml 2008-07-28 20:00:01 UTC (rev 1256) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>ifremer</groupId> + <artifactId>isis-fish-pom</artifactId> + <version>3.1.6-SNAPSHOT</version> + </parent> + + <artifactId>isis-fish-ui</artifactId> + + <dependencies> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-swing</artifactId> + </dependency> + + </dependencies> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>isis-fish ui </name> + <version>3.1.6-SNAPSHOT</version> + <description>IsisFish UI moudle</description> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + + <build> + <plugins> + + <plugin> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinwidget</artifactId> + <version>0.10-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-swing</artifactId> + <version>${jaxx.version}</version> + </dependency> + </dependencies> + </plugin> + + <!-- Compile phase --> + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> + </plugin> + + </plugins> + </build> + +</project>