Author: tchemit Date: 2012-09-05 12:51:03 +0200 (Wed, 05 Sep 2012) New Revision: 3681 Url: http://chorem.org/repositories/revision/pollen/3681 Log: fixes #803: Portable Pollen version does not start using given scripts Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-09-04 16:54:54 UTC (rev 3680) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-09-05 10:51:03 UTC (rev 3681) @@ -9,7 +9,7 @@ set POLLEN_OPTS="-Xms512m -Xmx1024m -Dpollen.log.dir=./logs" echo java options used : %POLLEN_OPTS% -%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-embedded-${project.version}.war %1 %2 %3 %4 %5 %6 %7 %8 %9 +%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 pause cmd /C exit /B %ERROR_CODE% Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-09-04 16:54:54 UTC (rev 3680) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-09-05 10:51:03 UTC (rev 3681) @@ -11,6 +11,6 @@ OLDPWD=`pwd` cd `dirname $0` CURRENTPWD=`pwd` -POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dpollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar pollen-embedded-${project.version}.war $* +POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dpollen.log.dir=$CURRENTPWD/logs" +java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war $* cd "$OLDPWD" \ No newline at end of file