Author: julien_viet Date: 2010-10-23 17:55:37 -0400 (Sat, 23 Oct 2010) New Revision: 4806 Added: portal/trunk/packaging/tomcat/integration/pom.xml Modified: portal/trunk/packaging/tomcat/pkg/pom.xml portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml portal/trunk/packaging/tomcat/pom.xml portal/trunk/pom.xml Log: GTNPORTAL-1591 : first pass for tomcat packaging based on maven Added: portal/trunk/packaging/tomcat/integration/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/integration/pom.xml (rev 0) +++ portal/trunk/packaging/tomcat/integration/pom.xml 2010-10-23 21:55:37 UTC (rev 4806) @@ -0,0 +1,33 @@ +<!-- + + Copyright (C) 2009 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. + +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>exo.portal.packaging.tomcat.integration</artifactId> + <packaging>war</packaging> + <name>Tomcat integration war</name> +</project> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-23 21:09:39 UTC (rev 4805) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2010-10-23 21:55:37 UTC (rev 4806) @@ -12,6 +12,10 @@ <packaging>pom</packaging> <name>GateIn for Tomcat packaging</name> + <properties> + <tomcat.dir>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}</tomcat.dir> + </properties> + <!-- Dependencies I am not certain they should be included, needs to be checked @@ -35,7 +39,7 @@ <dependencies> - <!-- SLF4J --> + <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -44,6 +48,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> </dependency> + <dependency> + <groupId>log4J</groupId> + <artifactId>log4j</artifactId> + </dependency> <!-- Apache commons --> <dependency> @@ -294,6 +302,10 @@ </dependency> <dependency> <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-spi</artifactId> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-cache</artifactId> </dependency> <dependency> @@ -480,6 +492,10 @@ </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> <artifactId>gatein.portal.component.wsrp</artifactId> </dependency> @@ -760,7 +776,7 @@ <version>1.0.1</version> </dependency> <dependency> - <groupId>apache-xerces</groupId> + <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> <dependency> @@ -783,6 +799,56 @@ <artifactId>core</artifactId> </dependency> + <!-- War files --> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <type>war</type> + </dependency> + + <!-- Integration war --> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.tomcat.integration</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + </dependencies> <build> @@ -795,6 +861,8 @@ <descriptors> <descriptor>src/assembly/tomcat-init.xml</descriptor> </descriptors> + <finalName>tomcat</finalName> + <appendAssemblyId>false</appendAssemblyId> </configuration> <version>2.2-beta-5</version> <executions> Modified: portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml 2010-10-23 21:09:39 UTC (rev 4805) +++ portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml 2010-10-23 21:55:37 UTC (rev 4806) @@ -10,78 +10,163 @@ <dependencySets> <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> <outputDirectory>tomcat/lib</outputDirectory> <includes> - <include>org.slf4j:*</include> - <include>commons-*:*</include> - <include>org.jboss*:*</include> - <include>jboss.*:*</include> - <include>javassist:*</include> - <include>jgroups:*</include> - <include>org.exoplatform.kernel:*</include> - <include>org.exoplatform.core:*</include> - <include>org.exoplatform.jcr:*</include> - <include>org.exoplatform.ws:*</include> - <include>org.picketlink.idm:*</include> - <include>org.reflext:*</include> - <include>org.chromattic:*</include> - <include>org.gatein.common:*</include> - <include>org.gatein.wci:*</include> - <include>org.gatein.pc:*</include> - <include>org.gatein.mop:*</include> - <include>org.gatein.shindig:*</include> - <include>org.gatein.captcha:*</include> - <include>org.exoplatform.portal:*</include> - <include>javax.*:*</include> - <include>org.hibernate:*</include> - <include>com.google.code.guice:*</include> - <include>antlr:*</include> - <include>aopalliance:*</include> - <include>asm:*</include> - <include>bouncycastle:*</include> - <include>caja:*</include> - <include>cglib:*</include> - <include>oswego-concurrent:*</include> - <include>dom4j:*</include> - <include>net.sf.ehcache:*</include> - <include>com.jhlabs:*</include> - <include>com.googlecode.collections:*</include> - <include>org.groovy.codehaus:*</include> - <include>hsqldb:*</include> - <include>html-parser:*</include> - <include>com.ibm.icu:*</include> - <include>com.lowagie:*</include> - <include>net.jcip:*</include> - <include>jdom:*</include> - <include>org.jibx:*</include> - <include>joda-time:*</include> - <include>rhino:*</include> - <include>org.jsecurity:*</include> - <include>org.json:*</include> - <include>de.odysseus.juel:*</include> - <include>org.apache.lucene:*</include> - <include>net.sourceforge.nekohtml:*</include> - <include>org.apache.pdfbox:*</include> - <include>picocontainer:*</include> - <include>org.apache.poi:*</include> - <include>org.apache.portals.bridges:*</include> - <include>quartz:*</include> - <include>rome:*</include> - <include>org.apache.sanselan:*</include> - <include>org.apache.ws.commons:*</include> - <include>apache-xerces:*</include> - <include>org.apache.xmlbeans:*</include> - <include>xpp3:*</include> - <include>com.thoughtworks.xstream:*</include> - <include>net.oauth:*</include> + <include>org.slf4j:*:jar</include> + <include>commons-*:*:jar</include> + <include>org.jboss*:*:jar</include> + <include>jboss.*:*:jar</include> + <include>javassist:*:jar</include> + <include>jgroups:*:jar</include> + <include>org.exoplatform.kernel:*:jar</include> + <include>org.exoplatform.core:*:jar</include> + <include>org.exoplatform.jcr:*:jar</include> + <include>org.exoplatform.ws:*:jar</include> + <include>org.picketlink.idm:*:jar</include> + <include>org.reflext:*:jar</include> + <include>org.chromattic:*:jar</include> + <include>org.gatein.common:*:jar</include> + <include>org.gatein.wci:*:jar</include> + <include>org.gatein.pc:*:jar</include> + <include>org.gatein.mop:*:jar</include> + <include>org.gatein.shindig:*:jar</include> + <include>org.gatein.captcha:*:jar</include> + <include>org.exoplatform.portal:*:jar</include> + <include>javax.*:*:jar</include> + <include>org.hibernate:*:jar</include> + <include>com.google.code.guice:*:jar</include> + <include>antlr:*:jar</include> + <include>aopalliance:*:jar</include> + <include>asm:*:jar</include> + <include>bouncycastle:*:jar</include> + <include>caja:*:jar</include> + <include>cglib:*:jar</include> + <include>oswego-concurrent:*:jar</include> + <include>dom4j:*:jar</include> + <include>net.sf.ehcache:*:jar</include> + <include>com.jhlabs:*:jar</include> + <include>com.google.collections:*:jar</include> + <include>org.codehaus.groovy:*:jar</include> + <include>hsqldb:*:jar</include> + <include>html-parser:*:jar</include> + <include>com.ibm.icu:*:jar</include> + <include>com.lowagie:*:jar</include> + <include>net.jcip:*:jar</include> + <include>jdom:*:jar</include> + <include>org.jibx:*:jar</include> + <include>joda-time:*:jar</include> + <include>rhino:*:jar</include> + <include>org.jsecurity:*:jar</include> + <include>org.json:*:jar</include> + <include>de.odysseus.juel:*:jar</include> + <include>org.apache.lucene:*:jar</include> + <include>net.sourceforge.nekohtml:*:jar</include> + <include>org.apache.pdfbox:*:jar</include> + <include>picocontainer:*:jar</include> + <include>org.apache.poi:*:jar</include> + <include>org.apache.portals.bridges:*:jar</include> + <include>quartz:*:jar</include> + <include>rome:*:jar</include> + <include>org.apache.sanselan:*:jar</include> + <include>org.apache.ws.commons:*:jar</include> + <include>xerces:*:jar</include> + <include>org.apache.xmlbeans:*:jar</include> + <include>xpp3:*:jar</include> + <include>com.thoughtworks.xstream:*:jar</include> + <include>net.oauth:*:jar</include> + <include>log4j:*:jar</include> </includes> </dependencySet> + + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>portal.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.web.portal:war</include> + </includes> + </dependencySet> + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>eXoGadgetServer.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.gadgets-server:war</include> + </includes> + </dependencySet> + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>eXoGadgets.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.eXoGadgets:war</include> + </includes> + </dependencySet> + + <!-- War files --> + <!-- + missing : 153019 Oct 23 16:48 gatein-sample-skin.war + --> + + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>web.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.portlet.web:war</include> + </includes> + </dependencySet> + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>rest.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.web.rest:war</include> + </includes> + </dependencySet> + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>exoadmin.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.portlet.exoadmin:war</include> + </includes> + </dependencySet> + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>eXoResources.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.web.eXoResources:war</include> + </includes> + </dependencySet> + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>dashboard.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.portlet.dashboard:war</include> + </includes> + </dependencySet> + <dependencySet> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>tomcat/webapps</outputDirectory> + <outputFileNameMapping>integration.war</outputFileNameMapping> + <includes> + <include>org.exoplatform.portal:exo.portal.packaging.tomcat.integration:war</include> + </includes> + </dependencySet> </dependencySets> <fileSets> - <!-- copy tomcat - without unix executables --> <fileSet> + + </fileSet> + + <!-- Copy tomcat: without unix executables --> + <fileSet> <directory>${tomcat.dir}</directory> <outputDirectory>tomcat</outputDirectory> <excludes> @@ -92,7 +177,7 @@ <fileMode>0644</fileMode> </fileSet> - <!-- copy tomcat - only unix executabls --> + <!-- Copy tomcat: only unix executabls --> <fileSet> <directory>${tomcat.dir}/bin</directory> <outputDirectory>tomcat/bin</outputDirectory> @@ -106,7 +191,7 @@ <fileMode>0755</fileMode> </fileSet> - <!-- configurations, etc.--> + <!-- Configurations, etc.--> <fileSet> <directory>${basedir}/src/main/resources/tomcat</directory> <outputDirectory>tomcat</outputDirectory> @@ -116,7 +201,7 @@ <fileMode>0644</fileMode> </fileSet> - <!-- startup scripts --> + <!-- Startup scripts --> <fileSet> <directory>${basedir}/src/main/resources/tomcat/bin</directory> <outputDirectory>tomcat/bin</outputDirectory> @@ -128,7 +213,7 @@ </fileSets> <files> - <!-- copy gatein configuration file --> + <!-- Copy gatein configuration file --> <file> <source>${basedir}/../../../component/common/src/main/java/conf/configuration-tomcat.properties</source> <outputDirectory>tomcat/gatein/conf</outputDirectory> Modified: portal/trunk/packaging/tomcat/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pom.xml 2010-10-23 21:09:39 UTC (rev 4805) +++ portal/trunk/packaging/tomcat/pom.xml 2010-10-23 21:55:37 UTC (rev 4806) @@ -12,6 +12,7 @@ <name>GateIn Tomcat package</name> <modules> + <module>integration</module> <module>pkg</module> </modules> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-10-23 21:09:39 UTC (rev 4805) +++ portal/trunk/pom.xml 2010-10-23 21:55:37 UTC (rev 4806) @@ -783,6 +783,54 @@ <artifactId>exo.portal.server.tomcat.plugin</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> <!-- Reflext --> <dependency> @@ -885,6 +933,11 @@ <artifactId>picketlink-idm-cache</artifactId> <version>${org.picketlink.idm}</version> </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-spi</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> <dependency> <groupId>javax.portlet</groupId> @@ -1076,6 +1129,11 @@ <artifactId>htmlparser</artifactId> <version>1.0.7</version> </dependency> + <dependency> + <groupId>log4J</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> <dependency> <groupId>org.gatein.shindig</groupId>