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 [4/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/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/TransportConnectorGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/TransportConnectorGBeanImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/TransportConnectorGBeanImpl.java (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/TransportConnectorGBeanImpl.java Fri Apr 25 12:11:52 2008
@@ -21,8 +21,8 @@
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.activemq.broker.TransportConnector;
import org.apache.geronimo.activemq.ActiveMQConnector;
@@ -37,7 +37,7 @@
* @version $Rev$ $Date$
*/
public class TransportConnectorGBeanImpl implements GBeanLifecycle, ActiveMQConnector {
- private Log log = LogFactory.getLog(getClass().getName());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private TransportConnector transportConnector;
private BrokerServiceGBean brokerServiceGBean;
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/management/ActiveMQManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/management/ActiveMQManagerGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/management/ActiveMQManagerGBean.java (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/management/ActiveMQManagerGBean.java Fri Apr 25 12:11:52 2008
@@ -22,8 +22,8 @@
import java.util.List;
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.activemq.ActiveMQBroker;
import org.apache.geronimo.activemq.ActiveMQConnector;
@@ -53,7 +53,7 @@
* @version $Rev$ $Date$
*/
public class ActiveMQManagerGBean implements ActiveMQManager {
- private static final Log log = LogFactory.getLog(ActiveMQManagerGBean.class.getName());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Kernel kernel;
private String objectName;
@@ -247,7 +247,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);
}
}
Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Fri Apr 25 12:11:52 2008
@@ -35,15 +35,7 @@
<description>
ActiveMQ plugin
</description>
-
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
+
<modules>
<module>activemq-broker</module>
<module>geronimo-activemq-ra</module>
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java Fri Apr 25 12:11:52 2008
@@ -51,8 +51,8 @@
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.providers.java.RPCProvider;
import org.apache.axis.soap.SOAPConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.axis.client.AxisServiceReference;
import org.apache.geronimo.axis.client.OperationInfo;
import org.apache.geronimo.axis.client.SEIFactory;
@@ -94,7 +94,7 @@
*/
public class AxisBuilder implements WebServiceBuilder {
- private static final Log LOG = LogFactory.getLog(AxisBuilder.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private static final SOAPConstants SOAP_VERSION = SOAPConstants.SOAP11_CONSTANTS;
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,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.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -54,7 +54,7 @@
* @version $Rev$ $Date$
*/
public class AxisServiceRefBuilder extends AbstractNamingBuilder implements ServiceRefBuilder {
- private static final Log log = LogFactory.getLog(AxisServiceRefBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final QNameSet serviceRefQNameSet;
private static final QName GER_SERVICE_REF_QNAME = GerServiceRefDocument.type.getDocumentElementName();
private static final QNameSet GER_SERVICE_REF_QNAME_SET = QNameSet.singleton(GER_SERVICE_REF_QNAME);
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java Fri Apr 25 12:11:52 2008
@@ -49,8 +49,8 @@
import org.apache.axis.encoding.ser.EnumSerializerFactory;
import org.apache.axis.encoding.ser.SimpleListDeserializerFactory;
import org.apache.axis.encoding.ser.SimpleListSerializerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.axis.client.ArrayTypeInfo;
import org.apache.geronimo.axis.client.TypeInfo;
import org.apache.geronimo.common.DeploymentException;
@@ -73,7 +73,7 @@
private static final String SOAP_ENCODING_NS = "http://schemas.xmlsoap.org/soap/encoding/";
private static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
- private static final Log log = LogFactory.getLog(HeavyweightTypeInfoBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ClassLoader cl;
private final Map schemaTypeKeyToSchemaTypeMap;
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml Fri Apr 25 12:11:52 2008
@@ -90,11 +90,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
@@ -103,8 +98,7 @@
<groupId>axis</groupId>
<artifactId>axis</artifactId>
</dependency>
-
- <!-- this uses commons-logging 1.0.3 -->
+
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java Fri Apr 25 12:11:52 2008
@@ -38,8 +38,8 @@
import org.apache.axis.soap.SOAPConstants;
import org.apache.axis.transport.http.HTTPConstants;
import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.webservices.WebServiceContainer;
import org.apache.geronimo.webservices.saaj.SAAJUniverse;
import org.w3c.dom.Element;
@@ -51,7 +51,7 @@
public static final String REQUEST = AxisWebServiceContainer.class.getName() + "@Request";
public static final String RESPONSE = AxisWebServiceContainer.class.getName() + "@Response";
- private static Log log = LogFactory.getLog(AxisWebServiceContainer.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String XSD_NS = "http://www.w3.org/2001/XMLSchema";
Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Fri Apr 25 12:11:52 2008
@@ -138,11 +138,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import javax.xml.ws.http.HTTPBinding;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.axis2.pojo.POJOWebServiceContainerFactoryGBean;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
@@ -57,7 +57,7 @@
*/
public class Axis2Builder extends JAXWSServiceBuilder {
- private static final Log log = LogFactory.getLog(Axis2Builder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public Axis2Builder(Environment defaultEnviroment) {
super(defaultEnviroment);
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java Fri Apr 25 12:11:52 2008
@@ -17,8 +17,8 @@
package org.apache.geronimo.axis2.builder;
-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.builder.EndpointInfoBuilder;
import org.apache.geronimo.jaxws.builder.JAXWSServiceRefBuilder;
import org.apache.geronimo.jaxws.client.EndpointInfo;
@@ -51,7 +51,7 @@
public class Axis2ServiceRefBuilder extends JAXWSServiceRefBuilder {
- private static final Log log = LogFactory.getLog(Axis2ServiceRefBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public Axis2ServiceRefBuilder(Environment defaultEnvironment,
String[] eeNamespaces) {
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBInterceptor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBInterceptor.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBInterceptor.java Fri Apr 25 12:11:52 2008
@@ -34,12 +34,12 @@
import org.apache.axis2.jaxws.server.JAXWSMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004_Constants;
import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2006Constants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class EJBInterceptor {
- private static final Log LOG = LogFactory.getLog(EJBInterceptor.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private MessageContext requestMsgCtx;
private EJBWebServiceContainer container;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/EJBMessageReceiver.java Fri Apr 25 12:11:52 2008
@@ -34,15 +34,15 @@
import org.apache.axis2.jaxws.description.OperationDescription;
import org.apache.axis2.jaxws.handler.SoapMessageContext;
import org.apache.axis2.jaxws.i18n.Messages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.openejb.ApplicationException;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.RpcContainer;
public class EJBMessageReceiver implements MessageReceiver {
- private static final Log LOG = LogFactory.getLog(EJBMessageReceiver.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private DeploymentInfo deploymentInfo;
private Class serviceImplClass;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Fri Apr 25 12:11:52 2008
@@ -113,25 +113,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AnnotationHandlerChainBuilder.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.LogicalHandler;
-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.HandlerChainType;
import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument;
import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
@@ -39,7 +39,7 @@
*/
public class AnnotationHandlerChainBuilder {
- private static final Log log = LogFactory.getLog(AnnotationHandlerChainBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public AnnotationHandlerChainBuilder() {
}
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2RequestResponseTransport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2RequestResponseTransport.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2RequestResponseTransport.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2RequestResponseTransport.java Fri Apr 25 12:11:52 2008
@@ -24,13 +24,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.RequestResponseTransport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.webservices.WebServiceContainer.Response;
public class Axis2RequestResponseTransport implements RequestResponseTransport {
- private static final Log LOG = LogFactory.getLog(Axis2RequestResponseTransport.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private Response response;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/Axis2WebServiceContainer.java Fri Apr 25 12:11:52 2008
@@ -62,8 +62,8 @@
import org.apache.axis2.transport.http.TransportHeaders;
import org.apache.axis2.transport.http.util.RESTUtil;
import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.axis2.client.Axis2ConfigGBean;
import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
import org.apache.geronimo.jaxws.JAXWSUtils;
@@ -79,7 +79,7 @@
*/
public abstract class Axis2WebServiceContainer implements WebServiceContainer {
- private static final Log LOG = LogFactory.getLog(Axis2WebServiceContainer.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
public static final String REQUEST = Axis2WebServiceContainer.class.getName() + "@Request";
public static final String RESPONSE = Axis2WebServiceContainer.class.getName() + "@Response";
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/AxisServiceGenerator.java Fri Apr 25 12:11:52 2008
@@ -57,8 +57,8 @@
import org.apache.axis2.jaxws.description.builder.converter.JavaClassToDBCConverter;
import org.apache.axis2.jaxws.server.JAXWSMessageReceiver;
import org.apache.axis2.wsdl.WSDLUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.axis2.util.SimpleWSDLLocator;
import org.apache.geronimo.jaxws.JAXWSUtils;
import org.apache.geronimo.jaxws.PortInfo;
@@ -68,7 +68,7 @@
* @version $Rev$ $Date$
*/
public class AxisServiceGenerator {
- private static final Log log = LogFactory.getLog(AxisServiceGenerator.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private MessageReceiver messageReceiver;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/GeronimoHandlerChainBuilder.java Fri Apr 25 12:11:52 2008
@@ -17,8 +17,8 @@
package org.apache.geronimo.axis2;
-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.xbeans.javaee.HandlerChainType;
@@ -33,7 +33,7 @@
* @version $Rev$ $Date$
*/
public class GeronimoHandlerChainBuilder extends AnnotationHandlerChainBuilder {
- private static final Log log = LogFactory.getLog(GeronimoHandlerChainBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private ClassLoader classLoader = null;
private javax.xml.ws.handler.PortInfo portInfo;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java Fri Apr 25 12:11:52 2008
@@ -55,8 +55,8 @@
import javax.xml.transform.stream.StreamResult;
import org.apache.axis2.description.AxisService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.webservices.WebServiceContainer.Request;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -64,7 +64,7 @@
public class WSDLQueryHandler {
- private static final Log LOG = LogFactory.getLog(WSDLQueryHandler.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private Map<String, Definition> mp = new ConcurrentHashMap<String, Definition>();
private Map<String, SchemaReference> smp = new ConcurrentHashMap<String, SchemaReference>();
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ClientConfigurationFactory.java Fri Apr 25 12:11:52 2008
@@ -25,12 +25,12 @@
import org.apache.axis2.jaxws.ClientConfigurationFactory;
import org.apache.axis2.jaxws.util.ClassLoaderUtils;
import org.apache.axis2.jaxws.util.Constants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Axis2ClientConfigurationFactory extends ClientConfigurationFactory {
- private static final Log LOG = LogFactory.getLog(Axis2ClientConfigurationFactory.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private Map<ClassLoader, ConfigurationContext> contextCache =
new Hashtable<ClassLoader, ConfigurationContext>();
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ConfigGBean.java Fri Apr 25 12:11:52 2008
@@ -22,8 +22,8 @@
import org.apache.axis2.jaxws.ClientConfigurationFactory;
import org.apache.axis2.jaxws.description.impl.DescriptionFactoryImpl;
import org.apache.axis2.metadata.registry.MetadataFactoryRegistry;
-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.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -33,7 +33,7 @@
public class Axis2ConfigGBean implements GBeanLifecycle {
- private static final Log LOG = LogFactory.getLog(Axis2ConfigGBean.class);
+ private final static Logger LOG = LoggerFactory.getLogger(Axis2ConfigGBean.class);
private AbstractName moduleName;
private ClassLoader classLoder;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
import javax.xml.ws.handler.HandlerResolver;
import org.apache.axis2.jaxws.context.WebServiceContextImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.axis2.Axis2HandlerResolver;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
@@ -42,7 +42,7 @@
*/
public class Axis2ServiceReference extends JAXWSServiceReference {
- private static final Log LOG = LogFactory.getLog(Axis2ServiceReference.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
public Axis2ServiceReference(String serviceClassName,
String referenceClassName,
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainer.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import org.apache.axis2.jaxws.server.endpoint.lifecycle.factory.EndpointLifecycleManagerFactory;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.HTTPTransportUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.axis2.Axis2WebServiceContainer;
import org.apache.geronimo.jaxws.JAXWSAnnotationProcessor;
import org.apache.geronimo.jaxws.PortInfo;
@@ -42,7 +42,7 @@
*/
public class POJOWebServiceContainer extends Axis2WebServiceContainer {
- private static final Log LOG = LogFactory.getLog(POJOWebServiceContainer.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private Object endpointInstance;
private String contextRoot;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/pojo/POJOWebServiceContainerFactoryGBean.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/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.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -42,7 +42,7 @@
*/
public class POJOWebServiceContainerFactoryGBean implements WebServiceContainerFactory {
- private static final Log LOG = LogFactory.getLog(POJOWebServiceContainerFactoryGBean.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private final ClassLoader classLoader;
private final org.apache.geronimo.jaxws.PortInfo portInfo;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleWSDLLocator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleWSDLLocator.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleWSDLLocator.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleWSDLLocator.java Fri Apr 25 12:11:52 2008
@@ -23,13 +23,13 @@
import javax.wsdl.xml.WSDLLocator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
public class SimpleWSDLLocator implements WSDLLocator {
- private static final Log LOG = LogFactory.getLog(SimpleWSDLLocator.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
private String baseURI;
private String lastImportLocation;
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Fri Apr 25 12:11:52 2008
@@ -35,8 +35,8 @@
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.client.AppClientContainer;
import org.apache.geronimo.client.StaticJndiContextPlugin;
import org.apache.geronimo.common.DeploymentException;
@@ -105,7 +105,7 @@
* @version $Rev:385232 $ $Date$
*/
public class AppClientModuleBuilder implements ModuleBuilder, CorbaGBeanNameSource, GBeanLifecycle {
- private static final Log log = LogFactory.getLog(AppClientModuleBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final String LINE_SEP = System.getProperty("line.separator");
private static final String GERAPPCLIENT_NAMESPACE = GerApplicationClientDocument.type.getDocumentElementName().getNamespaceURI();
private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/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/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.clustering.Cluster;
import org.apache.geronimo.clustering.Node;
import org.apache.geronimo.clustering.Session;
@@ -58,7 +58,7 @@
* @version $Rev$ $Date$
*/
public class BasicWADISessionManager implements GBeanLifecycle, SessionManager, WADISessionManager {
- private static final Log log = LogFactory.getLog(BasicWADISessionManager.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
protected final ClassLoader cl;
private final WADICluster cluster;
@@ -133,7 +133,7 @@
try {
serviceSpace.stop();
} catch (Exception e) {
- log.error(e);
+ log.error("Failed to stop", e);
}
}
Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
import java.net.URI;
import java.util.Collections;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.clustering.LocalNode;
import org.apache.geronimo.clustering.Node;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -44,7 +44,7 @@
* @version $Rev$ $Date$
*/
public class TribesDispatcherHolder implements GBeanLifecycle, DispatcherHolder {
- private static final Log log = LogFactory.getLog(TribesDispatcherHolder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final URI endPointURI;
private final String clusterName;
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationController.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
package org.apache.geronimo.farm.deployment;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.farm.config.ClusterInfo;
import org.apache.geronimo.farm.config.NodeInfo;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -38,7 +38,7 @@
*/
@GBean(j2eeType=BasicClusterConfigurationController.GBEAN_J2EE_TYPE)
public class BasicClusterConfigurationController implements GBeanLifecycle, ClusterConfigurationController {
- private static final Log log = LogFactory.getLog(BasicClusterConfigurationController.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ClusterInfo clusterInfo;
private final String nodeName;
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicClusterConfigurationStoreClient.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import java.util.Collection;
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.deployment.plugin.remote.FileUploadClient;
import org.apache.geronimo.deployment.plugin.remote.FileUploadProgress;
import org.apache.geronimo.deployment.plugin.remote.FileUploadServletClient;
@@ -47,7 +47,7 @@
* @version $Rev:$ $Date:$
*/
public class BasicClusterConfigurationStoreClient implements ClusterConfigurationStoreClient {
- private static final Log log = LogFactory.getLog(BasicClusterConfigurationStoreClient.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final String[] METHOD_SIGNATURE_INSTALL =
new String[] {ConfigurationData.class.getName(), File.class.getName()};
Modified: geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import java.util.List;
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.farm.config.ClusterInfo;
import org.apache.geronimo.farm.config.NodeInfo;
import org.apache.geronimo.gbean.AbstractName;
@@ -60,7 +60,7 @@
*/
@GBean(j2eeType=MasterConfigurationStore.GBEAN_J2EE_TYPE)
public class MasterConfigurationStore implements ConfigurationStore {
- private static final Log log = LogFactory.getLog(MasterConfigurationStore.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final ConfigurationStore delegate;
private final Environment defaultEnvironment;
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.naming.Reference;
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.common.UnresolvedReferenceException;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -66,7 +66,7 @@
* @version $Rev$ $Date$
*/
public class AdminObjectRefBuilder extends AbstractNamingBuilder {
- private final static Log log = LogFactory.getLog(AdminObjectRefBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final QNameSet adminOjbectRefQNameSet;
private final QNameSet messageDestinationQNameSet;
private final QNameSet messageDestinationRefQNameSet;
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Fri Apr 25 12:11:52 2008
@@ -40,8 +40,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.common.propertyeditor.PropertyEditors;
import org.apache.geronimo.connector.ActivationSpecWrapperGBean;
@@ -127,7 +127,7 @@
* @version $Rev:385659 $ $Date$
*/
public class ConnectorModuleBuilder implements ModuleBuilder, ActivationSpecInfoLocator, GBeanLifecycle {
- private final static Log log = LogFactory.getLog(ConnectorModuleBuilder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final QName RESOURCE_ADAPTER_VERSION = new QName(SchemaConversionUtils.J2EE_NAMESPACE, "resourceadapter-version");
private static QName CONNECTOR_QNAME = GerConnectorDocument.type.getDocumentElementName();
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java Fri Apr 25 12:11:52 2008
@@ -23,15 +23,15 @@
import org.apache.geronimo.xbeans.geronimo.GerConnectionDefinitionType;
import org.apache.geronimo.xbeans.geronimo.GerConnectiondefinitionInstanceType;
import org.apache.xmlbeans.XmlCursor;
-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 ConnectorPlanRectifier {
- private static final Log log = LogFactory.getLog(ConnectorPlanRectifier.class);
+ private static final Logger log = LoggerFactory.getLogger(ConnectorPlanRectifier.class);
private static final QName VERSION_QNAME = new QName("", "version");
private static final QName GLOBAL_JNDI_NAME_QNAME = new QName(ConnectorModuleBuilder.GERCONNECTOR_NAMESPACE, "global-jndi-name");
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
import javax.resource.ResourceException;
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.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -78,7 +78,7 @@
*/
public class ResourceRefBuilder extends AbstractNamingBuilder implements ResourceEnvironmentSetter {
- private static final Log log = LogFactory.getLog(ResourceRefBuilder.class);
+ private static final Logger log = LoggerFactory.getLogger(ResourceRefBuilder.class);
private static final QName GER_RESOURCE_REF_QNAME = GerResourceRefDocument.type.getDocumentElementName();
private static final QNameSet GER_RESOURCE_REF_QNAME_SET = QNameSet.singleton(GER_RESOURCE_REF_QNAME);
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/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/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java Fri Apr 25 12:11:52 2008
@@ -29,8 +29,8 @@
import javax.resource.ResourceException;
import javax.sql.DataSource;
-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.naming.ResourceSource;
@@ -42,7 +42,7 @@
public class DatabaseInitializationGBean {
- private static final Log log = LogFactory.getLog(DatabaseInitializationGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public DatabaseInitializationGBean(String testSQL, String path, ResourceSource<ResourceException> cfSource, ClassLoader classLoader) throws Exception {
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import javax.resource.spi.ManagedConnectionFactory;
import javax.resource.spi.ResourceAdapterAssociation;
-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.ResourceAdapterWrapper;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.DynamicGBean;
@@ -42,7 +42,7 @@
*/
public class ManagedConnectionFactoryWrapper implements GBeanLifecycle, DynamicGBean, JCAManagedConnectionFactory, ResourceSource<ResourceException> {
- private static final Log log = LogFactory.getLog(ManagedConnectionFactoryWrapper.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final String managedConnectionFactoryClass;
private final String connectionFactoryInterface;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Fri Apr 25 12:11:52 2008
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-taglib</artifactId>
- <version>${plutoVersion}</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/AJPHandler.java Fri Apr 25 12:11:52 2008
@@ -22,8 +22,8 @@
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.management.geronimo.NetworkConnector;
@@ -36,7 +36,7 @@
* @version $Rev$ $Date$
*/
public class AJPHandler extends BaseApacheHandler {
- private final static Log log = LogFactory.getLog(AJPHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public AJPHandler() {
super(AJP_MODE, "/WEB-INF/view/apache/jk/ajpPort.jsp");
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/WebAppHandler.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.console.util.ConfigurationData;
import org.apache.geronimo.console.util.PortletManager;
@@ -37,7 +37,7 @@
* @version $Rev$ $Date$
*/
public class WebAppHandler extends BaseApacheHandler {
- private final static Log log = LogFactory.getLog(WebAppHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public WebAppHandler() {
super(WEB_APP_MODE, "/WEB-INF/view/apache/jk/webApps.jsp");
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/BaseCAHandler.java Fri Apr 25 12:11:52 2008
@@ -21,8 +21,8 @@
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageAbstractHandler;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.console.util.PortletManager;
@@ -38,7 +38,7 @@
* @version $Rev$ $Date$
*/
public abstract class BaseCAHandler extends MultiPageAbstractHandler {
- private final static Log log = LogFactory.getLog(BaseCAHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
protected static final String INDEX_MODE = "index";
protected static final String SETUPCA_MODE = "setupCA";
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
import org.apache.geronimo.crypto.CaUtils;
@@ -43,7 +43,7 @@
* @version $Rev$ $Date$
*/
public class CADetailsHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(CADetailsHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public CADetailsHandler() {
super(CADETAILS_MODE, "/WEB-INF/view/ca/caDetails.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java Fri Apr 25 12:11:52 2008
@@ -31,8 +31,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
@@ -42,7 +42,7 @@
* @version $Rev$ $Date$
*/
public class CertReqDetailsHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(CertReqDetailsHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public CertReqDetailsHandler() {
super(CERT_REQ_DETAILS_MODE, "/WEB-INF/view/ca/certReqDetails.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java Fri Apr 25 12:11:52 2008
@@ -31,8 +31,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.gbean.AbstractName;
@@ -55,7 +55,7 @@
* @version $Rev$ $Date$
*/
public class ConfirmCAHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(ConfirmCAHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ConfirmCAHandler() {
super(CONFIRM_CA_MODE, "/WEB-INF/view/ca/confirmCA.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
import javax.portlet.RenderResponse;
import javax.security.auth.x500.X500Principal;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
import org.apache.geronimo.crypto.CaUtils;
@@ -47,7 +47,7 @@
* @version $Rev$ $Date$
*/
public class ConfirmClientCertHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(ConfirmClientCertHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ConfirmClientCertHandler() {
super(CONFIRM_CLIENT_CERT_MODE, "/WEB-INF/view/ca/confirmClientCert.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
@@ -36,7 +36,7 @@
* @version $Rev$ $Date$
*/
public class IntroHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(IntroHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public IntroHandler() {
super(INDEX_MODE, "/WEB-INF/view/ca/index.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificateRequestStore;
import org.apache.geronimo.crypto.CaUtils;
@@ -41,7 +41,7 @@
* @version $Rev$ $Date$
*/
public class ListRequestsIssueHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(ListRequestsIssueHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ListRequestsIssueHandler() {
super(LIST_REQUESTS_ISSUE_MODE, "/WEB-INF/view/ca/listRequestsIssue.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificateRequestStore;
import org.apache.geronimo.crypto.CaUtils;
@@ -41,7 +41,7 @@
* @version $Rev$ $Date$
*/
public class ListRequestsVerifyHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(ListRequestsVerifyHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ListRequestsVerifyHandler() {
super(LIST_REQUESTS_VERIFY_MODE, "/WEB-INF/view/ca/listRequestsVerify.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.crypto.CaUtils;
@@ -37,7 +37,7 @@
* @version $Rev$ $Date$
*/
public class ProcessCSRHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(ProcessCSRHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ProcessCSRHandler() {
super(PROCESS_CSR_MODE, "/WEB-INF/view/ca/processCSR.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java Fri Apr 25 12:11:52 2008
@@ -31,8 +31,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
/**
@@ -41,7 +41,7 @@
* @version $Rev$ $Date$
*/
public class SetupCAHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(SetupCAHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public SetupCAHandler() {
super(SETUPCA_MODE, "/WEB-INF/view/ca/setupCA.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
@@ -36,7 +36,7 @@
* @version $Rev$ $Date$
*/
public class UnlockCAHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(UnlockCAHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public UnlockCAHandler() {
super(UNLOCKCA_MODE, "/WEB-INF/view/ca/unlockCA.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java Fri Apr 25 12:11:52 2008
@@ -31,8 +31,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.CertificationAuthority;
import org.apache.geronimo.crypto.CertificateUtil;
@@ -43,7 +43,7 @@
* @version $Rev$ $Date$
*/
public class ViewCertificateHandler extends BaseCAHandler {
- private final static Log log = LogFactory.getLog(ViewCertificateHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ViewCertificateHandler() {
super(VIEW_CERT_MODE, "/WEB-INF/view/ca/viewCertificate.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/BaseKeystoreHandler.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageAbstractHandler;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.KeystoreException;
@@ -44,7 +44,7 @@
* @version $Rev$ $Date$
*/
public abstract class BaseKeystoreHandler extends MultiPageAbstractHandler {
- private final static Log log = LogFactory.getLog(BaseKeystoreHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(BaseKeystoreHandler.class);
protected static final String KEYSTORE_DATA_PREFIX="org.apache.geronimo.keystore.";
protected static final String LIST_MODE = "list";
protected static final String UNLOCK_KEYSTORE_FOR_EDITING = "unlockEdit";
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.console.keystores;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import javax.portlet.ActionRequest;
@@ -33,7 +33,7 @@
* @version $Rev$ $Date$
*/
public class ChangePasswordHandler extends BaseKeystoreHandler {
- private final static Log log = LogFactory.getLog(ChangePasswordHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ChangePasswordHandler() {
super(CHANGE_PASSWORD, "/WEB-INF/view/keystore/changePassword.jsp");
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmCertificateHandler.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.console.keystores;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.KeystoreException;
import org.apache.geronimo.crypto.CertificateUtil;
@@ -44,7 +44,7 @@
* @version $Rev$ $Date$
*/
public class ConfirmCertificateHandler extends BaseKeystoreHandler {
- private final static Log log = LogFactory.getLog(ConfirmCertificateHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ConfirmCertificateHandler() {
super(CONFIRM_CERTIFICATE, "/WEB-INF/view/keystore/confirmCertificate.jsp");
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmKeyHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmKeyHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmKeyHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ConfirmKeyHandler.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.console.keystores;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.KeystoreException;
@@ -38,7 +38,7 @@
* @version $Rev$ $Date$
*/
public class ConfirmKeyHandler extends BaseKeystoreHandler {
- private final static Log log = LogFactory.getLog(ConfirmKeyHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ConfirmKeyHandler() {
super(CONFIRM_KEY, "/WEB-INF/view/keystore/confirmKey.jsp");
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.console.keystores;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.management.geronimo.KeystoreException;
@@ -34,7 +34,7 @@
* @version $Rev$ $Date$
*/
public class EditKeystoreHandler extends BaseKeystoreHandler {
- private final static Log log = LogFactory.getLog(EditKeystoreHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public EditKeystoreHandler() {
super(UNLOCK_KEYSTORE_FOR_EDITING, "/WEB-INF/view/keystore/unlockKeystore.jsp");
}