[gatein-commits] gatein SVN: r5341 - in portal/branches/wci/packaging: jetty/pkg and 11 other directories.

Author: alain_defrance Date: 2010-11-29 04:39:58 -0500 (Mon, 29 Nov 2010) New Revision: 5341 Added: portal/branches/wci/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/ portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/ portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/catalina.properties portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/logging.properties portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/ portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/ portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/catalina.properties portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/logging.properties Removed: portal/branches/wci/packaging/jetty/pkg/src/main/resources/jetty-patch/ portal/branches/wci/packaging/tomcat/pkg/src/main/resources/tomcat-patch/ Modified: portal/branches/wci/packaging/jetty/pkg/pom.xml portal/branches/wci/packaging/profiles.xml portal/branches/wci/packaging/tomcat/pkg/tc6/pom.xml portal/branches/wci/packaging/tomcat/pkg/tc7/pom.xml Log: Remove patches Jetty packaging ok Modified: portal/branches/wci/packaging/jetty/pkg/pom.xml =================================================================== --- portal/branches/wci/packaging/jetty/pkg/pom.xml 2010-11-29 09:38:54 UTC (rev 5340) +++ portal/branches/wci/packaging/jetty/pkg/pom.xml 2010-11-29 09:39:58 UTC (rev 5341) @@ -927,30 +927,37 @@ </execution> </executions> </plugin> + </plugins> + </build> - <plugin> - <!-- patch several files (log4j config etc...) --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-patch-plugin</artifactId> - <version>1.1.1</version> - <configuration> - <targetDirectory>${project.build.directory}/jetty</targetDirectory> - </configuration> - <executions> - <execution> - <id>jetty-patches</id> + <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> - <patchDirectory>src/main/resources/jetty-patch/</patchDirectory> - <naturalOrderProcessing>true</naturalOrderProcessing> + <target> + <zip destfile="${project.build.directory}/jetty.zip" basedir="${project.build.directory}/jetty"/> + <attachartifact file="${project.build.directory}/jetty.zip" classifier="bundle" type="zip"/> + </target> </configuration> - <phase>prepare-package</phase> - <goals> - <goal>apply</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Added: portal/branches/wci/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml =================================================================== --- portal/branches/wci/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml (rev 0) +++ portal/branches/wci/packaging/jetty/pkg/src/main/resources/jetty/etc/jetty.xml 2010-11-29 09:39:58 UTC (rev 5341) @@ -0,0 +1,235 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> + +<!-- =============================================================== --> +<!-- Configure the Jetty Server --> +<!-- --> +<!-- Documentation of this file format can be found at: --> +<!-- http://docs.codehaus.org/display/JETTY/jetty.xml --> +<!-- --> +<!-- =============================================================== --> + + +<Configure id="Server" class="org.mortbay.jetty.Server"> + + <!-- =========================================================== --> + <!-- Server Thread Pool --> + <!-- =========================================================== --> + <Set name="ThreadPool"> + + <New class="org.mortbay.thread.QueuedThreadPool"> + <Set name="minThreads">10</Set> + <Set name="maxThreads">200</Set> + <Set name="lowThreads">20</Set> + <Set name="SpawnOrShrinkAt">2</Set> + </New> + + <!-- Optional Java 5 bounded threadpool with job queue + <New class="org.mortbay.thread.concurrent.ThreadPool"> + <Set name="corePoolSize">50</Set> + <Set name="maximumPoolSize">50</Set> + </New> + --> + </Set> + + + + <!-- =========================================================== --> + <!-- Set connectors --> + <!-- =========================================================== --> + <!-- One of each type! --> + <!-- =========================================================== --> + + <!-- Use this connector for many frequently idle connections + and for threadless continuations. + --> + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.nio.SelectChannelConnector"> + <Set name="host"><SystemProperty name="jetty.host" /></Set> + <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set> + <Set name="maxIdleTime">30000</Set> + <Set name="Acceptors">2</Set> + <Set name="statsOn">false</Set> + <Set name="confidentialPort">8443</Set> + <Set name="lowResourcesConnections">5000</Set> + <Set name="lowResourcesMaxIdleTime">5000</Set> + </New> + </Arg> + </Call> + + <!-- Use this connector if NIO is not available. + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.bio.SocketConnector"> + <Set name="port">8081</Set> + <Set name="maxIdleTime">50000</Set> + <Set name="lowResourceMaxIdleTime">1500</Set> + </New> + </Arg> + </Call> + --> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- To add a HTTPS SSL listener --> + <!-- see jetty-ssl.xml to add an ssl connector. use --> + <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- To allow Jetty to be started from xinetd --> + <!-- mixin jetty-xinetd.xml: --> + <!-- java -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml --> + <!-- --> + <!-- See jetty-xinetd.xml for further instructions. --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <!-- =========================================================== --> + <!-- Set up global session ID manager --> + <!-- =========================================================== --> + <!-- + <Set name="sessionIdManager"> + <New class="org.mortbay.jetty.servlet.HashSessionIdManager"> + <Set name="workerName">node1</Set> + </New> + </Set> + --> + + <!-- =========================================================== --> + <!-- Set handler Collection Structure --> + <!-- =========================================================== --> + <Set name="handler"> + <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection"> + <Set name="handlers"> + <Array type="org.mortbay.jetty.Handler"> + <Item> + <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/> + </Item> + <Item> + <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/> + </Item> + <Item> + <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/> + </Item> + </Array> + </Set> + </New> + </Set> + + <!-- =========================================================== --> + <!-- Configure the context deployer --> + <!-- A context deployer will deploy contexts described in --> + <!-- configuration files discovered in a directory. --> + <!-- The configuration directory can be scanned for hot --> + <!-- deployments at the configured scanInterval. --> + <!-- --> + <!-- This deployer is configured to deploy contexts configured --> + <!-- in the $JETTY_HOME/contexts directory --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.ContextDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set> + <Set name="scanInterval">5</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure the webapp deployer. --> + <!-- A webapp deployer will deploy standard webapps discovered --> + <!-- in a directory at startup, without the need for additional --> + <!-- configuration files. It does not support hot deploy or --> + <!-- non standard contexts (see ContextDeployer above). --> + <!-- --> + <!-- This deployer is configured to deploy webapps from the --> + <!-- $JETTY_HOME/webapps directory --> + <!-- --> + <!-- Normally only one type of deployer need be used. --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.WebAppDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set> + <Set name="parentLoaderPriority">false</Set> + <Set name="extract">true</Set> + <Set name="allowDuplicates">false</Set> + <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure Authentication Realms --> + <!-- Realms may be configured for the entire server here, or --> + <!-- they can be configured for a specific web app in a context --> + <!-- configuration (see $(jetty.home)/contexts/test.xml for an --> + <!-- example). --> + <!-- =========================================================== --> + <Set name="UserRealms"> +<!-- + <Array type="org.mortbay.jetty.security.UserRealm"> + <Item> + <New class="org.mortbay.jetty.security.HashUserRealm"> + <Set name="name">Test Realm</Set> + <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set> + <Set name="refreshInterval">0</Set> + </New> + </Item> + </Array> +--> + <Array type="org.mortbay.jetty.plus.jaas.JAASUserRealm"> + <Item> + <New class="org.mortbay.jetty.plus.jaas.JAASUserRealm"> + <Set name="Name">gatein-domain</Set> + <Set name="LoginModuleName">gatein-domain</Set> + <Set name="RoleCheckPolicy"> + <New class="org.mortbay.jetty.plus.jaas.StrictRoleCheckPolicy"/> + </Set> + <Set name="CallbackHandlerClass"> + org.mortbay.jetty.plus.jaas.callback.DefaultCallbackHandler + </Set> + <Set name="roleClassNames"> + <Array type="java.lang.String"> + <Item>org.exoplatform.services.security.jaas.RolePrincipal</Item> + </Array> + </Set> + </New> + </Item> + </Array> + </Set> + + <!-- =========================================================== --> + <!-- Configure Request Log --> + <!-- Request logs may be configured for the entire server here, --> + <!-- or they can be configured for a specific web app in a --> + <!-- contexts configuration (see $(jetty.home)/contexts/test.xml --> + <!-- for an example). --> + <!-- =========================================================== --> + <Ref id="RequestLog"> + <Set name="requestLog"> + <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog"> + <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set> + <Set name="filenameDateFormat">yyyy_MM_dd</Set> + <Set name="retainDays">90</Set> + <Set name="append">true</Set> + <Set name="extended">false</Set> + <Set name="logCookies">false</Set> + <Set name="LogTimeZone">GMT</Set> + </New> + </Set> + </Ref> + + <!-- =========================================================== --> + <!-- extra options --> + <!-- =========================================================== --> + <Set name="stopAtShutdown">true</Set> + <Set name="sendServerVersion">true</Set> + <Set name="sendDateHeader">true</Set> + <Set name="gracefulShutdown">1000</Set> + +</Configure> Modified: portal/branches/wci/packaging/profiles.xml =================================================================== --- portal/branches/wci/packaging/profiles.xml 2010-11-29 09:38:54 UTC (rev 5340) +++ portal/branches/wci/packaging/profiles.xml 2010-11-29 09:39:58 UTC (rev 5341) @@ -29,7 +29,7 @@ ex: On Windows 'c:/AS' ex: On Linux '/home/user/AS' --> - <exo.projects.directory.dependencies>/Users/defrancea/eXo/servers</exo.projects.directory.dependencies> + <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies> <!-- If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir) @@ -41,12 +41,16 @@ <!-- Replace with the name of the directory containing Tomcat 6 --> - <exo.projects.app.tomcat.version>apache-tomcat-6.0.29</exo.projects.app.tomcat.version> + <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version> <!-- Replace with the name of the directory containing Tomcat 7 --> <exo.projects.app.tomcat7.version>apache-tomcat-7.0.2</exo.projects.app.tomcat7.version> <!-- + Replace with the name of the directory containing Tomcat 7 + --> + <exo.projects.app.jetty.version>jetty-6.1.25/jetty-6.1.25</exo.projects.app.jetty.version> + <!-- 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> Modified: portal/branches/wci/packaging/tomcat/pkg/tc6/pom.xml =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/tc6/pom.xml 2010-11-29 09:38:54 UTC (rev 5340) +++ portal/branches/wci/packaging/tomcat/pkg/tc6/pom.xml 2010-11-29 09:39:58 UTC (rev 5341) @@ -84,6 +84,11 @@ <fileset dir="${project.build.directory}/../../target/tomcat"/> </copy> + <!-- Copy specific tomcat configration --> + <copy todir="${project.build.directory}/tomcat6" overwrite="true"> + <fileset dir="${project.basedir}/src/main/resources/tomcat"/> + </copy> + <!-- Tomcat 6 specific dependencies --> <copy file="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" Added: portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/catalina.properties =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/catalina.properties (rev 0) +++ portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/catalina.properties 2010-11-29 09:39:58 UTC (rev 5341) @@ -0,0 +1,82 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# List of comma-separated packages that start with or equal this string +# will cause a security exception to be thrown when +# passed to checkPackageAccess unless the +# corresponding RuntimePermission ("accessClassInPackage."+package) has +# been granted. +package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. +# +# List of comma-separated packages that start with or equal this string +# will cause a security exception to be thrown when +# passed to checkPackageDefinition unless the +# corresponding RuntimePermission ("defineClassInPackage."+package) has +# been granted. +# +# by default, no packages are restricted for definition, and none of +# the class loaders supplied with the JDK call checkPackageDefinition. +# +package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. + +# +# +# List of comma-separated paths defining the contents of the "common" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. +# If left as blank,the JVM system loader will be used as Catalina's "common" +# loader. +# Examples: +# "foo": Add this folder as a class repository +# "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" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. +# If left as blank, the "common" loader will be used as Catalina's "server" +# loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +server.loader= + +# +# List of comma-separated paths defining the contents of the "shared" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_BASE path or absolute. If left as blank, +# the "common" loader will be used as Catalina's "shared" loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +# Please note that for single jars, e.g. bar.jar, you need the URL form +# starting with file:. +shared.loader= + +# +# String cache configuration. +tomcat.util.buf.StringCache.byte.enabled=true +#tomcat.util.buf.StringCache.char.enabled=true +#tomcat.util.buf.StringCache.trainThreshold=500000 +#tomcat.util.buf.StringCache.cacheSize=5000 Added: portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/logging.properties =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/logging.properties (rev 0) +++ portal/branches/wci/packaging/tomcat/pkg/tc6/src/main/resources/tomcat/conf/logging.properties 2010-11-29 09:39:58 UTC (rev 5341) @@ -0,0 +1,109 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# 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 + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.FileHandler.level = FINE +1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +1catalina.org.apache.juli.FileHandler.prefix = catalina. + +2localhost.org.apache.juli.FileHandler.level = FINE +2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +2localhost.org.apache.juli.FileHandler.prefix = localhost. + +3manager.org.apache.juli.FileHandler.level = FINE +3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +3manager.org.apache.juli.FileHandler.prefix = manager. + +4host-manager.org.apache.juli.FileHandler.level = FINE +4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +4host-manager.org.apache.juli.FileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +#org.apache.catalina.startup.ContextConfig.level = FINE +#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/branches/wci/packaging/tomcat/pkg/tc7/pom.xml =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/tc7/pom.xml 2010-11-29 09:38:54 UTC (rev 5340) +++ portal/branches/wci/packaging/tomcat/pkg/tc7/pom.xml 2010-11-29 09:39:58 UTC (rev 5341) @@ -85,6 +85,11 @@ <fileset dir="${project.build.directory}/../../target/tomcat"/> </copy> + <!-- Copy specific tomcat configration --> + <copy todir="${project.build.directory}/tomcat7" overwrite="true"> + <fileset dir="${project.basedir}/src/main/resources/tomcat"/> + </copy> + <!-- Tomcat 7 specific dependencies --> <copy file="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" Added: portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/catalina.properties =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/catalina.properties (rev 0) +++ portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/catalina.properties 2010-11-29 09:39:58 UTC (rev 5341) @@ -0,0 +1,111 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# List of comma-separated packages that start with or equal this string +# will cause a security exception to be thrown when +# passed to checkPackageAccess unless the +# corresponding RuntimePermission ("accessClassInPackage."+package) has +# been granted. +package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. +# +# List of comma-separated packages that start with or equal this string +# will cause a security exception to be thrown when +# passed to checkPackageDefinition unless the +# corresponding RuntimePermission ("defineClassInPackage."+package) has +# been granted. +# +# by default, no packages are restricted for definition, and none of +# the class loaders supplied with the JDK call checkPackageDefinition. +# +package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. + +# +# +# List of comma-separated paths defining the contents of the "common" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. +# If left as blank,the JVM system loader will be used as Catalina's "common" +# loader. +# Examples: +# "foo": Add this folder as a class repository +# "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" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. +# If left as blank, the "common" loader will be used as Catalina's "server" +# loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +server.loader= + +# +# List of comma-separated paths defining the contents of the "shared" +# classloader. Prefixes should be used to define what is the repository type. +# Path may be relative to the CATALINA_BASE path or absolute. If left as blank, +# the "common" loader will be used as Catalina's "shared" loader. +# Examples: +# "foo": Add this folder as a class repository +# "foo/*.jar": Add all the JARs of the specified folder as class +# repositories +# "foo/bar.jar": Add bar.jar as a class repository +# Please note that for single jars, e.g. bar.jar, you need the URL form +# starting with file:. +shared.loader= + +# List of JAR files that should not be scanned for configuration information +# such as web fragments, TLD files etc. It must be a comma separated list of +# JAR file names. +# The JARs listed below include: +# - Tomcat Bootstrap JARs +# - Tomcat API JARs +# - Catalina JARs +# - Jasper JARs +# - Tomcat JARs +# - Common non-Tomcat JARs +# - Sun JDK JARs +# - Apple JDK JARs +tomcat.util.scan.DefaultJarScanner.jarsToSkip=\ +bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\ +annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,\ +catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\ +jasper.jar,jasper-el.jar,ecj-3.6.jar,\ +tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\ +tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\ +commons-beanutils.jar,commons-collections.jar,commons-dbcp.jar,\ +commons-digester.jar,commons-fileupload-1.0.jar,commons-logging.jar,\ +commons-pool.jar,\ +ant.jar,jmx.jar,jmx-tools.jar,\ +xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\ +dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunpkcs11.jar,tools.jar,\ +apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\ +j3daudio.jar,j3dcore.jar,j3dutils.jar,jai_core.jar,jai_codec.jar,\ +mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar + +# +# String cache configuration. +tomcat.util.buf.StringCache.byte.enabled=true +#tomcat.util.buf.StringCache.char.enabled=true +#tomcat.util.buf.StringCache.trainThreshold=500000 +#tomcat.util.buf.StringCache.cacheSize=5000 \ No newline at end of file Added: portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/logging.properties =================================================================== --- portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/logging.properties (rev 0) +++ portal/branches/wci/packaging/tomcat/pkg/tc7/src/main/resources/tomcat/conf/logging.properties 2010-11-29 09:39:58 UTC (rev 5341) @@ -0,0 +1,109 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# 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 + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.FileHandler.level = FINE +1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +1catalina.org.apache.juli.FileHandler.prefix = catalina. + +2localhost.org.apache.juli.FileHandler.level = FINE +2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +2localhost.org.apache.juli.FileHandler.prefix = localhost. + +3manager.org.apache.juli.FileHandler.level = FINE +3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +3manager.org.apache.juli.FileHandler.prefix = manager. + +4host-manager.org.apache.juli.FileHandler.level = FINE +4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +4host-manager.org.apache.juli.FileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +#org.apache.catalina.startup.ContextConfig.level = FINE +#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 +