Author: alain_defrance Date: 2010-11-16 04:19:20 -0500 (Tue, 16 Nov 2010) New Revision: 5101 Modified: portal/branches/wci/packaging/tomcat/pkg/pom.xml portal/branches/wci/packaging/tomcat/pkg/tc6/pom.xml portal/branches/wci/packaging/tomcat/pkg/tc7/pom.xml Log: Some details about tomcat packaging Modified: portal/branches/wci/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/pom.xml 2010-11-16 07:22:57 UTC (rev 5100) +++ portal/branches/wci/packaging/tomcat/pkg/pom.xml 2010-11-16 09:19:20 UTC (rev 5101) @@ -863,12 +863,6 @@ <property>exo.projects.app.tomcat.version</property> <message>"You must define the property exo.projects.app.tomcat.version to give the name of the directory where is stored tomcat"</message> </requireProperty> - <!--<requireFilesExist> - <files> - <file>${tomcat.dir}/</file> - </files> - <message>"The following Tomcat directory doesn't exist : ${tomcat.dir}"</message> - </requireFilesExist>--> </rules> <fail>true</fail> </configuration> @@ -880,6 +874,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> + <inherited>false</inherited> <executions> <execution> <id>prepare-package</id> @@ -926,33 +921,6 @@ <profiles> <profile> - <id>bundle</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <id>package</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <zip destfile="${project.build.directory}/tomcat.zip" basedir="${project.build.directory}/tomcat"/> - <attachartifact file="${project.build.directory}/tomcat.zip" classifier="bundle" type="zip"/> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>pkg-tomcat</id> <modules> <module>tc6</module> Modified: portal/branches/wci/packaging/tomcat/pkg/tc6/pom.xml =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/tc6/pom.xml 2010-11-16 07:22:57 UTC (rev 5100) +++ portal/branches/wci/packaging/tomcat/pkg/tc6/pom.xml 2010-11-16 09:19:20 UTC (rev 5101) @@ -7,7 +7,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> + <artifactId>exo.portal.packaging.tomcat.pkg</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.tomcat.pkg.tc6</artifactId> @@ -27,8 +27,34 @@ <build> <plugins> + + <!-- Ensure your environment is correctly setup --> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>tomcat-check-environment-ready</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireFilesExist> + <files> + <file>${tomcat.dir}/</file> + </files> + <message>"The following Tomcat directory doesn't exist : ${tomcat.dir}"</message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> <executions> @@ -59,7 +85,7 @@ <!-- Tomcat 6 specific configuration --> <copy file="${project.basedir}/src/main/resources/conf/integration/web.xml" - tofile="${project.build.directory}/tomcat6/webapps/integration/WEB-INF/web.xml"/> + todir="${project.build.directory}/tomcat6/webapps/integration/WEB-INF"/> <!-- File permissions --> <chmod perm="0644" type="file" dir="${project.build.directory}/tomcat6" excludes="**/*.sh"/> @@ -72,5 +98,35 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>bundle</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>package</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <zip destfile="${project.build.directory}/tomcat6.zip" basedir="${project.build.directory}/tomcat6"/> + <attachartifact file="${project.build.directory}/tomcat6.zip" classifier="bundle" type="zip"/> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Modified: portal/branches/wci/packaging/tomcat/pkg/tc7/pom.xml =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/tc7/pom.xml 2010-11-16 07:22:57 UTC (rev 5100) +++ portal/branches/wci/packaging/tomcat/pkg/tc7/pom.xml 2010-11-16 09:19:20 UTC (rev 5101) @@ -7,7 +7,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> + <artifactId>exo.portal.packaging.tomcat.pkg</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.tomcat.pkg.tc7</artifactId> @@ -27,8 +27,34 @@ <build> <plugins> + + <!-- Ensure your environment is correctly setup --> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>tomcat-check-environment-ready</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireFilesExist> + <files> + <file>${tomcat.dir}/</file> + </files> + <message>"The following Tomcat directory doesn't exist : ${tomcat.dir}"</message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> <executions> @@ -73,4 +99,34 @@ </plugins> </build> + <profiles> + <profile> + <id>bundle</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>package</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <zip destfile="${project.build.directory}/tomcat7.zip" basedir="${project.build.directory}/tomcat7"/> + <attachartifact file="${project.build.directory}/tomcat7.zip" classifier="bundle" type="zip"/> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> \ No newline at end of file