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> + + <!-- Compile jsp for embedded war --> + <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> + + <!-- Build embedded war --> + + <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> + + <!-- Build embedded zip --> + <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>