Author: tchemit Date: 2013-04-29 21:01:09 +0200 (Mon, 29 Apr 2013) New Revision: 3786 Url: http://chorem.org/projects/pollen/repository/revisions/3786 Log: refs #908: Updates nuiton-web to 1.13 fixes #907: Pollen does not start well via the embedded version of it Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh trunk/pom.xml Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2013-04-29 19:01:09 UTC (rev 3786) @@ -20,7 +20,7 @@ :launch set POLLEN_OPTS="-Xms512m -Xmx1024m -Dpollen.log.dir=./logs" -java.exe "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 +java.exe "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war --path /home; %1 %2 %3 %4 %5 %6 %7 %8 %9 GOTO end :end Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2013-04-29 19:01:09 UTC (rev 3786) @@ -13,5 +13,5 @@ cd `dirname $0` CURRENTPWD=`pwd` POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dpollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war $* +java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war --path /home; $* cd "$OLDPWD" \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pom.xml 2013-04-29 19:01:09 UTC (rev 3786) @@ -152,7 +152,7 @@ <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> + <nuitonWebVersion>1.13-SNAPSHOT</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> <postgresqlVersion>9.2-1002-jdbc4</postgresqlVersion>