You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2009/09/14 00:27:34 UTC
svn commit: r814404 - in /incubator/wink/trunk: ./ wink-itests/
wink-itests/wink-itest-logging/ wink-itests/wink-itest-logging/src/
wink-itests/wink-itest-logging/src/main/
wink-itests/wink-itest-logging/src/main/resources/
wink-itests/wink-itest-loggi...
Author: bluk
Date: Sun Sep 13 22:27:33 2009
New Revision: 814404
URL: http://svn.apache.org/viewvc?rev=814404&view=rev
Log:
Add debug log option to save server logs
See [WINK-60]
Added:
incubator/wink/trunk/wink-itests/wink-itest-logging/
incubator/wink/trunk/wink-itests/wink-itest-logging/pom.xml
- copied, changed from r814097, incubator/wink/trunk/wink-itests/pom.xml
incubator/wink/trunk/wink-itests/wink-itest-logging/src/
incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/
incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/
incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/log/
incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/log/META-INF/
incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/log/META-INF/log4j.properties
incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/nolog/
incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/nolog/META-INF/
incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/nolog/META-INF/log4j.properties
Modified:
incubator/wink/trunk/pom.xml
incubator/wink/trunk/wink-itests/pom.xml
incubator/wink/trunk/wink-itests/wink-itest/pom.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-filter/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Sun Sep 13 22:27:33 2009
@@ -65,6 +65,7 @@
<aggregate>true</aggregate>
<includes>
<include>**/src/**</include>
+ <include>**/*.xml</include>
</includes>
<excludes>
<exclude>**/*.txt</exclude>
Modified: incubator/wink/trunk/wink-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/pom.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/pom.xml (original)
+++ incubator/wink/trunk/wink-itests/pom.xml Sun Sep 13 22:27:33 2009
@@ -17,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -31,6 +30,7 @@
<name>Apache Wink Integration Tests</name>
<modules>
<module>wink-itest-support</module>
+ <module>wink-itest-logging</module>
<module>wink-itest</module>
</modules>
</project>
Copied: incubator/wink/trunk/wink-itests/wink-itest-logging/pom.xml (from r814097, incubator/wink/trunk/wink-itests/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest-logging/pom.xml?p2=incubator/wink/trunk/wink-itests/wink-itest-logging/pom.xml&p1=incubator/wink/trunk/wink-itests/pom.xml&r1=814097&r2=814404&rev=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/pom.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest-logging/pom.xml Sun Sep 13 22:27:33 2009
@@ -17,20 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
- <artifactId>wink</artifactId>
+ <artifactId>wink-itests</artifactId>
<groupId>org.apache.wink</groupId>
<version>0.2-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>wink-itests</artifactId>
- <packaging>pom</packaging>
- <name>Apache Wink Integration Tests</name>
- <modules>
- <module>wink-itest-support</module>
- <module>wink-itest</module>
- </modules>
-</project>
+ <artifactId>wink-itest-logging</artifactId>
+ <name>Apache Wink Integration Test Logging Support</name>
+</project>
\ No newline at end of file
Added: incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/log/META-INF/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/log/META-INF/log4j.properties?rev=814404&view=auto
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/log/META-INF/log4j.properties (added)
+++ incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/log/META-INF/log4j.properties Sun Sep 13 22:27:33 2009
@@ -0,0 +1,36 @@
+#
+# 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.
+
+# Log both a file that would contain "normal" information at INFO level
+# and another at TRACE (all of the DEBUG)
+
+log4j.appender.FILETRACE-${artifactId}=org.apache.log4j.RollingFileAppender
+log4j.appender.FILETRACE-${artifactId}.Threshold=TRACE
+log4j.appender.FILETRACE-${artifactId}.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILETRACE-${artifactId}.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n
+log4j.appender.FILETRACE-${artifactId}.File=${wink.server.log.dir}/${artifactId}-server-trace.log
+log4j.appender.FILETRACE-${artifactId}.maxBackupIndex=5
+log4j.appender.FILETRACE-${artifactId}.maxFileSize=25MB
+
+log4j.appender.FILEINFO-${artifactId}=org.apache.log4j.RollingFileAppender
+log4j.appender.FILEINFO-${artifactId}.Threshold=INFO
+log4j.appender.FILEINFO-${artifactId}.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILEINFO-${artifactId}.layout.ConversionPattern=%d{ISO8601} %-5p [%c{1}] %m%n
+log4j.appender.FILEINFO-${artifactId}.File=${wink.server.log.dir}/${artifactId}-server-info.log
+log4j.appender.FILEINFO-${artifactId}.maxBackupIndex=5
+log4j.appender.FILEINFO-${artifactId}.maxFileSize=10MB
+
+log4j.logger.org.apache.wink=TRACE, FILEINFO-${artifactId}, FILETRACE-${artifactId}
Added: incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/nolog/META-INF/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/nolog/META-INF/log4j.properties?rev=814404&view=auto
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/nolog/META-INF/log4j.properties (added)
+++ incubator/wink/trunk/wink-itests/wink-itest-logging/src/main/resources/nolog/META-INF/log4j.properties Sun Sep 13 22:27:33 2009
@@ -0,0 +1,17 @@
+#
+# 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.
+
+# No logging by default
\ No newline at end of file
Modified: incubator/wink/trunk/wink-itests/wink-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/pom.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/pom.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/pom.xml Sun Sep 13 22:27:33 2009
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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>
<artifactId>wink-itests</artifactId>
<groupId>org.apache.wink</groupId>
@@ -45,6 +46,7 @@
<wink.server.port>8080</wink.server.port>
<wink.rest.servlet>org.apache.wink.server.internal.servlet.RestServlet</wink.rest.servlet>
<wink.rest.filter>org.apache.wink.server.internal.servlet.RestFilter</wink.rest.filter>
+ <wink.server.log.dir>${project.build.directory}/surefire-reports</wink.server.log.dir>
</properties>
<dependencies>
@@ -56,6 +58,24 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.0</version>
@@ -63,6 +83,13 @@
<dependency>
<groupId>org.apache.wink</groupId>
+ <artifactId>wink-itest-logging</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wink</groupId>
<artifactId>wink-server</artifactId>
<type>jar</type>
<scope>compile</scope>
@@ -84,7 +111,7 @@
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-itest-support</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -99,11 +126,10 @@
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-client-apache-httpclient</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
@@ -114,6 +140,34 @@
<filtering>true</filtering>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-logging-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-itest-logging</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**/*</includes>
+ <outputDirectory>${project.build.directory}/logdependencies</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
@@ -131,15 +185,25 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webXml>${project.build.directory}/${artifactId}-${version}/WEB-INF/web.servlet.xml</webXml>
+ <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
<webResources>
<resource>
<directory>${project.basedir}/src/main/webapp
</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
<filtering>true</filtering>
</resource>
<resource>
<directory>${project.build.outputDirectory}
</directory>
+ <includes>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
+ <include>META-INF/DEPENDENCIES</include>
+ <include>META-INF/DISCLAIMER</include>
+ </includes>
</resource>
</webResources>
</configuration>
@@ -212,7 +276,8 @@
<artifactId>geronimo-maven-plugin</artifactId>
<configuration>
<reporters>
- <reporter implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
+ <reporter
+ implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
<reportsDirectory>${project.build.directory}/surefire-reports
</reportsDirectory>
</reporter>
@@ -310,52 +375,125 @@
</execution>
</executions>
</plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>testsuite-with-geronimo-jetty</id>
+ <activation>
+ <property>
+ <name>assemblyId</name>
+ <value>jetty</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.10</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- </configuration>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <inherited>false</inherited>
<executions>
<execution>
- <id>start-jetty</id>
+ <id>start</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run</goal>
+ <goal>start-server</goal>
</goals>
<configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
+ <logOutput>true</logOutput>
+ <background>true</background>
+ <verifyTimeout>300</verifyTimeout>
+ <refresh>true</refresh>
+ <optionSets>
+ <optionSet>
+ <id>default</id>
+ <options>
+ <option>-XX:MaxPermSize=160m
+ </option>
+ </options>
+ </optionSet>
+ </optionSets>
</configuration>
</execution>
- <execution>
- <id>stop-jetty</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
</executions>
</plugin>
- </plugins>
- </pluginManagement>
- </build>
- <profiles>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
- <id>testsuite-with-geronimo-jetty</id>
+ <id>testsuite-with-geronimo-tomcat</id>
<activation>
<property>
<name>assemblyId</name>
- <value>jetty</value>
+ <value>tomcat</value>
</property>
+ <activeByDefault>true</activeByDefault>
</activation>
- <properties>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -387,7 +525,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
@@ -397,17 +534,45 @@
</build>
</profile>
+
<profile>
- <id>testsuite-with-geronimo-tomcat</id>
+ <id>default-testsuite-with-geronimo-tomcat</id>
<activation>
<property>
- <name>assemblyId</name>
- <value>tomcat</value>
+ <name>!assemblyId</name>
</property>
- <activeByDefault>true</activeByDefault>
</activation>
<properties>
+ <assemblyId>tomcat</assemblyId>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -448,12 +613,13 @@
</build>
</profile>
+
+ <!-- To test the filter instead of the servlet, use this profile -->
<profile>
<id>wink-rest-filter-used</id>
<activation>
<property>
<name>wink.rest.filter.used</name>
- <value>true</value>
</property>
</activation>
@@ -465,52 +631,56 @@
<configuration>
<webXml>${project.build.directory}/${artifactId}-${version}/WEB-INF/web.filter.xml</webXml>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
-
</profile>
+ <!--
+ By default, this profile is activated which means no trace
+ is enabled or saved
+ -->
<profile>
- <id>testsuite-with-jetty-standalone</id>
+ <id>wink-no-logging</id>
<activation>
<property>
- <name>assemblyId</name>
- <value>jetty-standalone</value>
+ <name>!wink.log</name>
</property>
</activation>
-
<build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.10</version>
- <inherited>false</inherited>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- </configuration>
- <executions>
- <execution>
- <id>jetty-do-nothing-pre-integration</id>
- <phase>pre-integration-test</phase>
- </execution>
- <execution>
- <id>jetty-do-nothing-post-integration</id>
- <phase>post-integration-test</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- </plugins>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/logdependencies/nolog
+ </directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
</profile>
+ <!-- Activate this profile to save the server logs and enable trace -->
+ <profile>
+ <id>wink-logging</id>
+ <activation>
+ <property>
+ <name>wink.log</name>
+ </property>
+ </activation>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/logdependencies/log
+ </directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+ </profile>
</profiles>
</project>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-filter/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-filter/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-filter/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-filter/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-inheritance/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>
Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/geronimo-web.xml?rev=814404&r1=814403&r2=814404&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/main/webapp/WEB-INF/geronimo-web.xml Sun Sep 13 22:27:33 2009
@@ -17,19 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${groupId}</sys:groupId>
- <sys:artifactId>${artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
-
- <context-root>${artifactId}</context-root>
+ <sys:environment>
+ <sys:moduleId>
+ <sys:groupId>${groupId}</sys:groupId>
+ <sys:artifactId>${artifactId}</sys:artifactId>
+ <sys:version>${version}</sys:version>
+ <sys:type>war</sys:type>
+ </sys:moduleId>
+ </sys:environment>
+
+ <gbean name="DirectoryLog4jConfiguration"
+ class="org.apache.geronimo.system.logging.log4j.ApplicationLog4jConfigurationGBean">
+ <attribute name="log4jResource">META-INF/log4j.properties</attribute>
+ </gbean>
+
+ <context-root>${artifactId}</context-root>
</web-app>