May 2012 - Pollen-commits - mailman.cloud.codelutin.com

r3357 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org May 3, 2012

May 3, 2012

Author: tchemit Date: 2012-05-03 15:11:55 +0200 (Thu, 03 May 2012) New Revision: 3357 Url: http://chorem.org/repositories/revision/pollen/3357 Log: fix build Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-03 12:45:16 UTC (rev 3356) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-03 13:11:55 UTC (rev 3357) @@ -300,6 +300,24 @@ <defaultGoal>verify</defaultGoal> <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-temp-workdir</id> + <phase>generate-resources</phase> + <configuration> + <target> + <mkdir + dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin>  <plugin>

1 0

r3356 - trunk/pollen-ui-struts2/src/main/assembly/dist
by tchemit＠users.chorem.org May 3, 2012

May 3, 2012

Author: tchemit Date: 2012-05-03 14:45:16 +0200 (Thu, 03 May 2012) New Revision: 3356 Url: http://chorem.org/repositories/revision/pollen/3356 Log: may script works on windows Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-03 11:52:50 UTC (rev 3355) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-03 12:45:16 UTC (rev 3356) @@ -1,50 +1,16 @@ @REM ---------------------------------------------------------------------------- @REM Pollen Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JRE home dir @REM ---------------------------------------------------------------------------- @echo off -if not "%JAVA_HOME%" == "" goto OkJHome +set JAVA_COMMAND="java.exe" -echo. -echo ERROR: JAVA_HOME not found in your environment. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error - -:OkJHome -echo JAVA_HOME defined to %JAVA_HOME% - -if exist "%JAVA_HOME%\bin\java.exe" goto doit - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory. -echo JAVA_HOME = "%JAVA_HOME%" -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error - -:error -set ERROR_CODE=1 -goto end - -:doit -set JAVA_COMMAND="%JAVA_HOME%\bin\java.exe" -echo java.exe defined to %JAVA_COMMAND% - 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 -goto end -:end - pause cmd /C exit /B %ERROR_CODE%

1 0

r3355 - in trunk: . pollen-ui-struts2 pollen-ui-struts2/src/main/assembly/dist
by tchemit＠users.chorem.org May 3, 2012

May 3, 2012

Author: tchemit Date: 2012-05-03 13:52:50 +0200 (Thu, 03 May 2012) New Revision: 3355 Url: http://chorem.org/repositories/revision/pollen/3355 Log: - remove l10n plugin - make embedded pollen no need to JDK (just a JRE is required now) Modified: trunk/pollen-ui-struts2/pom.xml 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/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-02 14:14:38 UTC (rev 3354) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-03 11:52:50 UTC (rev 3355) @@ -289,7 +289,7 @@ <profiles> <profile> - <id>assembly-profile</id> + <id>assembly</id> <activation> <property> <name>performRelease</name> @@ -299,20 +299,87 @@ <build> <defaultGoal>verify</defaultGoal> <plugins> + +  + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-jspc-maven-plugin</artifactId> + <version>${jettyPluginVersion}</version> + <executions> + <execution> + <id>jspc</id> + <goals> + <goal>jspc</goal> + </goals> + <configuration> + <generatedClasses> + target/pollen-embedded-temp-${project.version}/WEB-INF/classes + </generatedClasses> + <webXmlFragment> + target/pollen-embedded-temp-${project.version}/WEB-INF/webfrag.xml + </webXmlFragment> + <packageRoot>org.apache.jsp</packageRoot> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + </dependencies> + </plugin> + +  + + <plugin> <artifactId>maven-war-plugin</artifactId> <executions> <execution> - <id>embedded-war</id> + <id>pack</id> <goals> <goal>war</goal> </goals> <configuration> + <webappDirectory> + target/pollen-embedded-${project.version} + </webappDirectory> <archive> <manifest> <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> </manifest> </archive> + <warName>pollen-embedded-${project.version}</warName> + <webResources> + <webResource> + <directory> + target/pollen-embedded-temp-${project.version} + </directory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/webfrag.xml</exclude> + </excludes> + </webResource> + </webResources> <overlays> <overlay> <groupId>org.nuiton.web</groupId> @@ -328,11 +395,13 @@ <type>jar</type> </overlay> </overlays> - <warName>pollen-embedded-${project.version}</warName> </configuration> </execution> </executions> </plugin> + +  + <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-02 14:14:38 UTC (rev 3354) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-03 11:52:50 UTC (rev 3355) @@ -3,28 +3,28 @@ @REM Pollen Start Up Batch script @REM @REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir +@REM JAVA_HOME - location of a JRE home dir @REM ---------------------------------------------------------------------------- @echo off -if not "%JDK_HOME%" == "" goto OkJHome +if not "%JAVA_HOME%" == "" goto OkJHome echo. -echo ERROR: JDK_HOME not found in your environment. -echo Please set the JDK_HOME variable in your environment to match the +echo ERROR: JAVA_HOME not found in your environment. +echo Please set the JAVA_HOME variable in your environment to match the echo location of your Java installation echo. goto error :OkJHome -echo JDK_HOME defined to %JDK_HOME% +echo JAVA_HOME defined to %JAVA_HOME% -if exist "%JDK_HOME%\bin\java.exe" goto doit +if exist "%JAVA_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 ERROR: JAVA_HOME is set to an invalid directory. +echo JAVA_HOME = "%JAVA_HOME%" +echo Please set the JAVA_HOME variable in your environment to match the echo location of your Java installation echo. goto error @@ -34,7 +34,7 @@ goto end :doit -set JAVA_COMMAND="%JDK_HOME%\bin\java.exe" +set JAVA_COMMAND="%JAVA_HOME%\bin\java.exe" echo java.exe defined to %JAVA_COMMAND% set POLLEN_OPTS="-Xms512m -Xmx1024m -Dpollen.log.dir=./logs" Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-05-02 14:14:38 UTC (rev 3354) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-05-03 11:52:50 UTC (rev 3355) @@ -1,7 +1,10 @@ #!/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 2&> /dev/null + +if [ "$?" = "1" ]; then + echo "Could not find java application, please add it into your PATH" exit 1 fi Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-02 14:14:38 UTC (rev 3354) +++ trunk/pom.xml 2012-05-03 11:52:50 UTC (rev 3355) @@ -460,26 +460,6 @@ </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>l10n-maven-plugin</artifactId> - <configuration> - <locales> - <locale>fr_FR</locale> - <locale>en_GB</locale> - </locales> - </configuration> - <executions> - <execution> - <goals> - <goal>pseudo</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> <resource> <directory>src/main/resources</directory>

1 0

r3354 - trunk
by tchemit＠users.chorem.org May 2, 2012

May 2, 2012

Author: tchemit Date: 2012-05-02 16:14:38 +0200 (Wed, 02 May 2012) New Revision: 3354 Url: http://chorem.org/repositories/revision/pollen/3354 Log: use last stable of nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-02 12:13:31 UTC (rev 3353) +++ trunk/pom.xml 2012-05-02 14:14:38 UTC (rev 3354) @@ -181,7 +181,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.4.8-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <h2Version>1.3.166</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.1.2</struts2Version>

1 0

r3353 - trunk/pollen-ui-struts2/src/main/assembly/dist
by tchemit＠users.chorem.org May 2, 2012

May 2, 2012

Author: tchemit Date: 2012-05-02 14:13:31 +0200 (Wed, 02 May 2012) New Revision: 3353 Url: http://chorem.org/repositories/revision/pollen/3353 Log: make loggin works with embedded version 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-05-02 12:12:58 UTC (rev 3352) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-02 12:13:31 UTC (rev 3353) @@ -37,10 +37,10 @@ set JAVA_COMMAND="%JDK_HOME%\bin\java.exe" echo java.exe defined to %JAVA_COMMAND% -set POLLEN_OPTS="-Xms512m -Xmx1024m" +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 --option pollen.log.dir $CURRENTPWD/logs +%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-embedded-${project.version}.war %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 2012-05-02 12:12:58 UTC (rev 3352) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-05-02 12:13:31 UTC (rev 3353) @@ -8,7 +8,6 @@ OLDPWD=`pwd` cd `dirname $0` CURRENTPWD=`pwd` -POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m" -#POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Jpollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar pollen-embedded-${project.version}.war --option pollen.log.dir $CURRENTPWD/logs $* +POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dpollen.log.dir=$CURRENTPWD/logs" +java $POLLEN_OPTS -jar pollen-embedded-${project.version}.war $* cd "$OLDPWD" \ No newline at end of file

1 0

r3352 - trunk/src/site
by tchemit＠users.chorem.org May 2, 2012

May 2, 2012

Author: tchemit Date: 2012-05-02 14:12:58 +0200 (Wed, 02 May 2012) New Revision: 3352 Url: http://chorem.org/repositories/revision/pollen/3352 Log: add links in doc Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-05-02 11:34:33 UTC (rev 3351) +++ trunk/src/site/site_en.xml 2012-05-02 12:12:58 UTC (rev 3352) @@ -96,8 +96,9 @@ <item name="Configure Pollen" href="configure.html"/> </menu> - <menu name="Demo"> - <item name="Demo" href="http://pollen.chorem.org/"/> + <menu name="Public instances"> + <item name="Official instance (Use last stable version of Pollen, No data loss)" href="http://pollen.chorem.org/"/> + <item name="Test instance (Use last dev version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen"/> </menu> <menu name="Language"> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-02 11:34:33 UTC (rev 3351) +++ trunk/src/site/site_fr.xml 2012-05-02 12:12:58 UTC (rev 3352) @@ -96,8 +96,9 @@ <item name="Configurer Pollen" href="configure.html"/> </menu> - <menu name="Demo"> - <item name="Demo" href="http://pollen.chorem.org/"/> + <menu name="Instances publiques"> + <item name="Instance officielle (utilise la dernière version stable, Pas de perte de données)" href="http://pollen.chorem.org/"/> + <item name="Instance de tests (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen"/> </menu> <menu name="Language">

1 0

r3351 - in trunk: . pollen-services
by tchemit＠users.chorem.org May 2, 2012

May 2, 2012

Author: tchemit Date: 2012-05-02 13:34:33 +0200 (Wed, 02 May 2012) New Revision: 3351 Url: http://chorem.org/repositories/revision/pollen/3351 Log: fix dependencies + add l10n plugin Modified: trunk/pollen-services/pom.xml trunk/pom.xml Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-02 11:28:51 UTC (rev 3350) +++ trunk/pollen-services/pom.xml 2012-05-02 11:34:33 UTC (rev 3351) @@ -88,14 +88,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> </dependencies>  Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-02 11:28:51 UTC (rev 3350) +++ trunk/pom.xml 2012-05-02 11:34:33 UTC (rev 3351) @@ -460,6 +460,26 @@ </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>l10n-maven-plugin</artifactId> + <configuration> + <locales> + <locale>fr_FR</locale> + <locale>en_GB</locale> + </locales> + </configuration> + <executions> + <execution> + <goals> + <goal>pseudo</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <resources> <resource> <directory>src/main/resources</directory> @@ -599,6 +619,19 @@ </reportSet> </reportSets> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>l10n-maven-plugin</artifactId> + <version>${l10nPluginVersion}</version> + <configuration> + <locales> + <locale>fr_FR</locale> + <locale>en_GB</locale> + </locales> + </configuration> + </plugin> + </plugins> </reporting>

1 0

r3350 - in trunk/pollen-ui-struts2: . src/main/java/org/chorem/pollen/ui/results
by tchemit＠users.chorem.org May 2, 2012

May 2, 2012

Author: tchemit Date: 2012-05-02 13:28:51 +0200 (Wed, 02 May 2012) New Revision: 3350 Url: http://chorem.org/repositories/revision/pollen/3350 Log: optimize dependencies + fix javadoc Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-02 11:16:10 UTC (rev 3349) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-02 11:28:51 UTC (rev 3350) @@ -178,6 +178,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> + <scope>runtime</scope> </dependency> </dependencies> Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-05-02 11:16:10 UTC (rev 3349) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-05-02 11:28:51 UTC (rev 3350) @@ -52,7 +52,6 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.ServletActionRedirectResult; -import org.apache.struts2.dispatcher.ServletRedirectResult; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.views.util.UrlHelper; @@ -62,99 +61,8 @@ import java.util.Map; /** - *  - * - * This result uses the {@link ActionMapper} provided by the - * {@link ActionMapperFactory} to redirect the browser to a URL that invokes the - * specified action and (optional) namespace. This is better than the - * {@link ServletRedirectResult} because it does not require you to encode the - * URL patterns processed by the {@link ActionMapper} in to your struts.xml - * configuration files. This means you can change your URL patterns at any point - * and your application will still work. It is strongly recommended that if you - * are redirecting to another action, you use this result rather than the - * standard redirect result. - * - * See examples below for an example of how request parameters could be passed - * in. - * - *  - * - * This result type takes the following parameters: - * - *  - * - * <ul> - * - * <li>actionName (default) - The name of the action that will be - * redirected to.</li> - * - * <li>namespace - Used to determine which namespace the action is in - * that we're redirecting to. If namespace is null, the default will be the - * current namespace.</li> - * - * <li>suppressEmptyParameters - Optional boolean (defaults to false) that - * can prevent parameters with no values from being included in the redirect - * URL.</li> - * - * <li>parse - Boolean, true by default. If set to false, the actionName - * param will not be parsed for Ognl expressions.</li> - * - * <li>anchor - Optional. Also known as "fragment" or colloquially as - * "hash". You can specify an anchor for a result.</li> - * </ul> - * - *  - * - * Example: - * - * <pre> - *  - * <package name="public" extends="struts-default"> - * <action name="login" class="..."> - *  - * <result type="redirectAction"> - * <param name="actionName">dashboard</param> - * <param name="namespace">/secure</param> - * </result> - * </action> - * </package> + * Fork of the {@link ServletActionRedirectResult} to be able to use : in urls. * - * <package name="secure" extends="struts-default" namespace="/secure"> - * <-- Redirect to an action in the same namespace --> - * <action name="dashboard" class="..."> - * <result>dashboard.jsp</result> - * <result name="error" type="redirectAction">error</result> - * </action> - * - * <action name="error" class="..."> - * <result>error.jsp</result> - * </action> - * </package> - * - * <package name="passingRequestParameters" extends="struts-default" namespace="/passingRequestParameters"> - *  - *  - * <action name="gatherReportInfo" class="..."> - * <result name="showReportResult" type="redirectAction"> - * <param name="actionName">generateReport</param> - * <param name="namespace">/genReport</param> - * <param name="reportType">pie</param> - * <param name="width">100</param> - * <param name="height">100</param> - * <param name="empty"></param> - * <param name="suppressEmptyParameters">true</param> - * <param name="anchor">summary</param> - * </result> - * </action> - * </package> - * - * - *  - * </pre> - * * @see ActionMapper */ public class PollenServletActionRedirectResult extends ServletActionRedirectResult { @@ -162,7 +70,7 @@ private static final long serialVersionUID = -9042425229314584066L; private static final Logger LOG = - LoggerFactory.getLogger(ServletRedirectResult.class); + LoggerFactory.getLogger(PollenServletActionRedirectResult.class); /** * Redirects to the location specified by calling @@ -172,6 +80,7 @@ * @param invocation an encapsulation of the action execution state. * @throws Exception if an error occurs when redirecting. */ + @Override protected void doExecute(String finalLocation, ActionInvocation invocation) throws Exception { ActionContext ctx = invocation.getInvocationContext(); HttpServletRequest request = (HttpServletRequest) ctx.get(ServletActionContext.HTTP_REQUEST);

1 0

r3349 - in trunk: pollen-persistence pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/resources/i18n pollen-ui-struts2 pollen-ui-struts2/src/main/resources
by tchemit＠users.chorem.org May 2, 2012

May 2, 2012

Author: tchemit Date: 2012-05-02 13:16:10 +0200 (Wed, 02 May 2012) New Revision: 3349 Url: http://chorem.org/repositories/revision/pollen/3349 Log: add db configuration in pollen (to add it in generated ApplicationConfig report) Modified: trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/resources/pollen.properties Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-05-02 11:15:08 UTC (rev 3348) +++ trunk/pollen-persistence/pom.xml 2012-05-02 11:16:10 UTC (rev 3349) @@ -59,12 +59,8 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <scope>test</scope> </dependency> -  + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-05-02 11:15:08 UTC (rev 3348) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-05-02 11:16:10 UTC (rev 3349) @@ -196,8 +196,7 @@ } public Version getVersion() { - Version result = applicationConfig.getOptionAsVersion( - PollenConfigurationOption.VERSION.key); + Version result = applicationConfig.getOptionAsVersion("pollen.version"); return result; } Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-05-02 11:15:08 UTC (rev 3348) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-05-02 11:16:10 UTC (rev 3349) @@ -26,8 +26,8 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; import org.chorem.pollen.common.VoteCountingType; +import org.hibernate.dialect.H2Dialect; import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.Version; import java.io.File; import java.net.URL; @@ -75,12 +75,25 @@ DEFAULT_POLL_TYPE("pollen.default.pollType", n_("pollen.configuration.defaultPollType"), PollType.FREE.name(), PollType.class), /** Default vote counting type to use at a new poll creation. */ DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", n_("pollen.configuration.defaultVoteCountingType"), VoteCountingType.NORMAL.name(), VoteCountingType.class), + /** Default choice type to use at a new poll creation. */ DEFAULT_CHOICE_TYPE("pollen.default.choiceType", n_("pollen.configuration.defaultChoiceType"), ChoiceType.TEXT.name(), ChoiceType.class), - /** Pollen version. */ - VERSION("pollen.version", n_("Version de l'application"), "", Version.class); + /** db driver. */ + DB_DRIVER("hibernate.connection.driver_class", n_("pollen.configuration.dbDriver"), org.h2.Driver.class.getName(), Class.class), + /** db dialect. */ + DB_DIALECT("hibernate.dialect", n_("pollen.configuration.dbDialect"), H2Dialect.class.getName(), Class.class), + + /** db url. */ + DB_URL("hibernate.connection.url", n_("pollen.configuration.dbUrl"), "jdbc:h2:file:${pollen.dataDirectory}/db/pollendb", String.class), + + /** login to db. */ + DB_LOGIN("hibernate.connection.username", n_("pollen.configuration.dbLogin"), "sa", String.class), + + /** passowrd to db. */ + DB_PASSWORD("hibernate.connection.password", n_("pollen.configuration.dbPassword"), "", String.class); + /** Configuration key. */ protected final String key; Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-05-02 11:15:08 UTC (rev 3348) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-05-02 11:16:10 UTC (rev 3349) @@ -1,11 +1,16 @@ -Version\ de\ l'application= pollen.application.config=Pollen configuration pollen.configuration.adminEmail=email for default admin -pollen.configuration.charset=Charset of Pollen +pollen.configuration.applicationVersion=Application version +pollen.configuration.charset=Charset used by Pollen pollen.configuration.contactEmail=email for contact link pollen.configuration.dataDirectory=Directory where to put pollen data pollen.configuration.db.login=login for default admin pollen.configuration.db.password=password for default admin +pollen.configuration.dbDialect=Database dialect +pollen.configuration.dbDriver=Database Jdbc pilot +pollen.configuration.dbLogin=Login to connect to database +pollen.configuration.dbPassword=Password to connect to database +pollen.configuration.dbUrl=Database connection url pollen.configuration.defaultChoiceType=Default choice type to use at a new poll creation pollen.configuration.defaultPollType=Default poll type to use at a new poll creation pollen.configuration.defaultVoteCountingType=Default vote counting type to use at a new poll creation @@ -17,16 +22,3 @@ pollen.configuration.imageDirectory=path for uploaded images directory pollen.configuration.nbVoteByPage=nb votes to display per page pollen.configuration.siteUrl=Application url -pollen.exception.favorite_list_name_exist= -pollen.exception.participant_doubloons= -pollen.exception.participant_exist= -pollen.exception.participant_exist_without_email= -pollen.exception.poll_exist= -pollen.exception.poll_not_exist=No such poll exists. Please make sure that you are using the correct link and copy it completely into your browser's address field. -pollen.exception.smtp_not_available= -pollen.exception.user_email_exist= -pollen.exception.user_login_exist= -pollen.exception.user_not_exist= -pollen.exception.user_wrong_password= -pollen.exception.vote_doubloon= -pollen.exception.vote_not_allowed= Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-05-02 11:15:08 UTC (rev 3348) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-05-02 11:16:10 UTC (rev 3349) @@ -1,11 +1,16 @@ -Version\ de\ l'application= pollen.application.config=Configuration de Pollen pollen.configuration.adminEmail=Email de l'utilisateur par défaut (Utilisateur crée lors du premier lancement de pollen) -pollen.configuration.charset=Encodnig de Pollen +pollen.configuration.applicationVersion=Version de l'application +pollen.configuration.charset=Encoding utilisé par Pollen pollen.configuration.contactEmail=Email pour le lien Contact pollen.configuration.dataDirectory=Répertoire des données de Pollen pollen.configuration.db.login=Login de l'utilisateur par défaut (Utilisateur crée lors du premier lancement de pollen) pollen.configuration.db.password=Mot de passe de l'utilisateur par défaut (Utilisateur crée lors du premier lancement de pollen) +pollen.configuration.dbDialect=Dialect de la base de données +pollen.configuration.dbDriver=Pilote Jdbc de la base de données +pollen.configuration.dbLogin=Login pour se connecter à la base de données +pollen.configuration.dbPassword=Mot de passe pour se connecter à la base de données +pollen.configuration.dbUrl=Url de connexion à la base de données pollen.configuration.defaultChoiceType=Choix par défaut utilisation lors de la création d'un sondage pollen.configuration.defaultPollType=Type de sondage lors de la création d'un sondage pollen.configuration.defaultVoteCountingType=Type de dépouillement lors de la création d'un sondage @@ -17,16 +22,3 @@ pollen.configuration.imageDirectory=répertoire où sont enregistrés les images pollen.configuration.nbVoteByPage=Nombre de votes à afficher par page pollen.configuration.siteUrl=Url publique de l'aplication (utilisée dans les emails envoyés) -pollen.exception.favorite_list_name_exist=La liste %1$s existe déjà pour l'utilisateur %2$s -pollen.exception.participant_doubloons=Les doublons de la liste %1$s ont été ignorés \: %2$s -pollen.exception.participant_exist=La liste %1$s contient déjà un votant nommé %2$s avec un email %3$s -pollen.exception.participant_exist_without_email=La liste %1$s contient déjà un votant nommé %2$s avec aucun email -pollen.exception.poll_exist= -pollen.exception.poll_not_exist=Il n'y a pas de sondage à cette adresse. Veuillez verifier que vous utilisez le lien correcte et copiez-le complêtement dans le champ d'adresse de votre navigateur. -pollen.exception.smtp_not_available=Impossible d'envoyer un email à %1$s. Serveur smtp indisponible pour l'envoi d'email, veuillez contacter un administrateur. -pollen.exception.user_email_exist=Un utilisateur est déjà enregistré avec cet email. -pollen.exception.user_login_exist=Un utilisateur est déjà enregistré avec cet identifiant. -pollen.exception.user_not_exist=L'identifiant '%1$s' ne correspond à aucun utilisateur connu. -pollen.exception.user_wrong_password=Le mot de passe renseigné est incorrect pour l'utilisateur '%1$s'. -pollen.exception.vote_doubloon= -pollen.exception.vote_not_allowed= Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-02 11:15:08 UTC (rev 3348) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-02 11:16:10 UTC (rev 3349) @@ -178,7 +178,6 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <scope>runtime</scope> </dependency> </dependencies> Modified: trunk/pollen-ui-struts2/src/main/resources/pollen.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/pollen.properties 2012-05-02 11:15:08 UTC (rev 3348) +++ trunk/pollen-ui-struts2/src/main/resources/pollen.properties 2012-05-02 11:16:10 UTC (rev 3349) @@ -21,15 +21,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -#hibernate.show_sql=false -#hibernate.hbm2ddl.auto=update -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.connection.url=jdbc:h2:file:${pollen.dataDirectory}/db/pollendb -# Migration configuration +# Database migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback topia.service.migration.showSql=false

1 0

r3348 - in trunk: pollen-persistence/src/test/java/org/chorem/pollen/business/persistence pollen-services/src/test/java/org/chorem/pollen/services
by tchemit＠users.chorem.org May 2, 2012

May 2, 2012

Author: tchemit Date: 2012-05-02 13:15:08 +0200 (Wed, 02 May 2012) New Revision: 3348 Url: http://chorem.org/repositories/revision/pollen/3348 Log: fix tests configuration Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-05-02 10:22:54 UTC (rev 3347) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-05-02 11:15:08 UTC (rev 3348) @@ -102,7 +102,7 @@ ); Properties props = new Properties(); - props.put("testDirectory", testBasedir); + props.put("testDirectory", testBasedir.getAbsolutePath()); configuration = new PollenConfiguration(CONFIGURATION_PATH, props); } Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-05-02 10:22:54 UTC (rev 3347) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-05-02 11:15:08 UTC (rev 3348) @@ -170,7 +170,7 @@ public PollenConfiguration getConfiguration() { Properties props = new Properties(); - props.put("testDirectory", testDir); + props.put("testDirectory", testDir.getAbsolutePath()); PollenConfiguration configuration = new PollenConfiguration(CONFIGURATION_PATH, props); return configuration;

1 0