Author: mpodolin Date: 2010-07-28 12:19:05 -0400 (Wed, 28 Jul 2010) New Revision: 3712 Added: portal/trunk/packaging/tomcat/ portal/trunk/packaging/tomcat/integration/ portal/trunk/packaging/tomcat/integration/src/ portal/trunk/packaging/tomcat/integration/src/main/ portal/trunk/packaging/tomcat/integration/src/main/webapp/ portal/trunk/packaging/tomcat/integration/src/main/webapp/META-INF/ portal/trunk/packaging/tomcat/integration/src/main/webapp/META-INF/context.xml portal/trunk/packaging/tomcat/integration/src/main/webapp/WEB-INF/ portal/trunk/packaging/tomcat/integration/src/main/webapp/WEB-INF/web.xml portal/trunk/packaging/tomcat/pkg/ portal/trunk/packaging/tomcat/pkg/src/ portal/trunk/packaging/tomcat/pkg/src/assembly/ portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml portal/trunk/packaging/tomcat/pkg/src/main/ portal/trunk/packaging/tomcat/pkg/src/main/resources/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/catalina.properties.patch portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/logging.properties.patch portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/commons-logging.properties portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/exokey.pem portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.bat portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.sh portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.bat portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.sh portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/oauthkey.pem portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/eXoGadgetServer.xml portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/eXoResources.xml portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/portal.xml portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/rest.xml portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/producer.server.xml portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/configuration.xml Removed: portal/trunk/packaging/jboss-as/pkg/profiles.xml Modified: portal/trunk/pom.xml Log: GTNMAVEN-15: initial version of tomcat packaging Deleted: portal/trunk/packaging/jboss-as/pkg/profiles.xml =================================================================== --- portal/trunk/packaging/jboss-as/pkg/profiles.xml 2010-07-27 14:43:57 UTC (rev 3711) +++ portal/trunk/packaging/jboss-as/pkg/profiles.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -1,24 +0,0 @@ -<profilesXml> - <profiles> - <profile> - <id>gatein-projects</id> - <properties> - <!-- - Replace with the directory where uncompressed Tomcat 6 and/or JBoss 5.1 can be found - ex: On Windows 'c:/AS' - ex: On Linux '/home/user/AS' - --> - <exo.projects.directory.dependencies>/home/martin/dev/exo-dependencies</exo.projects.directory.dependencies> - - <!-- - Replace with the name of the directory containing JBoss AS 5.1 - --> - <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version> - </properties> - </profile> - </profiles> - - <activeProfiles> - <activeProfile>gatein-projects</activeProfile> - </activeProfiles> -</profilesXml> Added: portal/trunk/packaging/tomcat/integration/src/main/webapp/META-INF/context.xml =================================================================== --- portal/trunk/packaging/tomcat/integration/src/main/webapp/META-INF/context.xml (rev 0) +++ portal/trunk/packaging/tomcat/integration/src/main/webapp/META-INF/context.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,23 @@ +<!-- + + 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. + +--> + +<Context privileged="true"> <!-- crossContext="true" --> +</Context> \ No newline at end of file Added: portal/trunk/packaging/tomcat/integration/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/packaging/tomcat/integration/src/main/webapp/WEB-INF/web.xml (rev 0) +++ portal/trunk/packaging/tomcat/integration/src/main/webapp/WEB-INF/web.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<!-- + + 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. + +--> + +<!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> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> +</web-app> Added: portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,66 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>tomcat</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + </formats> + + <fileSets> + <!-- copy tomcat - without unix executables --> + <fileSet> + <directory>${tomcat.dir}</directory> + <outputDirectory>tomcat</outputDirectory> + <excludes> + <exclude>bin/*.sh</exclude> + <exclude>bin/startup.*</exclude> + <exclude>bin/shutdown.*</exclude> + </excludes> + <fileMode>0644</fileMode> + </fileSet> + <!-- copy tomcat - only unix executabls --> + <fileSet> + <directory>${tomcat.dir}/bin</directory> + <outputDirectory>tomcat/bin</outputDirectory> + <includes> + <include>*.sh</include> + </includes> + <excludes> + <exclude>startup.*</exclude> + <exclude>shutdown.*</exclude> + </excludes> + + <fileMode>0755</fileMode> + </fileSet> + + <!-- configurations, etc.--> + <fileSet> + <directory>${basedir}/src/main/resources/tomcat</directory> + <outputDirectory>tomcat</outputDirectory> + <excludes> + <exclude>bin/*.sh</exclude> + </excludes> + <fileMode>0644</fileMode> + </fileSet> + <!-- startup scripts --> + <fileSet> + <directory>${basedir}/src/main/resources/tomcat/bin</directory> + <outputDirectory>tomcat/bin</outputDirectory> + <includes> + <include>*.sh</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + </fileSets> + + <files> + <!-- copy gatein configuration file --> + <file> + <source>${basedir}/../../../component/common/src/main/java/conf/configuration-tomcat.properties</source> + <outputDirectory>tomcat/gatein/conf</outputDirectory> + <destName>configuration.properties</destName> + </file> + </files> +</assembly> Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/commons-logging.properties =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/commons-logging.properties (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/commons-logging.properties 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,3 @@ +# Configure commons logging to use JDK logger +org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl +org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/exokey.pem =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/exokey.pem (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/exokey.pem 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,29 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu ++v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E +4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB +AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb +Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb +X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m +wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8 +bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC +O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk +cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX +IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO +eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1 +b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk= +-----END RSA PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV +BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx +EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA +zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu +HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg +ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O +BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT +4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM +BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e +TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7 +wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3 +WNlNt2SavfSi3d60wd5o +-----END CERTIFICATE----- Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.bat =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.bat (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.bat 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,39 @@ +@REM +@REM Copyright (C) 2009 eXo Platform SAS. +@REM +@REM This is free software; you can redistribute it and/or modify it +@REM under the terms of the GNU Lesser General Public License as +@REM published by the Free Software Foundation; either version 2.1 of +@REM the License, or (at your option) any later version. +@REM +@REM This software is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this software; if not, write to the Free +@REM Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +@REM 02110-1301 USA, or see the FSF site: http://www.fsf.org. +@REM + +@echo off + +rem Computes the absolute path of eXo +setlocal ENABLEDELAYEDEXPANSION +for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi +cd %BIN_DIR% + +rem Sets some variables +set LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog +set SECURITY_OPTS=-Djava.security.auth.login.config=..\conf\jaas.conf +set EXO_OPTS=-Dexo.product.developing=true -Dexo.conf.dir.name=gatein\conf +set EXO_CONFIG_OPTS=-Dorg.exoplatform.container.configuration.debug +set REMOTE_DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n + +set JAVA_OPTS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS% %REMOTE_DEBUG% +set JPDA_TRANSPORT=dt_socket +set JPDA_ADDRESS=8000 + +rem Launches the server +call catalina.bat %* Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.sh =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.sh (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein-dev.sh 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,47 @@ +#!/bin/sh +# +# 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. +# + +# Computes the absolute path of eXo +cd `dirname "$0"` + +# Sets some variables +LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" +SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" +EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir.name=gatein/conf" +EXO_CONFIG_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.exoplatform.container.configuration.debug" + +JPDA_TRANSPORT=dt_socket +JPDA_ADDRESS=8000 + +REMOTE_DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n" + +JMX_AGENT="-Dcom.sun.management.jmxremote" + +#For profiling +#LD_LIBRARY_PATH="/cygdrive/d/tools/YourKit/bin/win32/" +#PATH="$PATH:$LD_LIBRARY_PATH" +#export LD_LIBRARY_PATH +#YOURKIT_PROFILE_OPTION="-agentlib:yjpagent -Djava.awt.headless=true" + +JAVA_OPTS="$YOURKIT_PROFILE_OPTION $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS $EXO_CONFIG_OPTS $REMOTE_DEBUG" +export JAVA_OPTS + +# Launches the server +exec "$PRGDIR"./catalina.sh "$@" Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.bat =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.bat (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.bat 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,34 @@ +@REM +@REM Copyright (C) 2009 eXo Platform SAS. +@REM +@REM This is free software; you can redistribute it and/or modify it +@REM under the terms of the GNU Lesser General Public License as +@REM published by the Free Software Foundation; either version 2.1 of +@REM the License, or (at your option) any later version. +@REM +@REM This software is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this software; if not, write to the Free +@REM Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +@REM 02110-1301 USA, or see the FSF site: http://www.fsf.org. +@REM + +@echo off + +rem Computes the absolute path of eXo +setlocal ENABLEDELAYEDEXPANSION +for %%i in ( !%~f0! ) do set BIN_DIR=%%~dpi +cd %BIN_DIR% + +rem Sets some variables +set LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog +set SECURITY_OPTS=-Djava.security.auth.login.config=..\conf\jaas.conf +set EXO_OPTS=-Dexo.product.developing=false -Dexo.conf.dir.name=gatein\conf +set JAVA_OPTS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% + +rem Launches the server +call catalina.bat %* Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.sh =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.sh (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/gatein.sh 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,36 @@ +#!/bin/sh +# +# 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. +# + +#Production Script to launch GateIn +#See gatein-dev.sh for development starup + +# Computes the absolute path of eXo +cd `dirname "$0"` + +# Sets some variables +LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" +SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" +EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein/conf" + +JAVA_OPTS="-Xms128m -Xmx384m -XX:MaxPermSize=192m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS" +export JAVA_OPTS + +# Launches the server +exec "$PRGDIR"./catalina.sh "$@" Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/oauthkey.pem =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/oauthkey.pem (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/oauthkey.pem 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,16 @@ +-----BEGIN PRIVATE KEY----- +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H +GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx +LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK +Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb +fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g +ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25 +bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT +XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV +hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o +s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8 +4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy +6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia +AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE +CPS2uizmGzwXCQ== +-----END PRIVATE KEY----- Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/eXoGadgetServer.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/eXoGadgetServer.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/eXoGadgetServer.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,22 @@ +<!-- + + 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. + +--> + +<Context path="/eXoGadgetServer" docBase="eXoGadgetServer" debug="0" reloadable="true" crossContext="true"/> Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/eXoResources.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/eXoResources.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/eXoResources.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,22 @@ +<!-- + + 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. + +--> + +<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/> Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/portal.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/portal.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/portal.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,31 @@ +<!-- + + 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. + +--> + +<Context path='/portal' docBase='portal' debug='0' reloadable='true' crossContext='true' privileged='true'> + <Logger className='org.apache.catalina.logger.SystemOutLogger' + prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/> + <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/> + <Realm className='org.apache.catalina.realm.JAASRealm' + appName='gatein-domain' + userClassNames='org.exoplatform.services.security.jaas.UserPrincipal' + roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal' + debug='0' cache='false'/> + <Valve className='org.apache.catalina.authenticator.FormAuthenticator' characterEncoding='UTF-8'/></Context> Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/rest.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/rest.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/rest.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,32 @@ +<!-- + + 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. + +--> + +<Context path="/rest" docBase="rest" reloadable="true" crossContext="false"> + + <Logger className='org.apache.catalina.logger.SystemOutLogger' + prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/> + <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/> + <Realm className='org.apache.catalina.realm.JAASRealm' + appName='gatein-domain' + userClassNames="org.exoplatform.services.security.jaas.UserPrincipal" + roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal" + debug='0' cache='false'/> +</Context> Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,12 @@ +gatein-domain { + org.exoplatform.web.security.PortalLoginModule required; + org.exoplatform.services.security.jaas.SharedStateLoginModule required; + org.exoplatform.services.security.j2ee.TomcatLoginModule required; + + // Uncomment the following part (and comment the other part for CAS integration + // org.gatein.sso.agent.login.SSOLoginModule required + // org.exoplatform.services.security.j2ee.TomcatLoginModule required + // portalContainerName=portal + // realmName=gatein-domain + +}; Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/producer.server.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/producer.server.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/producer.server.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,387 @@ +<!-- + + 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. + +--> + +<!-- Example Server Configuration File --> +<!-- Note that component elements are nested corresponding to their + parent-child relationships with each other --> + +<!-- A "Server" is a singleton element that represents the entire JVM, + which may contain one or more "Service" instances. The Server + listens for a shutdown command on the indicated port. + + Note: A "Server" is not itself a "Container", so you may not + define subcomponents such as "Valves" or "Loggers" at this level. + --> + +<Server port="8006" shutdown="SHUTDOWN" debug="0"> + + + <!-- Comment these entries out to disable JMX MBeans support --> + <!-- You may also configure custom components (e.g. Valves/Realms) by + including your own mbean-descriptor file(s), and setting the + "descriptors" attribute to point to a ';' seperated list of paths + (in the ClassLoader sense) of files to add to the default list. + e.g. descriptors="/com/myfirm/mypackage/mbean-descriptor.xml" + --> + <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" + debug="0"/> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" + debug="0"/> + + <!-- Global JNDI resources --> + <GlobalNamingResources> + + <!-- Test entry for demonstration purposes --> + <Environment name="simpleValue" type="java.lang.Integer" value="30"/> + + <!-- Editable user database that can also be used by + UserDatabaseRealm to authenticate users --> + <Resource name="UserDatabase" auth="Container" + type="org.apache.catalina.UserDatabase" + description="User database that can be updated and saved"> + </Resource> + <ResourceParams name="UserDatabase"> + <parameter> + <name>factory</name> + <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value> + </parameter> + <parameter> + <name>pathname</name> + <value>conf/tomcat-users.xml</value> + </parameter> + </ResourceParams> + + </GlobalNamingResources> + + <!-- A "Service" is a collection of one or more "Connectors" that share + a single "Container" (and therefore the web applications visible + within that Container). Normally, that Container is an "Engine", + but this is not required. + + Note: A "Service" is not itself a "Container", so you may not + define subcomponents such as "Valves" or "Loggers" at this level. + --> + + <!-- Define the Tomcat Stand-Alone Service --> + <Service name="Catalina"> + + <!-- A "Connector" represents an endpoint by which requests are received + and responses are returned. Each Connector passes requests on to the + associated "Container" (normally an Engine) for processing. + + By default, a non-SSL HTTP/1.1 Connector is established on port 8080. + You can also enable an SSL HTTP/1.1 Connector on port 8443 by + following the instructions below and uncommenting the second Connector + entry. SSL support requires the following steps (see the SSL Config + HOWTO in the Tomcat 5 documentation bundle for more detailed + instructions): + * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or + later, and put the JAR files into "$JAVA_HOME/jre/lib/ext". + * Execute: + %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows) + $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix) + with a password value of "changeit" for both the certificate and + the keystore itself. + + By default, DNS lookups are enabled when a web application calls + request.getRemoteHost(). This can have an adverse impact on + performance, so you can disable it by setting the + "enableLookups" attribute to "false". When DNS lookups are disabled, + request.getRemoteHost() will return the String version of the + IP address of the remote client. + --> + + <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 --> + <Connector port="8081" + maxThreads="150" minSpareThreads="25" maxSpareThreads="75" + enableLookups="false" redirectPort="8444" acceptCount="100" + debug="0" connectionTimeout="20000" + disableUploadTimeout="true" /> + <!-- Note : To disable connection timeouts, set connectionTimeout value + to -1 --> + + <!-- Note : To use gzip compression you could set the following properties : + + compression="on" + compressionMinSize="2048" + noCompressionUserAgents="gozilla, traviata" + compressableMimeType="text/html,text/xml" + --> + + <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --> + <!-- + <Connector port="8444" + maxThreads="150" minSpareThreads="25" maxSpareThreads="75" + enableLookups="false" disableUploadTimeout="true" + acceptCount="100" debug="0" scheme="https" secure="true" + clientAuth="false" sslProtocol="TLS" /> + --> + + <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 --> + <Connector port="8010" + enableLookups="false" redirectPort="8444" debug="0" + protocol="AJP/1.3" /> + + <!-- Define a Proxied HTTP/1.1 Connector on port 8082 --> + <!-- See proxy documentation for more information about using this. --> + <!-- + <Connector port="8083" + maxThreads="150" minSpareThreads="25" maxSpareThreads="75" + enableLookups="false" + acceptCount="100" debug="0" connectionTimeout="20000" + proxyPort="81" disableUploadTimeout="true" /> + --> + + <!-- An Engine represents the entry point (within Catalina) that processes + every request. The Engine implementation for Tomcat stand alone + analyzes the HTTP headers included with the request, and passes them + on to the appropriate Host (virtual host). --> + + <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie : + <Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1"> + --> + + <!-- Define the top level container in our container hierarchy --> + <Engine name="Catalina" defaultHost="localhost" debug="0"> + + <!-- The request dumper valve dumps useful debugging information about + the request headers and cookies that were received, and the response + headers and cookies that were sent, for all requests received by + this instance of Tomcat. If you care only about requests to a + particular virtual host, or a particular application, nest this + element inside the corresponding <Host> or <Context> entry instead. + + For a similar mechanism that is portable to all Servlet 2.4 + containers, check out the "RequestDumperFilter" Filter in the + example application (the source for this filter may be found in + "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters"). + + Request dumping is disabled by default. Uncomment the following + element to enable it. --> + <!-- + <Valve className="org.apache.catalina.valves.RequestDumperValve"/> + --> + + <!-- Global logger unless overridden at lower levels --> + <Logger className="org.apache.catalina.logger.FileLogger" + prefix="catalina_log." suffix=".txt" + timestamp="true"/> + + <!-- Because this Realm is here, an instance will be shared globally --> + + <!-- This Realm uses the UserDatabase configured in the global JNDI + resources under the key "UserDatabase". Any edits + that are performed against this UserDatabase are immediately + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + debug="0" resourceName="UserDatabase"/> + + <!-- Comment out the old realm but leave here for now in case we + need to go back quickly --> + <!-- + <Realm className="org.apache.catalina.realm.MemoryRealm" /> + --> + + <!-- Replace the above Realm with one of the following to get a Realm + stored in a database and accessed via JDBC --> + + <!-- + <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99" + driverName="org.gjt.mm.mysql.Driver" + connectionURL="jdbc:mysql://localhost/authority" + connectionName="test" connectionPassword="test" + userTable="users" userNameCol="user_name" userCredCol="user_pass" + userRoleTable="user_roles" roleNameCol="role_name" /> + --> + + <!-- + <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99" + driverName="oracle.jdbc.driver.OracleDriver" + connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL" + connectionName="scott" connectionPassword="tiger" + userTable="users" userNameCol="user_name" userCredCol="user_pass" + userRoleTable="user_roles" roleNameCol="role_name" /> + --> + + <!-- + <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99" + driverName="sun.jdbc.odbc.JdbcOdbcDriver" + connectionURL="jdbc:odbc:CATALINA" + userTable="users" userNameCol="user_name" userCredCol="user_pass" + userRoleTable="user_roles" roleNameCol="role_name" /> + --> + + <!-- Define the default virtual host + Note: XML Schema validation will not work with Xerces 2.2. + --> + <Host name="localhost" debug="0" appBase="webapps" + unpackWARs="true" autoDeploy="true" + xmlValidation="false" xmlNamespaceAware="false"> + + <!-- Defines a cluster for this node, + By defining this element, means that every manager will be changed. + So when running a cluster, only make sure that you have webapps in there + that need to be clustered and remove the other ones. + A cluster has the following parameters: + + className = the fully qualified name of the cluster class + + name = a descriptive name for your cluster, can be anything + + debug = the debug level, higher means more output + + mcastAddr = the multicast address, has to be the same for all the nodes + + mcastPort = the multicast port, has to be the same for all the nodes + + mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat + + mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received + + tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes + + tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, + in case of multiple ethernet cards. + auto means that address becomes + InetAddress.getLocalHost().getHostAddress() + + tcpListenPort = the tcp listen port + + tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS + has a wakup bug in java.nio. Set to 0 for no timeout + + printToScreen = true means that managers will also print to std.out + + expireSessionsOnShutdown = true means that + + useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called. + false means to replicate the session after each request. + false means that replication would work for the following piece of code: + <% + HashMap map = (HashMap)session.getAttribute("map"); + map.put("key","value"); + %> + replicationMode = can be either 'synchronous' or 'asynchronous'. + * Synchronous means that the thread that executes the request, is also the + thread the replicates the data to the other nodes, and will not return until all + nodes have received the information. + * Asynchronous means that there is a specific 'sender' thread for each cluster node, + so the request thread will queue the replication request into a "smart" queue, + and then return to the client. + The "smart" queue is a queue where when a session is added to the queue, and the same session + already exists in the queue from a previous request, that session will be replaced + in the queue instead of replicating two requests. This almost never happens, unless there is a + large network delay. + --> + + <!-- When uncommenting the cluster, REMEMBER to uncomment the replication Valve below as well + + + <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster" + name="FilipsCluster" + debug="10" + serviceclass="org.apache.catalina.cluster.mcast.McastService" + mcastAddr="228.0.0.4" + mcastPort="45565" + mcastFrequency="500" + mcastDropTime="3000" + tcpThreadCount="2" + tcpListenAddress="auto" + tcpListenPort="4002" + tcpSelectorTimeout="100" + printToScreen="false" + expireSessionsOnShutdown="false" + useDirtyFlag="true" + replicationMode="synchronous" + /> + --> + <!-- + When configuring for clustering, you also add in a valve to catch all the requests + coming in, at the end of the request, the session may or may not be replicated. + A session is replicated if and only if all the conditions are met: + 1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND + 2. a session exists (has been created) + 3. the request is not trapped by the "filter" attribute + + The filter attribute is to filter out requests that could not modify the session, + hence we don't replicate the session after the end of this request. + The filter is negative, ie, anything you put in the filter, you mean to filter out, + ie, no replication will be done on requests that match one of the filters. + The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to. + + filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI + ending with .gif and .js are intercepted. + --> + <!-- + <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve" + filter=".*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;"/> + + --> + <!-- Normally, users must authenticate themselves to each web app + individually. Uncomment the following entry if you would like + a user to be authenticated the first time they encounter a + resource protected by a security constraint, and then have that + user identity maintained across *all* web applications contained + in this virtual host. --> + <!-- + <Valve className="org.apache.catalina.authenticator.SingleSignOn" + debug="0"/> + --> + + <!-- Access log processes all requests for this virtual host. By + default, log files are created in the "logs" directory relative to + $CATALINA_HOME. If you wish, you can specify a different + directory with the "directory" attribute. Specify either a relative + (to $CATALINA_HOME) or absolute path to the desired directory. + --> + <!-- + <Valve className="org.apache.catalina.valves.AccessLogValve" + directory="logs" prefix="localhost_access_log." suffix=".txt" + pattern="common" resolveHosts="false"/> + --> + + <!-- Logger shared by all Contexts related to this virtual host. By + default (when using FileLogger), log files are created in the "logs" + directory relative to $CATALINA_HOME. If you wish, you can specify + a different directory with the "directory" attribute. Specify either a + relative (to $CATALINA_HOME) or absolute path to the desired + directory.--> + <Logger className="org.apache.catalina.logger.FileLogger" + directory="logs" prefix="localhost_log." suffix=".txt" + timestamp="true"/> + + <!-- Define properties for each web application. This is only needed + if you want to set non-default properties, or have web application + document roots in places other than the virtual host's appBase + directory. --> + + <!-- Tomcat Root Context --> + <!-- + <Context path="" docBase="ROOT" debug="0"> + --> + + </Host> + + </Engine> + + </Service> + +</Server> Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/configuration.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/configuration.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/configuration.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,65 @@ +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <!-- The full qualified name of the PortalContainerConfig --> + <type>org.exoplatform.container.definition.PortalContainerConfig</type> + <init-params> + <!-- The name of the default portal container --> + <value-param> + <name>default.portal.container</name> + <value>portal</value> + </value-param> + <!-- The name of the default rest ServletContext --> + <value-param> + <name>default.rest.context</name> + <value>rest</value> + </value-param> + <!-- The name of the default realm --> + <value-param> + <name>default.realm.name</name> + <value>gatein-domain</value> + </value-param> + <!-- The default portal container definition --> + <!-- It cans be used to avoid duplicating configuration --> + <object-param> + <name>default.portal.definition</name> + <object type="org.exoplatform.container.definition.PortalContainerDefinition"> + <!-- The path to the external properties file --> + <field name="externalSettingsPath"> + <string>configuration.properties</string> + </field> + <field name="dependencies"> + <collection type="java.util.ArrayList"> + <value> + <string>eXoResources</string> + </value> + <value> + <string>portal</string> + </value> + <value> + <string>dashboard</string> + </value> + <value> + <string>exoadmin</string> + </value> + <value> + <string>eXoGadgets</string> + </value> + <value> + <string>eXoGadgetServer</string> + </value> + <value> + <string>rest</string> + </value> + <value> + <string>web</string> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component> +</configuration> Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/catalina.properties.patch =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/catalina.properties.patch (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/catalina.properties.patch 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,12 @@ +diff -uNr --exclude .svn tomcat.orig/conf/catalina.properties tomcat/conf/catalina.properties +--- tomcat.orig/conf/catalina.properties 2010-06-29 16:30:50.000000000 +0200 ++++ tomcat/conf/catalina.properties 2010-07-28 11:01:37.000000000 +0200 +@@ -44,7 +44,7 @@ + # "foo/*.jar": Add all the JARs of the specified folder as class + # repositories + # "foo/bar.jar": Add bar.jar as a class repository +-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar ++common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.base}/gatein/lib/*.jar + + # + # List of comma-separated paths defining the contents of the "server" Added: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/logging.properties.patch =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/logging.properties.patch (rev 0) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat-patch/logging.properties.patch 2010-07-28 16:19:05 UTC (rev 3712) @@ -0,0 +1,61 @@ +diff -uNr --exclude .svn tomcat.orig/conf/logging.properties tomcat/conf/logging.properties +--- tomcat.orig/conf/logging.properties 2010-06-29 16:30:50.000000000 +0200 ++++ tomcat/conf/logging.properties 2010-07-28 10:32:00.000000000 +0200 +@@ -13,7 +13,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler ++handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6gatein.org.apache.juli.FileHandler + + .handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +@@ -62,3 +62,48 @@ + #org.apache.catalina.startup.HostConfig.level = FINE + #org.apache.catalina.session.ManagerBase.level = FINE + #org.apache.catalina.core.AprLifecycleListener.level=FINE ++ ++############################################################ ++# GateIn log configuration ++############################################################ ++ ++# Gatein log Handler ++6gatein.org.apache.juli.FileHandler.level = FINE ++6gatein.org.apache.juli.FileHandler.directory = ${catalina.base}/gatein/logs ++6gatein.org.apache.juli.FileHandler.prefix = gatein ++ ++# logger configuration ++org.exoplatform.level = INFO ++org.exoplatform.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++org.gatein.level = INFO ++org.gatein.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++org.chromattic.level = INFO ++org.chromattic.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++jcr.level = INFO ++jcr.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++ws.level = INFO ++ws.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++XMLResolvingServiceImpl.level = INFO ++XMLResolvingServiceImpl.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++TRAXTemplatesServiceImpl.level = INFO ++TRAXTemplatesServiceImpl.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++org.hibernate.level = INFO ++org.hibernate.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++com.arjuna.level = INFO ++com.arjuna.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++org.jboss.level = INFO ++org.jboss.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++org.apache.shindig.level = INFO ++org.apache.shindig.handlers = java.util.logging.ConsoleHandler,6gatein.org.apache.juli.FileHandler ++ ++ Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-07-27 14:43:57 UTC (rev 3711) +++ portal/trunk/pom.xml 2010-07-28 16:19:05 UTC (rev 3712) @@ -517,7 +517,12 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.tomcat.plugin</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> <!-- Chromattic --> <dependency>