October 2012 - Echobase-commits - mailman.cloud.codelutin.com

r721 - trunk
by tchemit＠users.forge.codelutin.com 11 Oct '12

11 Oct '12

Author: tchemit Date: 2012-10-11 04:54:43 +0200 (Thu, 11 Oct 2012) New Revision: 721 Url: http://forge.codelutin.com/repositories/revision/echobase/721 Log: Update mavenpom4redmine to 3.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-05 16:19:11 UTC (rev 720) +++ trunk/pom.xml 2012-10-11 02:54:43 UTC (rev 721) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.8</version> + <version>3.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r720 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor
by tchemit＠users.forge.codelutin.com 05 Oct '12

05 Oct '12

Author: tchemit Date: 2012-10-05 18:19:11 +0200 (Fri, 05 Oct 2012) New Revision: 720 Url: http://forge.codelutin.com/repositories/revision/echobase/720 Log: fixes #1571: Le filtre sur les campagnes dans l'?\195?\169cran de suppression ne fonctionne pas Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2012-10-05 15:43:15 UTC (rev 719) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2012-10-05 16:19:11 UTC (rev 720) @@ -39,6 +39,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.pager.FilterRule; +import org.nuiton.topia.persistence.pager.FilterRuleGroupOperator; import org.nuiton.topia.persistence.pager.FilterRuleOperator; import org.nuiton.util.decorator.Decorator; @@ -118,6 +119,7 @@ pager.setRules(Arrays.asList(new FilterRule( FilterRuleOperator.eq, ImportLog.PROPERTY_VOYAGE_ID, voyageId ))); + pager.setGroupOp(FilterRuleGroupOperator.AND); } execute(); Map<String, String> importTypes = decorateEnums(ImportType.values());

1 0

r719 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy
by tchemit＠users.forge.codelutin.com 05 Oct '12

05 Oct '12

Author: tchemit Date: 2012-10-05 17:43:15 +0200 (Fri, 05 Oct 2012) New Revision: 719 Url: http://forge.codelutin.com/repositories/revision/echobase/719 Log: fixes #1570: Erreur lors de la cr?\195?\169ation d'une application embarqu?\195?\169 si pas de campagne s?\195?\169lectionn?\195?\169e Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/AbstractImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/ReferentialImportDbStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/AbstractImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/AbstractImportDbStrategy.java 2012-10-05 15:42:47 UTC (rev 718) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/AbstractImportDbStrategy.java 2012-10-05 15:43:15 UTC (rev 719) @@ -23,6 +23,7 @@ * #L% */ +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; @@ -135,15 +136,18 @@ log.info("Import done with user " + user.getEmail()); } - createImportLogEntry(getDAO(ImportLog.class), - user, - file, - importedVoyages); + if (importedVoyages != null && + !Iterables.isEmpty(importedVoyages)) { + createImportLogEntry(getDAO(ImportLog.class), + user, + file, + importedVoyages); + + } createLogBookEntry(getDAO(EntityModificationLog.class), user, - file, - importedVoyages); + file); commitTransaction("Could not commit db import from file " + file); @@ -166,8 +170,7 @@ protected abstract void createLogBookEntry(TopiaDAO<EntityModificationLog> dao, EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException; + File file) throws TopiaException; protected Iterable<Voyage> importTables(ImportStrategy<EchoBaseEntityEnum> strategy, ImportDbConfiguration model, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2012-10-05 15:42:47 UTC (rev 718) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2012-10-05 15:43:15 UTC (rev 719) @@ -88,8 +88,7 @@ @Override protected void createLogBookEntry(TopiaDAO<EntityModificationLog> dao, EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException { + File file) throws TopiaException { dao.create( EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import db", Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/ReferentialImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/ReferentialImportDbStrategy.java 2012-10-05 15:42:47 UTC (rev 718) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/ReferentialImportDbStrategy.java 2012-10-05 15:43:15 UTC (rev 719) @@ -99,8 +99,7 @@ @Override protected void createLogBookEntry(TopiaDAO<EntityModificationLog> dao, EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException { + File file) throws TopiaException { dao.create( EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import referential only db",

1 0

r718 - trunk/echobase-services/src/main/resources/embedded
by tchemit＠users.forge.codelutin.com 05 Oct '12

05 Oct '12

Author: tchemit Date: 2012-10-05 17:42:47 +0200 (Fri, 05 Oct 2012) New Revision: 718 Url: http://forge.codelutin.com/repositories/revision/echobase/718 Log: fixes #1569: Faire fonctionner l'application embarqu?\195?\169 juste avec une jre et non plus une jdk (scripts embedded) Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat trunk/echobase-services/src/main/resources/embedded/startEchobase.sh Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-10-05 15:26:33 UTC (rev 717) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-10-05 15:42:47 UTC (rev 718) @@ -1,48 +1,32 @@ @REM ---------------------------------------------------------------------------- @REM EchoBase Start Up Batch script @REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir @REM ---------------------------------------------------------------------------- @echo off -if not "%JDK_HOME%" == "" goto OkJHome +java -version -echo. -echo ERROR: JDK_HOME not found in your environment. -echo Please set the JDK_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error +IF "%ERRORLEVEL%" == "0" GOTO launch -:OkJHome -echo JDK_HOME defined to %JDK_HOME% - -if exist "%JDK_HOME%\bin\java.exe" goto doit - echo. -echo ERROR: JDK_HOME is set to an invalid directory. -echo JDK_HOME = "%JDK_HOME%" -echo Please set the JDK_HOME variable in your environment to match the -echo location of your Java installation +echo ERROR: "java.exe" not found. +echo Please install java on your computer. echo. -goto error +GOTO error :error set ERROR_CODE=1 goto end -:doit -set JAVA_COMMAND="%JDK_HOME%\bin\java.exe" -echo java.exe defined to %JAVA_COMMAND% +:launch +SET JAVA_COMMAND="java.exe" -set ECHOBASE_OPTS="-Xms512m -Xmx1024m -Dechobase.log.dir=./logs" -echo java options used : %ECHOBASE_OPTS% +SET ECHOBASE_OPTS="-Xms512m -Xmx1024m -Dechobase.log.dir=./logs" +ECHO java options used : %ECHOBASE_OPTS% -%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar echobase-ui-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto end +%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar echobase-ui-${project.version}-embedded.war +GOTO end :end - -pause -cmd /C exit /B %ERROR_CODE% +PAUSE +CMD /C exit /B %ERROR_CODE% Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-10-05 15:26:33 UTC (rev 717) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-10-05 15:42:47 UTC (rev 718) @@ -1,16 +1,17 @@ #!/bin/sh -if [ ! -e $JDK_HOME/bin/java ]; then - echo "Do not find $JDK_HOME/bin/java, please add JDK_HOME environnement variable" +# Test if java exists +java -version + +if [ ! $? -eq 0 ]; then + echo "Do not find java, please install java on your computer" exit 1 fi -JAVA_EXEC=$JDK_HOME/bin/java - OLDPWD=`pwd` cd `dirname $0` CURRENTPWD=`pwd` ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" -$JAVA_EXEC $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* +java $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* cd "$OLDPWD"

1 0

r717 - in trunk: echobase-ui echobase-ui/src/main/assembly/dist src/site/rst
by tchemit＠users.forge.codelutin.com 05 Oct '12

05 Oct '12

Author: tchemit Date: 2012-10-05 17:26:33 +0200 (Fri, 05 Oct 2012) New Revision: 717 Url: http://forge.codelutin.com/repositories/revision/echobase/717 Log: fixes #1569: Faire fonctionner l'application embarqu?\195?\169 juste avec une jre et non plus une jdk Modified: trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh trunk/src/site/rst/usage.rst Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-10-05 13:47:46 UTC (rev 716) +++ trunk/echobase-ui/pom.xml 2012-10-05 15:26:33 UTC (rev 717) @@ -354,9 +354,10 @@ </property> </activation> <properties> - <embeddedWarDir> - ${project.build.directory}/echobase-${project.version}-embedded - </embeddedWarDir> + <embeddedWarName>echobase-ui-${project.version}-embedded</embeddedWarName> + <embeddedTmpWarDir> + ${project.build.directory}/${embeddedWarName}-temp + </embeddedTmpWarDir> </properties> <build> <defaultGoal>verify</defaultGoal> @@ -370,7 +371,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir dir="${embeddedWarDir}/WEB-INF/classes" /> + <mkdir dir="${embeddedTmpWarDir}/WEB-INF/classes" /> </target> </configuration> <goals> @@ -394,10 +395,10 @@ </goals> <configuration> <generatedClasses> - ${embeddedWarDir}/WEB-INF/classes + ${embeddedTmpWarDir}/WEB-INF/classes </generatedClasses> <webXmlFragment> - ${embeddedWarDir}/WEB-INF/webfrag.xml + ${embeddedTmpWarDir}/WEB-INF/webfrag.xml </webXmlFragment> <packageRoot>org.apache.jsp</packageRoot> @@ -440,16 +441,18 @@ </goals> <configuration> <primaryArtifact>false</primaryArtifact> - <webappDirectory>${embeddedWarDir}</webappDirectory> + <webappDirectory> + ${project.build.directory}/${embeddedWarName} + </webappDirectory> <archive> <manifest> <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> </manifest> </archive> - <warName>echobase-ui-${project.version}-embedded</warName> + <warName>${embeddedWarName}</warName> <webResources> <webResource> - <directory>${embeddedWarDir}</directory> + <directory>${embeddedTmpWarDir}</directory> <includes> <include>**/*</include> </includes> @@ -487,7 +490,7 @@ <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> <attach>false</attach> - <finalName>echobase-ui-${project.version}-embedded</finalName> + <finalName>${embeddedWarName}</finalName> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions> Modified: trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat 2012-10-05 13:47:46 UTC (rev 716) +++ trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat 2012-10-05 15:26:33 UTC (rev 717) @@ -1,48 +1,32 @@ @REM ---------------------------------------------------------------------------- @REM EchoBase Start Up Batch script @REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir @REM ---------------------------------------------------------------------------- @echo off -if not "%JDK_HOME%" == "" goto OkJHome +java -version -echo. -echo ERROR: JDK_HOME not found in your environment. -echo Please set the JDK_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error +IF "%ERRORLEVEL%" == "0" GOTO launch -:OkJHome -echo JDK_HOME defined to %JDK_HOME% - -if exist "%JDK_HOME%\bin\java.exe" goto doit - echo. -echo ERROR: JDK_HOME is set to an invalid directory. -echo JDK_HOME = "%JDK_HOME%" -echo Please set the JDK_HOME variable in your environment to match the -echo location of your Java installation +echo ERROR: "java.exe" not found. +echo Please install java on your computer. echo. -goto error +GOTO error :error set ERROR_CODE=1 goto end -:doit -set JAVA_COMMAND="%JDK_HOME%\bin\java.exe" -echo java.exe defined to %JAVA_COMMAND% +:launch +SET JAVA_COMMAND="java.exe" -set ECHOBASE_OPTS="-Xms512m -Xmx1024m -Dechobase.log.dir=./logs" -echo java options used : %ECHOBASE_OPTS% +SET ECHOBASE_OPTS="-Xms512m -Xmx1024m -Dechobase.log.dir=./logs" +ECHO java options used : %ECHOBASE_OPTS% %JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar echobase-ui-${project.version}-embedded.war -goto end +GOTO end :end - -pause -cmd /C exit /B %ERROR_CODE% +PAUSE +CMD /C exit /B %ERROR_CODE% Modified: trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2012-10-05 13:47:46 UTC (rev 716) +++ trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2012-10-05 15:26:33 UTC (rev 717) @@ -1,16 +1,17 @@ #!/bin/sh -if [ ! -e $JDK_HOME/bin/java ]; then - echo "Do not find $JDK_HOME/bin/java, please add JDK_HOME environnement variable" +# Test if java exists +java -version + +if [ ! $? -eq 0 ]; then + echo "Do not find java, please install java on your computer" exit 1 fi -JAVA_EXEC=$JDK_HOME/bin/java - OLDPWD=`pwd` cd `dirname $0` CURRENTPWD=`pwd` ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" -$JAVA_EXEC $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* +java $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* cd "$OLDPWD" Modified: trunk/src/site/rst/usage.rst =================================================================== --- trunk/src/site/rst/usage.rst 2012-10-05 13:47:46 UTC (rev 716) +++ trunk/src/site/rst/usage.rst 2012-10-05 15:26:33 UTC (rev 717) @@ -38,43 +38,22 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ En mode portable, pas besoin de serveur, il faut juste avoir java d'installer -sur la machine avec la varaible d'environnement *JDK_HOME* de bien positionner -sur le repertoire où est installer Java. +sur la machine. Pré-requis pour utilisation sous Windows ________________________________________ -Installer un environnement java de développement (une JDK) et pas une JRE -qui ne suffit pas. +Installer un environnement d'exécution java. `Page de téléchargement Oracle`_ -Une fois la JDK téléchargée et installée, ajouter la variable d'environnement -**JDK_HOME** qui est le chemin vers où a été installé Java. - -:: - - JDK_HOME -> C:/Program Files/Java/jdk1.7.0_03 - Pré-requis pour utilisation sous Linux ______________________________________ -Installer un environnement java de développement (une JDK) et pas une JRE -qui ne suffit pas. +Installer un environnement d'execution java . `Page de téléchargement Oracle`_ -Une fois la JDK téléchargée et installée, ajouter dans les variables -d'environnement : - -:: - - JDK_HOME -> chemin vers où a été installé la JDK - - Pour ajouter une variable d'environnement, écrire dans ton fichier /home/Utilisateur/.bashrc la ligne : - -export JDK_HOME=/path/vers/jdk - Procédure d'installation ________________________ @@ -88,7 +67,7 @@ echobase-ui-1.1-embedded ├── echobase.properties (1) Fichier de configuration de l'application embarquée - ├── echobase-ui-1.1-embedded.war + ├── echobase-ui-${project.version}-embedded.war ├── LICENSE.txt ├── README.txt ├── startEchobase.bat (2) Script de démarrage (windows)

1 0

r716 - trunk
by tchemit＠users.forge.codelutin.com 05 Oct '12

05 Oct '12

Author: tchemit Date: 2012-10-05 15:47:46 +0200 (Fri, 05 Oct 2012) New Revision: 716 Url: http://forge.codelutin.com/repositories/revision/echobase/716 Log: fixes #1568: Mise ?\195?\160 jour de librairies Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-25 10:48:41 UTC (rev 715) +++ trunk/pom.xml 2012-10-05 13:47:46 UTC (rev 716) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.7</version> + <version>3.3.8</version> </parent> <groupId>fr.ifremer</groupId> @@ -134,15 +134,15 @@ <eugenePluginVersion>2.5</eugenePluginVersion> <topiaVersion>2.7</topiaVersion> - <nuitonUtilsVersion>2.6.2</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.4</struts2Version> - <jqueryPluginVersion>3.3.1</jqueryPluginVersion> + <struts2Version>2.3.4.1</struts2Version> + <jqueryPluginVersion>3.3.3</jqueryPluginVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <slf4jVersion>1.6.6</slf4jVersion> + <slf4jVersion>1.7.1</slf4jVersion> <jackcessVersion>1.2.7</jackcessVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> @@ -394,12 +394,6 @@ <version>${nuitonI18nVersion}</version> </plugin> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <version>2.0-beta-1</version> - </plugin> - </plugins> </pluginManagement>

1 0