You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by es...@apache.org on 2007/08/21 05:09:18 UTC
svn commit: r567926 - in /portals/wsrp4j/trunk: commons/pom.xml
consumer-proxyportlet/pom.xml
consumer-proxyportlet/src/webapp/WEB-INF/classes/logging.properties
persistence-db/pom.xml pom.xml
Author: esm
Date: Mon Aug 20 20:09:16 2007
New Revision: 567926
URL: http://svn.apache.org/viewvc?rev=567926&view=rev
Log:
Upgrade to commons-logging version 1.1. Excluding older versions of commons-logging pulled in via transitive deps.
Added:
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/logging.properties
Modified:
portals/wsrp4j/trunk/commons/pom.xml
portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml
portals/wsrp4j/trunk/persistence-db/pom.xml
portals/wsrp4j/trunk/pom.xml
Modified: portals/wsrp4j/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons/pom.xml?rev=567926&r1=567925&r2=567926&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons/pom.xml (original)
+++ portals/wsrp4j/trunk/commons/pom.xml Mon Aug 20 20:09:16 2007
@@ -118,7 +118,7 @@
</dependency>
<dependency>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging-api</artifactId>
<groupId>commons-logging</groupId>
<version>${commons-logging.version}</version>
</dependency>
@@ -127,7 +127,12 @@
<artifactId>commons-discovery</artifactId>
<groupId>commons-discovery</groupId>
<version>${commons-discovery.version}</version>
- <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml?rev=567926&r1=567925&r2=567926&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/pom.xml Mon Aug 20 20:09:16 2007
@@ -86,9 +86,9 @@
</dependency>
<dependency>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- <version>${log4j.version}</version>
+ <artifactId>commons-logging-api</artifactId>
+ <groupId>commons-logging</groupId>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
@@ -107,6 +107,12 @@
<artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
<version>${commons-beanutils.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Runtime dependencies ================================= -->
Added: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/logging.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/logging.properties?rev=567926&view=auto
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/logging.properties (added)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/logging.properties Mon Aug 20 20:09:16 2007
@@ -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.
+
+handlers = org.apache.juli.FileHandler
+
+############################################################
+#
+# JDK 1.4+ logging handler specific properties for Pluto portal
+# using Tomcat's custom implementation of LogManager.
+# Logging level can be set to any one of:
+# SEVERE, WARN, INFO, CONFIG, FINE, FINEST or ALL.
+# See the Tomcat documentation for more details.
+#
+############################################################
+
+org.apache.juli.FileHandler.level = FINE
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+
+#Log file will be named wsrp4j-proxyportlet.<yyyy-mm-dd>.log
+org.apache.juli.FileHandler.prefix = wsrp4j-proxyportlet.
+org.apache.wsrp4j.level = INFO
Modified: portals/wsrp4j/trunk/persistence-db/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/pom.xml?rev=567926&r1=567925&r2=567926&view=diff
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/pom.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/pom.xml Mon Aug 20 20:09:16 2007
@@ -71,6 +71,12 @@
<artifactId>hibernate</artifactId>
<groupId>org.hibernate</groupId>
<version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Provided dependencies ================================ -->
Modified: portals/wsrp4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/pom.xml?rev=567926&r1=567925&r2=567926&view=diff
==============================================================================
--- portals/wsrp4j/trunk/pom.xml (original)
+++ portals/wsrp4j/trunk/pom.xml Mon Aug 20 20:09:16 2007
@@ -78,7 +78,7 @@
<commons-discovery.version>0.2</commons-discovery.version>
<commons-fileupload.version>1.1.1</commons-fileupload.version>
<commons-lang.version>2.1</commons-lang.version>
- <commons-logging.version>1.0.4</commons-logging.version>
+ <commons-logging.version>1.1</commons-logging.version>
<hibernate.version>3.2.1.ga</hibernate.version>
<javax-mail.version>1.4</javax-mail.version>
<jstl.version>1.0.6</jstl.version>
@@ -92,6 +92,16 @@
<xerces.version>2.6.0</xerces.version>
<xml-apis.version>1.0.b2</xml-apis.version>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<filters>