You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/04/25 21:13:26 UTC
svn commit: r651684 [6/8] - in /geronimo/server/trunk: ./
assemblies/geronimo-boilerplate-minimal/
assemblies/geronimo-boilerplate-minimal/src/main/assembly/
assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/
assemblies/geronimo-boilerplate...
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
@@ -35,7 +35,7 @@
public abstract class CXFWebServiceContainer implements WebServiceContainer {
- private static final Log LOG = LogFactory.getLog(CXFWebServiceContainer.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
protected final GeronimoDestination destination;
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoQueryHandler.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import javax.wsdl.extensions.schema.SchemaReference;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
@@ -39,7 +39,7 @@
public class GeronimoQueryHandler extends WSDLQueryHandler {
- private static final Log LOG = LogFactory.getLog(GeronimoQueryHandler.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
public GeronimoQueryHandler(Bus bus) {
super(bus);
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
import javax.xml.namespace.QName;
import javax.xml.ws.handler.HandlerResolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.javaee.HandlerChainsType;
import org.apache.geronimo.cxf.CXFHandlerResolver;
@@ -40,7 +40,7 @@
public class CXFServiceReference extends JAXWSServiceReference {
- private static final Log LOG = LogFactory.getLog(CXFServiceReference.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
public CXFServiceReference(String serviceClassName,
String referenceClassName,
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOEndpoint.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import javax.naming.Context;
import javax.xml.ws.WebServiceException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.JAXWSMethodInvoker;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
@@ -38,7 +38,7 @@
public class POJOEndpoint extends CXFEndpoint {
- private static final Log LOG = LogFactory.getLog(POJOEndpoint.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private AnnotationHolder holder;
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainerFactoryGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainerFactoryGBean.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/pojo/POJOWebServiceContainerFactoryGBean.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
import javax.naming.NamingException;
import javax.transaction.TransactionManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.geronimo.cxf.CXFCatalogUtils;
@@ -49,7 +49,7 @@
*/
public class POJOWebServiceContainerFactoryGBean implements WebServiceContainerFactory {
- private static final Log LOG = LogFactory.getLog(POJOWebServiceContainerFactoryGBean.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private final Bus bus;
private final Class servletClass;
Modified: geronimo/server/trunk/plugins/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/pom.xml Fri Apr 25 12:11:52 2008
@@ -35,7 +35,7 @@
<description>
CXF plugin
</description>
-
+
<modules>
<module>cxf</module>
<module>cxf-deployer</module>
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Fri Apr 25 12:11:52 2008
@@ -46,7 +46,6 @@
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-taglib</artifactId>
- <version>${plutoVersion}</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java (original)
+++ geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.enterprise.deploy.spi.status.ProgressObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.cli.DeployUtils;
import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
@@ -54,7 +54,7 @@
* @version $Rev$ $Date$
*/
public class DirectoryHotDeployer implements HotDeployer, DeploymentWatcher, GBeanLifecycle { //todo: write unit tests
- private static final Log log = LogFactory.getLog(DirectoryHotDeployer.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
// Try to make this stand out as the user is likely to get a ton of errors if this comes up
private static final String BAD_LAYOUT_MESSAGE = "CANNOT DEPLOY: It looks like you unpacked an application or module " +
Modified: geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java (original)
+++ geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/src/main/java/org/apache/geronimo/deployment/hot/DirectoryMonitor.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.deployment.hot;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.apache.geronimo.deployment.cli.DeployUtils;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.kernel.repository.Artifact;
@@ -45,7 +45,7 @@
* @version $Rev$ $Date$
*/
public class DirectoryMonitor implements Runnable {
- private static final Log log = LogFactory.getLog(DirectoryMonitor.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static interface Listener {
/**
Modified: geronimo/server/trunk/plugins/hotdeploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/hotdeploy/pom.xml (original)
+++ geronimo/server/trunk/plugins/hotdeploy/pom.xml Fri Apr 25 12:11:52 2008
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hotdeploy</artifactId>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Fri Apr 25 12:11:52 2008
@@ -41,8 +41,8 @@
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ConfigurationBuilder;
import org.apache.geronimo.deployment.DeploymentContext;
@@ -105,7 +105,7 @@
*/
public class EARConfigBuilder implements ConfigurationBuilder, CorbaGBeanNameSource, GBeanLifecycle {
- private static final Log log = LogFactory.getLog(EARConfigBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final String LINE_SEP = System.getProperty("line.separator");
private final static QName APPLICATION_QNAME = GerApplicationDocument.type.getDocumentElementName();
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.xbeans.javaee.ApplicationClientType;
import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
import org.apache.geronimo.xbeans.javaee.EjbRefType;
@@ -50,7 +50,7 @@
public class AnnotatedApplicationClient implements AnnotatedApp {
// Private instance variables
- private static final Log log = LogFactory.getLog(AnnotatedApplicationClient.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ApplicationClientType applicationClient;
private List<EjbRefType> ambiguousEjbRefs;
private final String componentType;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
import org.apache.geronimo.xbeans.javaee.EjbRefType;
import org.apache.geronimo.xbeans.javaee.EnvEntryType;
@@ -49,7 +49,7 @@
public class AnnotatedWebApp implements AnnotatedApp {
// Private instance variables
- private static final Log log = LogFactory.getLog(AnnotatedWebApp.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private WebAppType webApp;
// Protected instance variables
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import javax.ejb.Local;
import javax.ejb.Remote;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.xbeans.javaee.DescriptionType;
import org.apache.geronimo.xbeans.javaee.EjbLinkType;
@@ -76,7 +76,7 @@
public final class EJBAnnotationHelper {
// Private instance variables
- private static final Log log = LogFactory.getLog(EJBAnnotationHelper.class);
+ private static final Logger log = LoggerFactory.getLogger(EJBAnnotationHelper.class);
// Private constructor to prevent instantiation
private EJBAnnotationHelper() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import javax.jws.HandlerChain;
import javax.xml.ws.WebServiceRef;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.xbeans.javaee.HandlerChainType;
@@ -67,7 +67,7 @@
public final class HandlerChainAnnotationHelper extends AnnotationHelper {
// Private instance variables
- private static final Log log = LogFactory.getLog(HandlerChainAnnotationHelper.class);
+ private static final Logger log = LoggerFactory.getLogger(HandlerChainAnnotationHelper.class);
// Private constructor to prevent instantiation
private HandlerChainAnnotationHelper() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceProperty;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.xbeans.javaee.DescriptionType;
import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
@@ -71,7 +71,7 @@
public final class PersistenceContextAnnotationHelper extends AnnotationHelper {
// Private instance variables
- private static final Log log = LogFactory.getLog(PersistenceContextAnnotationHelper.class);
+ private static final Logger log = LoggerFactory.getLogger(PersistenceContextAnnotationHelper.class);
// Private constructor to prevent instantiation
private PersistenceContextAnnotationHelper() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import javax.persistence.PersistenceUnit;
import javax.persistence.PersistenceUnits;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.xbeans.javaee.DescriptionType;
import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
@@ -67,7 +67,7 @@
public final class PersistenceUnitAnnotationHelper extends AnnotationHelper {
// Private instance variables
- private static final Log log = LogFactory.getLog(PersistenceUnitAnnotationHelper.class);
+ private static final Logger log = LoggerFactory.getLogger(PersistenceUnitAnnotationHelper.class);
// Private constructor to prevent instantiation
private PersistenceUnitAnnotationHelper() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import javax.annotation.Resource;
import javax.annotation.Resources;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.xbean.finder.ClassFinder;
@@ -61,7 +61,7 @@
public final class ResourceAnnotationHelper extends AnnotationHelper {
// Private instance variables
- private static final Log log = LogFactory.getLog(ResourceAnnotationHelper.class);
+ private static final Logger log = LoggerFactory.getLogger(ResourceAnnotationHelper.class);
// Private constructor to prevent instantiation
private ResourceAnnotationHelper() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import javax.annotation.security.RunAs;
import javax.servlet.Servlet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.xbeans.javaee.RoleNameType;
import org.apache.geronimo.xbeans.javaee.RunAsType;
@@ -61,7 +61,7 @@
public final class SecurityAnnotationHelper extends AnnotationHelper {
// Private instance variables
- private static final Log log = LogFactory.getLog(SecurityAnnotationHelper.class);
+ private static final Logger log = LoggerFactory.getLogger(SecurityAnnotationHelper.class);
// Private constructor to prevent instantiation
private SecurityAnnotationHelper() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import javax.xml.ws.WebServiceRef;
import javax.xml.ws.WebServiceRefs;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
import org.apache.geronimo.xbeans.javaee.JndiNameType;
@@ -68,7 +68,7 @@
public final class WebServiceRefAnnotationHelper extends AnnotationHelper {
// Private instance variables
- private static final Log log = LogFactory.getLog(WebServiceRefAnnotationHelper.class);
+ private static final Logger log = LoggerFactory.getLogger(WebServiceRefAnnotationHelper.class);
// Private constructor to prevent instantiation
private WebServiceRefAnnotationHelper() {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.testsupport.XmlBeansTestSupport;
@@ -35,7 +35,7 @@
* @version $Rev$ $Date$
*/
public class SchemaConversionTest extends XmlBeansTestSupport {
- private static final Log log = LogFactory.getLog(SchemaConversionTest.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private ClassLoader classLoader = this.getClass().getClassLoader();
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml Fri Apr 25 12:11:52 2008
@@ -46,11 +46,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Fri Apr 25 12:11:52 2008
@@ -29,8 +29,8 @@
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.testsupport.XmlBeansTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ejb 1.1 dtd appears to be a subset of ejb 2.0 dtd so the same xsl should
@@ -39,7 +39,7 @@
* @version $Rev$ $Date$
*/
public class SchemaConversionUtilsTest extends XmlBeansTestSupport {
- private static final Log log = LogFactory.getLog(SchemaConversionUtilsTest.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private ClassLoader classLoader = this.getClass().getClassLoader();
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
import javax.annotation.Resource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -51,7 +51,7 @@
*/
public class EnvironmentEntryBuilder extends AbstractNamingBuilder implements GBeanLifecycle {
- private static final Log log = LogFactory.getLog(EnvironmentEntryBuilder.class);
+ private static final Logger log = LoggerFactory.getLogger(EnvironmentEntryBuilder.class);
private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
static {
NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming", "http://geronimo.apache.org/xml/ns/naming-1.2");
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import javax.annotation.Resource;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -52,7 +52,7 @@
public class SwitchingServiceRefBuilder extends AbstractNamingBuilder {
- private static final Log log = LogFactory.getLog(SwitchingServiceRefBuilder.class);
+ private static final Logger log = LoggerFactory.getLogger(SwitchingServiceRefBuilder.class);
private static final QName GER_SERVICE_REF_QNAME = GerServiceRefDocument.type
.getDocumentElementName();
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Fri Apr 25 12:11:52 2008
@@ -45,8 +45,8 @@
import javax.security.jacc.WebUserDataPermission;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ModuleIDBuilder;
import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
@@ -107,7 +107,7 @@
* @version $Rev$ $Date$
*/
public abstract class AbstractWebModuleBuilder implements ModuleBuilder {
- private static final Log log = LogFactory.getLog(AbstractWebModuleBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final QName TAGLIB = new QName(SchemaConversionUtils.JAVAEE_NAMESPACE, "taglib");
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java Fri Apr 25 12:11:52 2008
@@ -27,14 +27,14 @@
import org.apache.xmlbeans.XmlCursor;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
*/
public class GenericToSpecificPlanConverterTest extends TestCase {
- private static final Log log = LogFactory.getLog(GenericToSpecificPlanConverterTest.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private ClassLoader classLoader = this.getClass().getClassLoader();
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java Fri Apr 25 12:11:52 2008
@@ -37,8 +37,8 @@
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ModuleIDBuilder;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
@@ -84,7 +84,7 @@
*/
public class JspModuleBuilderExtension implements ModuleBuilderExtension {
- private static final Log log = LogFactory.getLog(JspModuleBuilderExtension.class);
+ private static final Logger log = LoggerFactory.getLogger(JspModuleBuilderExtension.class);
private final Environment defaultEnvironment;
private final NamingBuilder namingBuilders;
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/SchemaConversionTest.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/SchemaConversionTest.java Fri Apr 25 12:11:52 2008
@@ -21,8 +21,8 @@
import java.util.List;
import java.util.ArrayList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.testsupport.XmlBeansTestSupport;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
@@ -52,7 +52,7 @@
*/
public class SchemaConversionTest extends XmlBeansTestSupport {
- private static final Log log = LogFactory.getLog(SchemaConversionTest.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private ClassLoader classLoader = this.getClass().getClassLoader();
private XmlOptions options = new XmlOptions();
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml Fri Apr 25 12:11:52 2008
@@ -31,7 +31,7 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jasper</artifactId>
<name>Geronimo Plugins, Jasper :: Core</name>
-
+
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -53,6 +53,7 @@
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-j2ee</artifactId>
@@ -65,25 +66,28 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
</dependency>
+ <!--
+ TODO: See if this logging package is really needed.
+ -->
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>juli</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java Fri Apr 25 12:11:52 2008
@@ -42,8 +42,8 @@
import org.apache.jasper.compiler.TldLocationsCache;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A container for all tag libraries that are defined "globally"
@@ -86,7 +86,7 @@
public class GeronimoTldLocationsCache extends TldLocationsCache {
// Logger
- private Log log = LogFactory.getLog(GeronimoTldLocationsCache.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* The types of URI one may specify for a tag library
Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java Fri Apr 25 12:11:52 2008
@@ -18,8 +18,8 @@
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -80,7 +80,7 @@
static public final String GBEAN_SASL_MECHANISMS = "saslMechanisms";
static public final String GBEAN_SASL_AUTHORIZATIONID = "saslAuthorizationId";
- private final Log log = LogFactory.getLog(IMAPStoreGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Integer port;
private Boolean partialFetch;
Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.naming.Name;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -52,7 +52,7 @@
*/
public class MailGBean implements GBeanLifecycle, JavaMailResource, ResourceSource {
- private final Log log = LogFactory.getLog(MailGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final String objectName;
private final Collection protocols;
Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java Fri Apr 25 12:11:52 2008
@@ -18,8 +18,8 @@
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -38,7 +38,7 @@
*/
public class NNTPStoreGBean extends ProtocolGBean implements NNTPGBeanConstants {
- private final Log log = LogFactory.getLog(NNTPTransportGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Integer port;
private Integer connectionTimeout;
Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java Fri Apr 25 12:11:52 2008
@@ -18,8 +18,8 @@
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -38,7 +38,7 @@
*/
public class NNTPTransportGBean extends ProtocolGBean implements NNTPGBeanConstants {
- private final Log log = LogFactory.getLog(NNTPTransportGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Integer port;
private Integer connectionTimeout;
Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java Fri Apr 25 12:11:52 2008
@@ -18,8 +18,8 @@
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -57,7 +57,7 @@
static public final String GBEAN_APOP = "apopEnable";
static public final String GBEAN_MESSAGE_CLASS = "messageClass";
- private final Log log = LogFactory.getLog(POP3StoreGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Integer port;
private Integer connectionTimeout;
Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
import java.util.Enumeration;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -59,7 +59,7 @@
static public final String GBEAN_LOCALADDRESS = "localaddress";
static public final String GBEAN_LOCALPORT = "localport";
- private final Log log = LogFactory.getLog(ProtocolGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final String objectName;
private Properties properties;
Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java Fri Apr 25 12:11:52 2008
@@ -18,8 +18,8 @@
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -72,7 +72,7 @@
static public final String GBEAN_MAIL_EXTENSION = "mailExtension";
static public final String GBEAN_STARTTLS_ENABLE = "startTLSEnable";
- private final Log log = LogFactory.getLog(SMTPSTransportGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Integer port;
private Integer connectionTimeout;
Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java (original)
+++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java Fri Apr 25 12:11:52 2008
@@ -18,8 +18,8 @@
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -73,7 +73,7 @@
static public final String GBEAN_STARTTLS_ENABLE = "startTLSEnable";
- private final Log log = LogFactory.getLog(SMTPTransportGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Integer port;
private Integer connectionTimeout;
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java Fri Apr 25 12:11:52 2008
@@ -44,8 +44,8 @@
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.jaxws.JAXWSUtils;
import org.apache.geronimo.jaxws.client.EndpointInfo;
@@ -56,7 +56,7 @@
public class EndpointInfoBuilder {
- private static final Log LOG = LogFactory.getLog(EndpointInfoBuilder.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private JarFile moduleFile;
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import java.util.Map;
import java.util.jar.JarFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
@@ -46,7 +46,7 @@
import org.apache.geronimo.kernel.repository.Environment;
public abstract class JAXWSServiceBuilder implements WebServiceBuilder {
- private static final Log LOG = LogFactory.getLog(JAXWSServiceBuilder.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
protected final Environment defaultEnvironment;
protected WebServiceFinder webServiceFinder;
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.kernel.repository.Environment;
@@ -45,7 +45,7 @@
import org.apache.xmlbeans.XmlObject;
public abstract class JAXWSServiceRefBuilder extends AbstractNamingBuilder implements ServiceRefBuilder {
- private static final Log log = LogFactory.getLog(JAXWSServiceRefBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final QName GER_SERVICE_REF_QNAME =
GerServiceRefDocument.type.getDocumentElementName();
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import java.util.Collection;
import java.util.SortedSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.ListableRepository;
import org.apache.geronimo.kernel.repository.Repository;
@@ -36,8 +36,8 @@
public class JAXWSTools {
- private static final Log LOG = LogFactory.getLog(JAXWSTools.class);
-
+ private static final Logger LOG = LoggerFactory.getLogger(JAXWSTools.class);
+
private final static String [][] LIBS =
{
{ "org.apache.axis2", "axis2-jaxws-api" },
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WARWebServiceFinder.java Fri Apr 25 12:11:52 2008
@@ -32,8 +32,8 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.j2ee.deployment.Module;
@@ -48,7 +48,7 @@
public class WARWebServiceFinder implements WebServiceFinder {
- private static final Log LOG = LogFactory.getLog(WARWebServiceFinder.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
public Map<String, PortInfo> discoverWebServices(Module module,
boolean isEJB,
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.DeploymentConfigurationManager;
import org.apache.geronimo.deployment.DeploymentContext;
@@ -48,7 +48,7 @@
public class WsdlGenerator {
- private static final Log LOG = LogFactory.getLog(WsdlGenerator.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private final static String FORK_WSGEN_PROPERTY =
"org.apache.geronimo.jaxws.wsgen.fork";
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/EJBWebServiceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/EJBWebServiceFinder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/EJBWebServiceFinder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/EJBWebServiceFinder.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.jaxws.JAXWSUtils;
@@ -31,7 +31,7 @@
public class EJBWebServiceFinder implements WebServiceFinder {
- private static final Log LOG = LogFactory.getLog(EJBWebServiceFinder.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
public Map<String, PortInfo> discoverWebServices(Module module,
boolean isEJB,
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/JNDIResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/JNDIResolver.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/JNDIResolver.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/JNDIResolver.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.jaxws;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -25,15 +25,14 @@
public class JNDIResolver {
- private static final Log LOG =
- LogFactory.getLog(JNDIResolver.class.getName());
+ private final Logger log = LoggerFactory.getLogger(getClass());
public Object resolve(String name, Class clz) throws NamingException {
Context ctx = new InitialContext();
ctx = (Context) ctx.lookup("java:comp/env");
- LOG.debug("Looking up '" + name + "'");
-
+ log.debug("Looking up: {}", name);
+
Object o = ctx.lookup(name);
return clz.cast(o);
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/annotations/AnnotationProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/annotations/AnnotationProcessor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/annotations/AnnotationProcessor.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/annotations/AnnotationProcessor.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.jaxws.annotations;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -33,7 +33,7 @@
public class AnnotationProcessor {
- private static final Log LOG = LogFactory.getLog(AnnotationProcessor.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private Map<Class<? extends Annotation>, AnnotationHandler> handlers;
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java Fri Apr 25 12:11:52 2008
@@ -22,8 +22,8 @@
import org.apache.geronimo.naming.reference.KernelAwareReference;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.naming.NamingException;
import javax.xml.ws.Service;
@@ -43,7 +43,7 @@
import net.sf.cglib.reflect.FastClass;
public abstract class JAXWSServiceReference extends SimpleReference implements ClassLoaderAwareReference, KernelAwareReference {
- private static final Log LOG = LogFactory.getLog(JAXWSServiceReference.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private static final Class[] URL_SERVICE_NAME_CONSTRUCTOR =
new Class[] { URL.class, QName.class };
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/PortMethodInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/PortMethodInterceptor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/PortMethodInterceptor.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/PortMethodInterceptor.java Fri Apr 25 12:11:52 2008
@@ -18,8 +18,8 @@
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.jaxws.JAXWSUtils;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.jaas.NamedUsernamePasswordCredential;
@@ -38,7 +38,7 @@
public class PortMethodInterceptor implements MethodInterceptor {
- private static final Log LOG = LogFactory.getLog(PortMethodInterceptor.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private Map<Object, EndpointInfo> seiInfoMap;
Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml Fri Apr 25 12:11:52 2008
@@ -88,10 +88,6 @@
<version>${version}</version>
</element>
<element>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </element>
- <element>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</element>
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java Fri Apr 25 12:11:52 2008
@@ -39,8 +39,8 @@
import javax.management.ObjectName;
import javax.servlet.Servlet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ModuleIDBuilder;
import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
@@ -120,7 +120,7 @@
* @version $Rev:385659 $ $Date$
*/
public class JettyModuleBuilder extends AbstractWebModuleBuilder implements GBeanLifecycle {
- private final static Log log = LogFactory.getLog(JettyModuleBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
static {
NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
@@ -321,7 +321,7 @@
}
}
} catch (IOException e) {
- log.warn(e);
+ log.warn("Failed to load geronimo-web.xml", e);
}
JettyWebAppType jettyWebApp;
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml Fri Apr 25 12:11:52 2008
@@ -73,31 +73,6 @@
<artifactId>jetty-util</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.tomcat.extras</groupId>-->
- <!--<artifactId>juli</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.tomcat.extras</groupId>-->
- <!--<artifactId>juli-adapters</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>commons-collections</groupId>-->
- <!--<artifactId>commons-collections</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>commons-primitives</groupId>-->
- <!--<artifactId>commons-primitives</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.myfaces.core</groupId>-->
- <!--<artifactId>myfaces-api</artifactId>-->
- <!--</dependency>-->
-
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InjectionServletHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InjectionServletHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InjectionServletHandler.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InjectionServletHandler.java Fri Apr 25 12:11:52 2008
@@ -28,15 +28,15 @@
import javax.servlet.Servlet;
import org.mortbay.jetty.servlet.ServletHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.j2ee.annotation.Injection;
/**
* @version $Rev$ $Date$
*/
class InjectionServletHandler extends ServletHandler {
- private static final Log log = LogFactory.getLog(InjectionServletHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(InjectionServletHandler.class);
private final Map<String, List<Injection>> injections;
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/InternalJAASJettyRealm.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.security.auth.login.LoginException;
import javax.security.jacc.WebRoleRefPermission;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.realm.providers.CertificateCallbackHandler;
import org.apache.geronimo.security.realm.providers.ClearableCallbackHandler;
@@ -40,7 +40,7 @@
* @version $Rev$ $Date$
*/
public class InternalJAASJettyRealm {
- private static Log log = LogFactory.getLog(InternalJAASJettyRealm.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final String securityRealmName;
private final HashMap<String, Principal> userMap = new HashMap<String, Principal>();
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
@@ -62,7 +62,7 @@
* @version $Rev:386276 $ $Date$
*/
public class JettyManagerImpl implements WebManager {
- private final static Log log = LogFactory.getLog(JettyManagerImpl.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final ConnectorType HTTP_NIO = new ConnectorType(Messages.getString("JettyManagerImpl.0")); //$NON-NLS-1$
private static final ConnectorType HTTPS_NIO = new ConnectorType(Messages.getString("JettyManagerImpl.1")); //$NON-NLS-1$
@@ -193,7 +193,7 @@
} catch (GBeanNotFoundException e) {
log.warn("No such GBean '" + connectorName + "'"); //todo: what if we want to remove a failed GBean?
} catch (Exception e) {
- log.error(e);
+ log.error("Failed to remove connector", e);
}
}
@@ -304,7 +304,7 @@
} catch (GBeanNotFoundException e) {
log.warn("No such GBean '" + connectorName + "'");
} catch (Exception e) {
- log.error(e);
+ log.error("Failed to get connector type", e);
}
return connectorType;
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
import javax.security.auth.login.LoginException;
import javax.transaction.TransactionManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -77,7 +77,7 @@
* @version $Rev$ $Date$
*/
public class JettyWebAppContext implements GBeanLifecycle, JettyServletRegistration, WebModule {
- private static Log log = LogFactory.getLog(JettyWebAppContext.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final String originalSpecDD;
private final J2EEServer server;
@@ -337,9 +337,6 @@
public void doStop() throws Exception {
getLifecycleChain().lifecycleCommand(new StopCommand());
-
- // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid a memory leak.
- LogFactory.release(webClassLoader);
// need to release the JSF factories. Otherwise, we'll leak ClassLoaders.
//should be done in a myfaces gbean
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyThreadPool.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyThreadPool.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyThreadPool.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyThreadPool.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.system.threads.ThreadPool;
/**
@@ -32,7 +32,7 @@
*/
public class JettyThreadPool implements org.mortbay.thread.ThreadPool {
- private static final Log log = LogFactory.getLog(JettyThreadPool.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ThreadPool executor;
private final String name;
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -46,7 +46,7 @@
* @version $Rev$ $Date$
*/
public class JettyLogManagerImpl implements JettyLogManager {
- private final static Log log = LogFactory.getLog(JettyLogManagerImpl.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
// Pattern that matches the date in the logfile name
private final static Pattern FILENAME_DATE_PATTERN = Pattern.compile("[-_ /.](((19|20)\\d\\d)[-_ /.](0[1-9]|1[012])[-_ /.](0[1-9]|[12][0-9]|3[01]))");
Modified: geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/pom.xml Fri Apr 25 12:11:52 2008
@@ -69,11 +69,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- </dependency>
-
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.configs</groupId>-->
<!--<artifactId>jasper</artifactId>-->
@@ -143,11 +138,6 @@
<dependency start="true">
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency start="true">
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
<type>jar</type>
</dependency>
<dependency start="true">
Modified: geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml Fri Apr 25 12:11:52 2008
@@ -26,11 +26,10 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>agent-car-jmx</artifactId>
- <name>Geronimo Plugins :: Monitoring Agent (JMX)</name>
+ <name>Geronimo Plugins, Monitoring :: Agent JMX CAR</name>
<packaging>car</packaging>
<dependencies>
Modified: geronimo/server/trunk/plugins/monitoring/agent-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ear/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ear/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ear/pom.xml Fri Apr 25 12:11:52 2008
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>agent-ear</artifactId>