Author: aheritier Date: 2010-10-25 18:48:48 -0400 (Mon, 25 Oct 2010) New Revision: 4826 Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/WEB-INF/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/WEB-INF/web.xml portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/index.jsp Modified: portal/trunk/packaging/tomcat/pkg/ portal/trunk/packaging/tomcat/pkg/pom.xml Log: GTNPORTAL-1591 : Add profile named bundle to generate the zip and attach it to the build + remove default tomcat webapps + Add ROOT webapp to automatically redirect to /portal Property changes on: portal/trunk/packaging/tomcat/pkg ___________________________________________________________________ Name: svn:ignore + .settings .project .classpath .idea *.iml *.ipr *.iws temp bin target Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 21:33:52 UTC (rev 4825) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-25 22:48:48 UTC (rev 4826) @@ -898,8 +898,8 @@ <version>1.6</version> <executions> <execution> - <id>package</id> - <phase>package</phase> + <id>prepare-package</id> + <phase>prepare-package</phase> <goals> <goal>run</goal> </goals> @@ -908,18 +908,18 @@ <!-- Copy tomcat --> <copy todir="target/tomcat"> - <fileset dir="${tomcat.dir}"/> + <fileset dir="${tomcat.dir}" excludes="webapps/**"/> </copy> <!-- Copy the dependencies --> <dependencyfilesets/> <xslt basedir="${project.basedir}" - destdir="${project.basedir}/target" + destdir="${project.build.directory}" includes="pom.xml" extension=".xml" style="${project.basedir}/transform.xsl"/> - <ant antfile="${project.basedir}/target/pom.xml" inheritRefs="true"> + <ant antfile="${project.build.directory}/pom.xml" inheritRefs="true"> <target name="foo" /> </ant> @@ -929,13 +929,13 @@ </copy> <!-- Copy configuration --> - <copy tofile="target/tomcat/gatein/conf/configuration.properties"> + <copy tofile="${project.build.directory}/tomcat/gatein/conf/configuration.properties"> <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-tomcat.properties"/> </copy> <!-- File permissions --> - <chmod perm="0644" type="file" dir="target/tomcat" excludes="**/*.sh"/> - <chmod perm="0755" type="file" dir="target/tomcat" includes="**/*.sh"/> + <chmod perm="0644" type="file" dir="${project.build.directory}/tomcat" excludes="**/*.sh"/> + <chmod perm="0755" type="file" dir="${project.build.directory}/tomcat" includes="**/*.sh"/> </target> </configuration> @@ -945,4 +945,33 @@ </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}/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> + </profiles> </project> \ No newline at end of file Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/WEB-INF/web.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/WEB-INF/web.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/WEB-INF/web.xml 2010-10-25 22:48:48 UTC (rev 4826) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + +<!-- + + Copyright (C) 2010 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <display-name>Welcome to eXo platform</display-name> + <description>Welcome to eXo platform</description> +</web-app> \ No newline at end of file Property changes on: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/index.jsp =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/index.jsp (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/index.jsp 2010-10-25 22:48:48 UTC (rev 4826) @@ -0,0 +1,4 @@ +<% +response.setStatus(response.SC_MOVED_TEMPORARILY); +response.setHeader("Location", "/portal"); +%> \ No newline at end of file Property changes on: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/webapps/ROOT/index.jsp ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native