Author: tchemit Date: 2013-01-28 12:22:28 +0100 (Mon, 28 Jan 2013) New Revision: 248 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/248 Log: refs #1893: [TECH] - Mise ?\195?\160 jour automatique de l'outil Added: trunk/tutti-ui-swing/src/main/assembly/full-linux-i586.xml trunk/tutti-ui-swing/src/main/assembly/full-linux-x64.xml trunk/tutti-ui-swing/src/main/assembly/full-windows-i586.xml trunk/tutti-ui-swing/src/main/assembly/full-windows-x64.xml trunk/tutti-ui-swing/src/main/assembly/full/ trunk/tutti-ui-swing/src/main/assembly/full/README.txt trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh trunk/tutti-ui-swing/src/main/assembly/min/ trunk/tutti-ui-swing/src/main/assembly/min/README.txt trunk/tutti-ui-swing/src/main/assembly/min/launch.bat trunk/tutti-ui-swing/src/main/assembly/min/launch.sh trunk/tutti-ui-swing/src/main/assembly/min/tutti.properties trunk/tutti-ui-swing/src/main/assembly/min/update-application.properties trunk/tutti-ui-swing/src/main/assembly/min/update-database.properties trunk/tutti-ui-swing/src/main/assembly/min/update.bat trunk/tutti-ui-swing/src/main/assembly/min/update.sh trunk/tutti-ui-swing/src/main/assembly/min/version.appup trunk/tutti-ui-swing/src/main/assembly/standalone.xml trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml Removed: trunk/tutti-ui-swing/src/main/assembly/bin.xml trunk/tutti-ui-swing/src/main/assembly/tutti.bat trunk/tutti-ui-swing/src/main/assembly/tutti.sh Modified: trunk/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-28 11:15:47 UTC (rev 247) +++ trunk/pom.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -124,7 +124,7 @@ <!-- libraries version --> - <nuitonUtilsVersion>2.6.6</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.7-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-01-28 11:15:47 UTC (rev 247) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-01-28 11:22:28 UTC (rev 248) @@ -48,10 +48,10 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; +import fr.ifremer.tutti.service.config.TuttiServiceConfig; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; import java.io.IOException; import java.util.List; @@ -99,9 +99,9 @@ log.info("Open persistence driver " + getImplementationName()); } - ApplicationConfig config = context.getConfig().getApplicationConfig(); + TuttiServiceConfig serviceConfig = context.getConfig(); - TuttiPersistenceDevConfig devDriverConfig = new TuttiPersistenceDevConfig(config); + TuttiPersistenceDevConfig devDriverConfig = serviceConfig.getDevDriverConfig(); devDriver = new TuttiPersistenceDevImpl(devDriverConfig); @@ -111,9 +111,22 @@ devDriver.open(); - TuttiPersistenceAdagioConfig driverConfig = new TuttiPersistenceAdagioConfig(config); + TuttiPersistenceAdagioConfig driverConfig = serviceConfig.getAdagioDriverConfig(); - if (!driverConfig.getDbDirectory().exists()) { + if (driverConfig.isDbExists()) { + + // can use adagio driver + +// driverConfig.initConfig(context.getResourceLoader()); + + driver = TuttiPersistenceServiceLocator.getPersistenceService(); + + if (log.isInfoEnabled()) { + log.info("Will open persistence driver " + driver.getImplementationName()); + } + } else { + + // still on dev drvier if (log.isWarnEnabled()) { log.warn("--------------------------------------------------------------------"); @@ -125,16 +138,6 @@ } driver = devDriver; - } else { - driverConfig.initConfig(context.getResourceLoader()); - - // can now instanciate Spring context - - driver = TuttiPersistenceServiceLocator.getPersistenceService(); - - if (log.isInfoEnabled()) { - log.info("Will open persistence driver " + driver.getImplementationName()); - } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java 2013-01-28 11:15:47 UTC (rev 247) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfig.java 2013-01-28 11:22:28 UTC (rev 248) @@ -25,6 +25,8 @@ */ import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.config.TuttiPersistenceAdagioConfig; +import fr.ifremer.tutti.persistence.config.TuttiPersistenceDevConfig; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,17 +51,31 @@ /** Delegate application config object containing configuration. */ protected final ApplicationConfig applicationConfig; + protected final TuttiPersistenceDevConfig devDriverConfig; + + protected final TuttiPersistenceAdagioConfig adagioDriverConfig; + public TuttiServiceConfig(ApplicationConfig applicationConfig) { this.applicationConfig = applicationConfig; -// applicationConfig.loadDefaultOptions(TuttiServiceConfigOption.values()); + devDriverConfig = new TuttiPersistenceDevConfig(applicationConfig); + + adagioDriverConfig = new TuttiPersistenceAdagioConfig(applicationConfig); } public ApplicationConfig getApplicationConfig() { return applicationConfig; } + public TuttiPersistenceDevConfig getDevDriverConfig() { + return devDriverConfig; + } + + public TuttiPersistenceAdagioConfig getAdagioDriverConfig() { + return adagioDriverConfig; + } + /** @return {@link TuttiServiceConfigOption#VERSION} value */ public Version getVersion() { return applicationConfig.getOptionAsVersion(TuttiServiceConfigOption.VERSION.getKey()); Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-01-28 11:15:47 UTC (rev 247) +++ trunk/tutti-ui-swing/pom.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -68,9 +68,15 @@ </maven.jar.main.class> <redmine.releaseFiles> - target/${project.build.finalName}-bin.zip + target/${project.build.finalName}-standalone.zip, + target/${project.build.finalName}-full-windows-i586.zip, + target/${project.build.finalName}-full-windows-x64.zip, + target/${project.build.finalName}-full-linux-i586.zip, + target/${project.build.finalName}-full-linux-x64.zip </redmine.releaseFiles> + <jreVersion>1.7.10</jreVersion> + </properties> <build> @@ -234,7 +240,7 @@ <groupId>${project.groupId}</groupId> <artifactId>tutti-persistence-adagio</artifactId> <version>${project.version}</version> - <scope>runtime</scope> + <!--<scope>runtime</scope>--> </dependency> @@ -367,6 +373,108 @@ <profiles> <profile> + <id>prepare-jre-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>process-compile</defaultGoal> + <plugins> + + <!-- get jre distributions and unpack them --> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>get-linux-i586-jre</id> + <phase>process-classes</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory> + ${project.build.directory}/jre-linux-i586 + </outputDirectory> + <artifactItems> + <artifactItem> + <groupId>com.oracle</groupId> + <artifactId>jre</artifactId> + <version>${jreVersion}</version> + <classifier>linux-i586</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>get-linux-x64-jre</id> + <phase>process-classes</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory> + ${project.build.directory}/jre-linux-x64 + </outputDirectory> + <artifactItems> + <artifactItem> + <groupId>com.oracle</groupId> + <artifactId>jre</artifactId> + <version>${jreVersion}</version> + <classifier>linux-x64</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>get-windows-i586-jre</id> + <phase>process-classes</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory> + ${project.build.directory}/jre-windows-i586 + </outputDirectory> + <artifactItems> + <artifactItem> + <groupId>com.oracle</groupId> + <artifactId>jre</artifactId> + <version>${jreVersion}</version> + <classifier>windows-i586</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> + <id>get-windows-x64-jre</id> + <phase>process-classes</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory> + ${project.build.directory}/jre-windows-x64 + </outputDirectory> + <artifactItems> + <artifactItem> + <groupId>com.oracle</groupId> + <artifactId>jre</artifactId> + <version>${jreVersion}</version> + <classifier>windows-x64</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>assembly-profile</id> <activation> <property> @@ -377,20 +485,40 @@ <build> <defaultGoal>package</defaultGoal> <plugins> + + <!-- create assemblies --> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> <attach>false</attach> + <finalName>tutti-${project.version}</finalName> </configuration> <executions> <execution> + <id>standalone</id> <phase>package</phase> <goals> <goal>single</goal> </goals> + <configuration> + <descriptors> + <descriptor> + src/main/assembly/standalone.xml + </descriptor> + <descriptor> + src/main/assembly/full-linux-i586.xml + </descriptor> + <!--descriptor> + src/main/assembly/full-linux-x64.xml + </descriptor> + <descriptor> + src/main/assembly/full-windows-i586.xml + </descriptor> + <descriptor> + src/main/assembly/full-windows-x64.xml + </descriptor--> + </descriptors> + </configuration> </execution> </executions> </plugin> Deleted: trunk/tutti-ui-swing/src/main/assembly/bin.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/bin.xml 2013-01-28 11:15:47 UTC (rev 247) +++ trunk/tutti-ui-swing/src/main/assembly/bin.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> - <id>bin</id> - <formats> - <format>zip</format> - </formats> - - <files> - <file> - <source>target/${project.build.finalName}.${project.packaging}</source> - </file> - - </files> - <fileSets> - <fileSet> - <directory>target/lib</directory> - <outputDirectory>lib</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>junit-*.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>src/main/assembly</directory> - <outputDirectory /> - <filtered>true</filtered> - <fileMode>0755</fileMode> - <includes> - <include>tutti.sh</include> - <include>tutti.bat</include> - </includes> - </fileSet> - <fileSet> - <includes> - <include>README*</include> - <include>LICENSE*</include> - </includes> - </fileSet> - </fileSets> -</assembly> Property changes on: trunk/tutti-ui-swing/src/main/assembly/full/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,17 @@ +#!/bin/bash + +export JAVA_COMMAND=`pwd`/jre/bin/java + +while true; do + + cp tutti-app/update.sh . + ./update.sh + (cd tutti-app ; ./launch.sh) + exitcode=$? + echo "exitCode: $exitcode" + + if [ ! "$exitcode" -eq "88" ]; then + # quit now! + exit $exitcode + fi +done \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/full-linux-i586.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full-linux-i586.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/full-linux-i586.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + + <id>full-linux-i586</id> + <formats> + <format>zip</format> + </formats> + + <componentDescriptors> + <componentDescriptor> + src/main/assembly/tutti-full-component.xml + </componentDescriptor> + </componentDescriptors> + + <fileSets> + + <fileSet> + <directory>${project.build.directory}/jre-linux-i586/jre</directory> + <outputDirectory>jre</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + + </fileSets> + +</assembly> Property changes on: trunk/tutti-ui-swing/src/main/assembly/full-linux-i586.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/full-linux-x64.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full-linux-x64.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/full-linux-x64.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + + <id>full-linux-x64</id> + <formats> + <format>zip</format> + </formats> + + <componentDescriptors> + <componentDescriptor> + src/main/assembly/tutti-full-component.xml + </componentDescriptor> + </componentDescriptors> + + <fileSets> + + <fileSet> + <directory>${project.build.directory}/jre-linux-x64/jre</directory> + <outputDirectory>/jre</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + + </fileSets> + +</assembly> Property changes on: trunk/tutti-ui-swing/src/main/assembly/full-linux-x64.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/full-windows-i586.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full-windows-i586.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/full-windows-i586.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + + <id>full-windows-i586</id> + <formats> + <format>zip</format> + </formats> + + <componentDescriptors> + <componentDescriptor> + src/main/assembly/tutti-full-component.xml + </componentDescriptor> + </componentDescriptors> + + <fileSets> + + <fileSet> + <directory>${project.build.directory}/jre-windows-i586/jre</directory> + <outputDirectory>jre</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + + </fileSets> + +</assembly> Property changes on: trunk/tutti-ui-swing/src/main/assembly/full-windows-i586.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/full-windows-x64.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full-windows-x64.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/full-windows-x64.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + + <id>full-windows-x64</id> + <formats> + <format>zip</format> + </formats> + + <componentDescriptors> + <componentDescriptor> + src/main/assembly/tutti-full-component.xml + </componentDescriptor> + </componentDescriptors> + + <fileSets> + + <fileSet> + <directory>${project.build.directory}/jre-windows-x64/jre</directory> + <outputDirectory>jre</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + + </fileSets> +</assembly> Property changes on: trunk/tutti-ui-swing/src/main/assembly/full-windows-x64.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/assembly/min/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/tutti-ui-swing/src/main/assembly/min/launch.bat (from rev 231, trunk/tutti-ui-swing/src/main/assembly/tutti.bat) =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.bat (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,2 @@ + +java -Xmx1024M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 Copied: trunk/tutti-ui-swing/src/main/assembly/min/launch.sh (from rev 231, trunk/tutti-ui-swing/src/main/assembly/tutti.sh) =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.sh (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,10 @@ +#!/bin/bash + +MEMORY="-Xmx1024M" + +echo "java command: $JAVA_COMMAND" + +$JAVA_COMMAND $MEMORY -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000 -jar ${project.build.finalName}.${project.packaging} $* +exitcode=$? +echo "Stop Tutti with exitcode: $exitcode" +exit $exitcode Added: trunk/tutti-ui-swing/src/main/assembly/min/tutti.properties =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/tutti.properties (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/min/tutti.properties 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,35 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +# basedirectory of tutti full application (tutti + jre) +tutti.application.basedir=.. + +# directory where tutti database is stored +tutti.persistence.db.directory=${tutti.application.basedir}/db + +# url to update jre and application +tutti.update.application.url=file://${tutti.application.directory}/update-application.properties + +# url to update database +tutti.update.database.url=file://${tutti.application.directory}/update-database.properties Property changes on: trunk/tutti-ui-swing/src/main/assembly/min/tutti.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/min/update-application.properties =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/update-application.properties (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/min/update-application.properties 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,34 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +tutti.version=1.1 +tutti.url=zip:file:/tmp/tutti-1.1-standalone.zip +jre.version=1.7.10 +#linux.amd64.jre.version=1.7.10 +linux.amd64.jre.url=zip:file:~/.m2/repository/com/oracle/jre/1.7.10/jre-1.7.10-linux-x64.jar +#linux.i386.jre.version=1.7.10 +linux.i386.jre.url=zip:file:~/.m2/repository/com/oracle/jre/1.7.10/jre-1.7.10-linux-i586.jar +#windows.amd64.jre.version=1.7.10 +windows.amd64.jre.url=zip:file:~/.m2/repository/com/oracle/jre/1.7.10/jre-1.7.10-windows-x64.jar +#windows.i386.jre.version=1.7.10 +windows.i386.jre.url=zip:file:~/.m2/repository/com/oracle/jre/1.7.10/jre-1.7.10-windows-i586.jar Property changes on: trunk/tutti-ui-swing/src/main/assembly/min/update-application.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/min/update-database.properties =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/update-database.properties (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/min/update-database.properties 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,25 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +adagiodb.version=1.0 +adagiodb.url=zip:file:/tmp/tutti-1.1-standalone.zip Property changes on: trunk/tutti-ui-swing/src/main/assembly/min/update-database.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/assembly/min/update.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/min/update.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/update.sh (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/min/update.sh 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,25 @@ +#!/bin/bash + +if [ -d NEW/tutti-app ]; then + oldVersion=`cat tutti-app/version.appup` + newVersion=`cat NEW/tutti-app/version.appup` + echo "Update tutti version $oldVersion to $newVersion" + mkdir OLD + backupDate=`date -d %Y-%j` + backupdir=OLD/tutti-app-$oldVersion-$backupDate + echo "Backup tutti old version to $backupDir" + #mv tutti-app $backupDir + #mv NEW/tutti-app . +fi + +if [ -d NEW/jre ]; then + oldVersion=`cat jre/version.appup` + newVersion=`cat NEW/jre/version.appup` + echo "Update jre version $oldVersion to $newVersion" + mkdir OLD + backupDate=`date -d %Y-%j` + backupdir=OLD/jre-$oldVersion-$backupDate + echo "Backup jre old version to $backupDir" + #mv jre $backupDir + #mv NEW/jre . +fi Property changes on: trunk/tutti-ui-swing/src/main/assembly/min/update.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/assembly/min/version.appup =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/version.appup (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/min/version.appup 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1 @@ +${project.version} \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/assembly/min/version.appup ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/tutti-ui-swing/src/main/assembly/standalone.xml (from rev 231, trunk/tutti-ui-swing/src/main/assembly/bin.xml) =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/standalone.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/standalone.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>standalone</id> + <formats> + <format>zip</format> + </formats> + + <fileSets> + + <fileSet> + <directory>target</directory> + <outputDirectory/> + <includes> + <include>${project.build.finalName}.${project.packaging}</include> + </includes> + </fileSet> + + <fileSet> + <directory>target/lib</directory> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>junit-*.jar</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/min</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>launch.sh</include> + <include>launch.bat</include> + </includes> + </fileSet> + + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + + </fileSets> +</assembly> Added: trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2013-01-28 11:22:28 UTC (rev 248) @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<component + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd"> + + <fileSets> + + <fileSet> + <directory>target</directory> + <outputDirectory>tutti-app</outputDirectory> + <includes> + <include>${project.build.finalName}.${project.packaging}</include> + </includes> + </fileSet> + + <fileSet> + <directory>target/lib</directory> + <outputDirectory>tutti-app/lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>junit-*.jar</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/min</directory> + <outputDirectory>tutti-app</outputDirectory> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>*.sh</include> + <include>*.bat</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/min</directory> + <outputDirectory>tutti-app</outputDirectory> + <filtered>true</filtered> + <includes> + <include>*</include> + </includes> + <excludes> + <exclude>*.sh</exclude> + <exclude>*.bat</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/full</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>tutti.sh</include> + <include>tutti.bat</include> + <include>README*</include> + </includes> + </fileSet> + + <fileSet> + <includes> + <include>LICENSE*</include> + </includes> + </fileSet> + + </fileSets> +</component> Property changes on: trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/tutti-ui-swing/src/main/assembly/tutti.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/tutti.bat 2013-01-28 11:15:47 UTC (rev 247) +++ trunk/tutti-ui-swing/src/main/assembly/tutti.bat 2013-01-28 11:22:28 UTC (rev 248) @@ -1,2 +0,0 @@ - -java -Xmx1024M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 Deleted: trunk/tutti-ui-swing/src/main/assembly/tutti.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/tutti.sh 2013-01-28 11:15:47 UTC (rev 247) +++ trunk/tutti-ui-swing/src/main/assembly/tutti.sh 2013-01-28 11:22:28 UTC (rev 248) @@ -1,5 +0,0 @@ -#!/bin/bash - -MEMORY="-Xmx1024M" - -java $MEMORY -jar ${project.build.finalName}.${project.packaging} $*