Author: tchemit Date: 2013-10-21 17:18:24 +0200 (Mon, 21 Oct 2013) New Revision: 859 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/859 Log: fixes #3551: Simplifier la proc?\195?\169dure d'installation de l'application Modified: trunk/echobase-services/src/main/resources/embedded/README.txt trunk/echobase-services/src/main/resources/embedded/startEchobase.bat trunk/echobase-services/src/main/resources/embedded/startEchobase.sh trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/assembly/dist/README.txt trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh trunk/pom.xml Modified: trunk/echobase-services/src/main/resources/embedded/README.txt =================================================================== --- trunk/echobase-services/src/main/resources/embedded/README.txt 2013-10-20 16:41:33 UTC (rev 858) +++ trunk/echobase-services/src/main/resources/embedded/README.txt 2013-10-21 15:18:24 UTC (rev 859) @@ -1,2 +1,26 @@ +============================= +EchoBase - ${project.version} +============================= + +Premier démarrage +----------------- + +Pour démarrer EchoBase : + +- Il faut avoir une JDK d'installer sur la machine cible. + +- la variable JDK_HOME doit être positionnée dans les variables d'environements. + +En suite on lance + +./startEchobase.sh (sous linux) + +ou + +startEchobase.bat (sous windows) + +Pilotes jdbc +------------ + Le répertoire 'drivers' contient les pilotes jdbc à positionner dans libre-office -pour pouvoir interroger l'application embarquée. \ No newline at end of file +pour pouvoir interroger l'application embarquée. Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2013-10-20 16:41:33 UTC (rev 858) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2013-10-21 15:18:24 UTC (rev 859) @@ -24,7 +24,7 @@ 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 +%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar ${embeddedWarName}.war GOTO end :end Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2013-10-20 16:41:33 UTC (rev 858) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2013-10-21 15:18:24 UTC (rev 859) @@ -12,6 +12,6 @@ cd `dirname $0` CURRENTPWD=`pwd` ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dechobase.log.dir=$CURRENTPWD/logs" -java $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* +java $ECHOBASE_OPTS -jar ${embeddedWarName}.war $* cd "$OLDPWD" Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-10-20 16:41:33 UTC (rev 858) +++ trunk/echobase-ui/pom.xml 2013-10-21 15:18:24 UTC (rev 859) @@ -24,7 +24,6 @@ <env>dev</env> - <embeddedWarName>echobase-embedded-${project.version}</embeddedWarName> <fullWarName>echobase-full-${project.version}</fullWarName> <redmine.releaseFiles> Modified: trunk/echobase-ui/src/main/assembly/dist/README.txt =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/README.txt 2013-10-20 16:41:33 UTC (rev 858) +++ trunk/echobase-ui/src/main/assembly/dist/README.txt 2013-10-21 15:18:24 UTC (rev 859) @@ -18,3 +18,9 @@ ou startEchobase.bat (sous windows) + +Pilotes jdbc +------------ + +Le répertoire 'drivers' contient les pilotes jdbc à positionner dans libre-office +pour pouvoir interroger l'application embarquée. Modified: trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat 2013-10-20 16:41:33 UTC (rev 858) +++ trunk/echobase-ui/src/main/assembly/dist/startEchobase.bat 2013-10-21 15:18:24 UTC (rev 859) @@ -24,7 +24,7 @@ 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 +%JAVA_COMMAND% "%ECHOBASE_OPTS%" -jar ${embeddedWarName}.war GOTO end :end Modified: trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh =================================================================== --- trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2013-10-20 16:41:33 UTC (rev 858) +++ trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2013-10-21 15:18:24 UTC (rev 859) @@ -11,6 +11,6 @@ OLDPWD=`pwd` cd `dirname $0` ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=./logs" -java $ECHOBASE_OPTS -jar echobase-ui-${project.version}-embedded.war $* +java $ECHOBASE_OPTS -jar ${embeddedWarName}.war $* cd "$OLDPWD" Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-20 16:41:33 UTC (rev 858) +++ trunk/pom.xml 2013-10-21 15:18:24 UTC (rev 859) @@ -170,6 +170,9 @@ <!--Site configuration --> <locales>fr,en</locales> + <!-- name of embedded war file basename --> + <embeddedWarName>echobase-embedded-${project.version}</embeddedWarName> + </properties> <dependencyManagement>