You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/05/04 16:52:51 UTC
svn commit: r399719 [1/3] - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
codegen/src/org/apache/axis2/wsdl/codegen/
codegen/src/org/apache/axis2/wsd...
Author: dims
Date: Thu May 4 07:52:32 2006
New Revision: 399719
URL: http://svn.apache.org/viewcvs?rev=399719&view=rev
Log:
fix Log (mis)use
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Loader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisSOAPServlet.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleConnectionThread.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/OptionsParser.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/ModuleHandler1.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/handlers/Handler2.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseRuleTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/registry/Handler3.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/sample/handlers/LoggingHandler.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/ESRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/GSRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/KSRoun2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4rRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4s4c2Round2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4s4cRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/SPJRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/SunRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/WMRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/util/XMLComparatorInterop.java
webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/MessageComparator.java
webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAP12TestClient.java
webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/client/SOAPCreater.java
webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/server/SimpleServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextEnabledEcho.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageWithServerTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SpeakingHandler1.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java
webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf2/PerfPortTypeTest.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/bytecode/ParamNameExtractor.java
webservices/axis2/trunk/java/modules/jibx/test/org/apache/axis2/jibx/Echo.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
webservices/axis2/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/STSMessageReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/PolicyEngineData.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/AlgorithmSuiteProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/AsymmetricBindingProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/EncryptedPartsElementsProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/EndorsingSupportingTokensProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/InitiatorRecipientTokenProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/LayoutProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/SignEncProtectTokenProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/SignedEndorsingSupportingTokensProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/SignedPartsElementsProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/SignedSupportingTokensProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/SupportingTokensProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/SymmetricBindingProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/TransportBindingProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/Trust10Processor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/UsernameTokenProcessor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/Wss10Processor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/Wss11Processor.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/processors/X509TokenProcessor.java
webservices/axis2/trunk/java/modules/soapmonitor/src/org/apache/axis2/soapmonitor/servlet/SOAPMonitorService.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java Thu May 4 07:52:32 2006
@@ -32,6 +32,6 @@
protected String anonymousURI = Final.WSA_ANONYMOUS_URL; // defaulting to final version
- protected Log logger = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AddressingHandler.class);
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Thu May 4 07:52:32 2006
@@ -31,6 +31,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.util.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -43,6 +46,9 @@
private static final long serialVersionUID = 3907988439637261572L;
private OMNamespace addressingNSObject;
+ private static final Log log = LogFactory.getLog(AddressingInHandler.class);
+
+
public void invoke(MessageContext msgContext) throws AxisFault {
String namespace = addressingNamespace;
@@ -61,7 +67,9 @@
return;
}
- logger.debug("Starting " + addressingVersion + " IN handler ...");
+ if(log.isDebugEnabled()) {
+ log.debug("Starting " + addressingVersion + " IN handler ...");
+ }
ArrayList addressingHeaders;
addressingHeaders = header.getHeaderBlocksWithNSURI(namespace);
@@ -69,11 +77,15 @@
msgContext.setProperty(WS_ADDRESSING_VERSION, namespace);
msgContext.setProperty(Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.FALSE);
addressingNSObject = ((OMElement) addressingHeaders.get(0)).findNamespace(namespace, "");
- logger.debug(addressingVersion + " Headers present in the SOAP message. Starting to process ...");
+ if(log.isDebugEnabled()) {
+ log.debug(addressingVersion + " Headers present in the SOAP message. Starting to process ...");
+ }
extractAddressingInformation(header, msgContext, addressingHeaders, namespace);
} else {
msgContext.setProperty(Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.TRUE);
- logger.debug("No Headers present corresponding to " + addressingVersion);
+ if(log.isDebugEnabled()) {
+ log.debug("No Headers present corresponding to " + addressingVersion);
+ }
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Thu May 4 07:52:32 2006
@@ -46,7 +46,7 @@
private static final long serialVersionUID = -2623986992336863995L;
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AddressingOutHandler.class);
public void invoke(MessageContext msgContext) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java Thu May 4 07:52:32 2006
@@ -33,7 +33,7 @@
import java.util.Map;
public class AddressingInHandlerTest extends TestCase {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AddressingInHandlerTest.class);
AddressingInHandler inHandler;
TestUtil testUtil = new TestUtil();
private static final String testFileName = "soapmessage.xml";
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Thu May 4 07:52:32 2006
@@ -46,7 +46,7 @@
import java.util.Map;
public class CodeGenerationEngine {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(CodeGenerationEngine.class);
private List extensions = new ArrayList();
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Thu May 4 07:52:32 2006
@@ -125,7 +125,7 @@
}
//~--- fields -------------------------------------------------------------
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AxisServiceBasedMultiLanguageEmitter.class);
protected URIResolver resolver;
private Map infoHolder;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java Thu May 4 07:52:32 2006
@@ -22,7 +22,7 @@
public abstract class AbstractCodeGenerationExtension implements CodeGenExtension {
- protected Log log = LogFactory.getLog(this.getClass());
+ private static final Log log = LogFactory.getLog(AbstractCodeGenerationExtension.class);
protected CodeGenConfiguration configuration;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java Thu May 4 07:52:32 2006
@@ -35,7 +35,7 @@
public abstract class ClassWriter {
- private static Log log = LogFactory.getLog(ClassWriter.class);
+ private static final Log log = LogFactory.getLog(ClassWriter.class);
protected File outputFileLocation = null;
protected File outputFile = null;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java Thu May 4 07:52:32 2006
@@ -28,7 +28,7 @@
* Tidies up the java source code using Jalopy.
*/
public class PrettyPrinter {
- private static Log log = LogFactory.getLog(PrettyPrinter.class);
+ private static final Log log = LogFactory.getLog(PrettyPrinter.class);
/**
Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/ProjectResourceBundle.java Thu May 4 07:52:32 2006
@@ -47,8 +47,7 @@
* Argument values are specified in the various overloaded getString() methods.</p>
*/
public class ProjectResourceBundle extends ResourceBundle {
- protected static Log log =
- LogFactory.getLog(ProjectResourceBundle.class.getName());
+ private static final Log log = LogFactory.getLog(ProjectResourceBundle.class);
// The static cache of ResourceBundles.
Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Loader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Loader.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Loader.java (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Loader.java Thu May 4 07:52:32 2006
@@ -27,7 +27,7 @@
* Loads resources (or images) from various sources.
*/
public class Loader {
- private static Log log = LogFactory.getLog(Loader.class.getName());
+ private static final Log log = LogFactory.getLog(Loader.class);
/**
* Searches for <code>resource</code> in different
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Thu May 4 07:52:32 2006
@@ -40,7 +40,7 @@
*/
public class ConfigurationContext extends AbstractContext {
- protected Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(ConfigurationContext.class);
/**
* Map containing <code>MessageID</code> to
* <code>OperationContext</code> mapping.
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java Thu May 4 07:52:32 2006
@@ -12,6 +12,7 @@
import org.apache.axis2.modules.Module;
import org.apache.axis2.transport.TransportSender;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
import java.net.URL;
import java.util.Collection;
@@ -20,6 +21,8 @@
public class ConfigurationContextFactory {
+ protected static final Log log = LogFactory.getLog(ConfigurationContextFactory.class);
+
/**
* Creates a AxisConfiguration depending on the user requirment.
* First creates an AxisConfigurator object with appropriate parameters.
@@ -151,8 +154,7 @@
try {
sender.init(configContext, transportOut);
} catch (AxisFault axisFault) {
- LogFactory.getLog(ConfigurationContextFactory.class)
- .info(Messages.getMessage("transportiniterror", transportOut.getName().getLocalPart()));
+ log.info(Messages.getMessage("transportiniterror", transportOut.getName().getLocalPart()));
}
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java Thu May 4 07:52:32 2006
@@ -37,7 +37,7 @@
private transient HashMap serviceContextMap = new HashMap();
private transient HashMap serviceGroupContextMap = new HashMap();
private transient String cookieID;
- protected transient final Log log = LogFactory.getLog(SessionContext.class);
+ private static final Log log = LogFactory.getLog(SessionContext.class);
// current time out interval is 30 secs. Need to make this configurable
public transient long sessionContextTimeoutInterval = 30 * 1000;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java Thu May 4 07:52:32 2006
@@ -36,6 +36,8 @@
import org.apache.axis2.phaseresolver.PhaseException;
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.TransportSender;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -45,6 +47,8 @@
import java.util.Iterator;
public class AxisConfigBuilder extends DescriptionBuilder {
+
+ protected static final Log log = LogFactory.getLog(AxisConfigBuilder.class);
private DeploymentEngine engine;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Thu May 4 07:52:32 2006
@@ -49,7 +49,7 @@
public class DeploymentEngine implements DeploymentConstants {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(DeploymentEngine.class);
private boolean hotUpdate = true; // to do hot update or not
private boolean hotDeployment = true; // to do hot deployment or not
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Thu May 4 07:52:32 2006
@@ -56,7 +56,7 @@
*/
public class DescriptionBuilder implements DeploymentConstants {
- protected Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(DescriptionBuilder.class);
protected AxisConfiguration axisConfig;
protected InputStream descriptionStream;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java Thu May 4 07:52:32 2006
@@ -33,7 +33,7 @@
public class FileSystemConfigurator implements AxisConfigurator {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(FileSystemConfigurator.class);
/**
* To check whether need to create a service side or client side
*/
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java Thu May 4 07:52:32 2006
@@ -1,209 +1,209 @@
-/*
-* Copyright 2004,2005 The Apache Software Foundation.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-
-package org.apache.axis2.deployment;
-
-import org.apache.axis2.deployment.repository.util.ArchiveFileData;
-import org.apache.axis2.deployment.repository.util.WSInfoList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-
-public class RepositoryListener implements DeploymentConstants {
- protected Log log = LogFactory.getLog(getClass());
- private DeploymentEngine deploymentEngine;
- private File rootDir;
-
- /**
- * The parent directory of the modules and services directories
- */
-
- /**
- * Reference to a WSInfoList
- */
- private WSInfoList wsInfoList;
-
- /**
- * This constructor takes two arguments, a folder name and a reference to Deployment Engine
- * First, it initializes the system, by loading all the modules in the /modules directory
- * and then creates a WSInfoList to store information about available modules and services.
- *
- * @param folderName path to parent directory that the listener should listen to
- * @param deploymentEngine reference to engine registry for updates
- */
- public RepositoryListener(String folderName, DeploymentEngine deploymentEngine) {
- rootDir = new File(folderName);
- wsInfoList = new WSInfoList(deploymentEngine);
- this.deploymentEngine = deploymentEngine;
- init();
- loadClassPathModules();
- }
-
- //The constructor , which loads moduls from class path
- public RepositoryListener(DeploymentEngine deploymentEngine) {
- this.deploymentEngine = deploymentEngine;
- wsInfoList = new WSInfoList(deploymentEngine);
- loadClassPathModules();
- }
-
- /**
- * Finds a list of modules in the folder and adds to wsInfoList.
- */
- public void checkModules() {
- File root = new File(rootDir, MODULE_PATH);
- File[] files = root.listFiles();
-
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- File file = files[i];
- if (isSourceControlDir(file)) {
- continue;
- }
- if (!file.isDirectory()) {
- if (ArchiveFileData.isModuleArchiveFile(file.getName())) {
- wsInfoList.addWSInfoItem(file, TYPE_MODULE);
- }
- } else {
- if (!"lib".equalsIgnoreCase(file.getName())) {
- wsInfoList.addWSInfoItem(file, TYPE_MODULE);
- }
- }
- }
- }
- }
-
-
- private boolean isSourceControlDir(File file) {
- if (file.isDirectory()) {
- String name = file.getName();
- if (name.equalsIgnoreCase("CVS") || name.equalsIgnoreCase(".svn")) {
- return true;
- }
- }
- return false;
- }
-
- private void loadClassPathModules() {
- String classPath = getLocation();
- int lstindex = classPath.lastIndexOf(File.separatorChar);
- if (lstindex > 0) {
- classPath = classPath.substring(0, lstindex);
- } else {
- classPath = ".";
- }
- File root = new File(classPath);
- File[] files = root.listFiles();
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- File file = files[i];
- if (!file.isDirectory()) {
- if (ArchiveFileData.isModuleArchiveFile(file.getName())) {
- //adding moduls in the class path
- wsInfoList.addWSInfoItem(file, TYPE_MODULE);
- }
- }
- }
- }
- deploymentEngine.doDeploy();
- }
-
- /**
- * To get the location of the Axis2.jar from that I can drive the location of class path
- *
- * @return String (location of the axis2 jar)
- */
- private String getLocation() {
- try {
- Class clazz = Class.forName("org.apache.axis2.engine.AxisEngine");
- java.net.URL url = clazz.getProtectionDomain().getCodeSource().getLocation();
- String location = url.toString();
- if (location.startsWith("jar")) {
- url = ((java.net.JarURLConnection) url.openConnection()).getJarFileURL();
- location = url.toString();
- }
- if (location.startsWith("file")) {
- java.io.File file = new java.io.File(url.getFile());
- return file.getAbsolutePath();
- } else {
- return url.toString();
- }
- } catch (Throwable t) {
- return "an unknown location";
- }
- }
-
- /**
- * Finds a list of services in the folder and adds to wsInfoList.
- */
- public void checkServices() {
- findServicesInDirectory();
- update();
- }
-
- /**
- * First initializes the WSInfoList, then calls checkModule to load all the modules
- * and calls update() to update the Deployment engine and engine registry.
- */
- public void init() {
- wsInfoList.init();
- checkModules();
- deploymentEngine.doDeploy();
- }
-
- /**
- * Searches a given folder for jar files and adds them to a list in the
- * WSInfolist class.
- */
- private void findServicesInDirectory() {
- File root = new File(rootDir, SERVICE_PATH);
- File[] files = root.listFiles();
-
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- File file = files[i];
- if (isSourceControlDir(file)) {
- continue;
- }
- if (!file.isDirectory()) {
- if (ArchiveFileData.isServiceArchiveFile(file.getName())) {
- wsInfoList.addWSInfoItem(file, TYPE_SERVICE);
- }
- } else {
- if (!"lib".equalsIgnoreCase(file.getName())) {
- wsInfoList.addWSInfoItem(file, TYPE_SERVICE);
- }
- }
- }
- }
- }
-
- /**
- * Method invoked from the scheduler to start the listener.
- */
- public void startListener() {
- checkServices();
- update();
- }
-
- /**
- * Updates WSInfoList object.
- */
- public void update() {
- wsInfoList.update();
- }
-}
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+package org.apache.axis2.deployment;
+
+import org.apache.axis2.deployment.repository.util.ArchiveFileData;
+import org.apache.axis2.deployment.repository.util.WSInfoList;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.io.File;
+
+public class RepositoryListener implements DeploymentConstants {
+ private static final Log log = LogFactory.getLog(RepositoryListener.class);
+ private DeploymentEngine deploymentEngine;
+ private File rootDir;
+
+ /**
+ * The parent directory of the modules and services directories
+ */
+
+ /**
+ * Reference to a WSInfoList
+ */
+ private WSInfoList wsInfoList;
+
+ /**
+ * This constructor takes two arguments, a folder name and a reference to Deployment Engine
+ * First, it initializes the system, by loading all the modules in the /modules directory
+ * and then creates a WSInfoList to store information about available modules and services.
+ *
+ * @param folderName path to parent directory that the listener should listen to
+ * @param deploymentEngine reference to engine registry for updates
+ */
+ public RepositoryListener(String folderName, DeploymentEngine deploymentEngine) {
+ rootDir = new File(folderName);
+ wsInfoList = new WSInfoList(deploymentEngine);
+ this.deploymentEngine = deploymentEngine;
+ init();
+ loadClassPathModules();
+ }
+
+ //The constructor , which loads moduls from class path
+ public RepositoryListener(DeploymentEngine deploymentEngine) {
+ this.deploymentEngine = deploymentEngine;
+ wsInfoList = new WSInfoList(deploymentEngine);
+ loadClassPathModules();
+ }
+
+ /**
+ * Finds a list of modules in the folder and adds to wsInfoList.
+ */
+ public void checkModules() {
+ File root = new File(rootDir, MODULE_PATH);
+ File[] files = root.listFiles();
+
+ if (files != null) {
+ for (int i = 0; i < files.length; i++) {
+ File file = files[i];
+ if (isSourceControlDir(file)) {
+ continue;
+ }
+ if (!file.isDirectory()) {
+ if (ArchiveFileData.isModuleArchiveFile(file.getName())) {
+ wsInfoList.addWSInfoItem(file, TYPE_MODULE);
+ }
+ } else {
+ if (!"lib".equalsIgnoreCase(file.getName())) {
+ wsInfoList.addWSInfoItem(file, TYPE_MODULE);
+ }
+ }
+ }
+ }
+ }
+
+
+ private boolean isSourceControlDir(File file) {
+ if (file.isDirectory()) {
+ String name = file.getName();
+ if (name.equalsIgnoreCase("CVS") || name.equalsIgnoreCase(".svn")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void loadClassPathModules() {
+ String classPath = getLocation();
+ int lstindex = classPath.lastIndexOf(File.separatorChar);
+ if (lstindex > 0) {
+ classPath = classPath.substring(0, lstindex);
+ } else {
+ classPath = ".";
+ }
+ File root = new File(classPath);
+ File[] files = root.listFiles();
+ if (files != null) {
+ for (int i = 0; i < files.length; i++) {
+ File file = files[i];
+ if (!file.isDirectory()) {
+ if (ArchiveFileData.isModuleArchiveFile(file.getName())) {
+ //adding moduls in the class path
+ wsInfoList.addWSInfoItem(file, TYPE_MODULE);
+ }
+ }
+ }
+ }
+ deploymentEngine.doDeploy();
+ }
+
+ /**
+ * To get the location of the Axis2.jar from that I can drive the location of class path
+ *
+ * @return String (location of the axis2 jar)
+ */
+ private String getLocation() {
+ try {
+ Class clazz = Class.forName("org.apache.axis2.engine.AxisEngine");
+ java.net.URL url = clazz.getProtectionDomain().getCodeSource().getLocation();
+ String location = url.toString();
+ if (location.startsWith("jar")) {
+ url = ((java.net.JarURLConnection) url.openConnection()).getJarFileURL();
+ location = url.toString();
+ }
+ if (location.startsWith("file")) {
+ java.io.File file = new java.io.File(url.getFile());
+ return file.getAbsolutePath();
+ } else {
+ return url.toString();
+ }
+ } catch (Throwable t) {
+ return "an unknown location";
+ }
+ }
+
+ /**
+ * Finds a list of services in the folder and adds to wsInfoList.
+ */
+ public void checkServices() {
+ findServicesInDirectory();
+ update();
+ }
+
+ /**
+ * First initializes the WSInfoList, then calls checkModule to load all the modules
+ * and calls update() to update the Deployment engine and engine registry.
+ */
+ public void init() {
+ wsInfoList.init();
+ checkModules();
+ deploymentEngine.doDeploy();
+ }
+
+ /**
+ * Searches a given folder for jar files and adds them to a list in the
+ * WSInfolist class.
+ */
+ private void findServicesInDirectory() {
+ File root = new File(rootDir, SERVICE_PATH);
+ File[] files = root.listFiles();
+
+ if (files != null) {
+ for (int i = 0; i < files.length; i++) {
+ File file = files[i];
+ if (isSourceControlDir(file)) {
+ continue;
+ }
+ if (!file.isDirectory()) {
+ if (ArchiveFileData.isServiceArchiveFile(file.getName())) {
+ wsInfoList.addWSInfoItem(file, TYPE_SERVICE);
+ }
+ } else {
+ if (!"lib".equalsIgnoreCase(file.getName())) {
+ wsInfoList.addWSInfoItem(file, TYPE_SERVICE);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Method invoked from the scheduler to start the listener.
+ */
+ public void startListener() {
+ checkServices();
+ update();
+ }
+
+ /**
+ * Updates WSInfoList object.
+ */
+ public void update() {
+ wsInfoList.update();
+ }
+}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Thu May 4 07:52:32 2006
@@ -30,6 +30,9 @@
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.ws.java2wsdl.Java2WSDLConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import java.io.InputStream;
@@ -42,6 +45,7 @@
* Builds a service description from OM
*/
public class ServiceBuilder extends DescriptionBuilder {
+ private static final Log log = LogFactory.getLog(ServiceBuilder.class);
private AxisService service;
public ServiceBuilder(AxisConfiguration axisConfig, AxisService service) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java Thu May 4 07:52:32 2006
@@ -31,7 +31,7 @@
public class URLBasedAxisConfigurator implements AxisConfigurator {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(URLBasedAxisConfigurator.class);
private URL axis2xml;
private URL repositoy;
private DeploymentEngine deploymentEngine;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Thu May 4 07:52:32 2006
@@ -33,7 +33,7 @@
public class WarBasedAxisConfigurator implements AxisConfigurator {
private AxisConfiguration axisConfig;
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(WarBasedAxisConfigurator.class);
private ServletConfig config;
private DeploymentEngine deploymentEngine;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Thu May 4 07:52:32 2006
@@ -40,7 +40,7 @@
import java.util.zip.ZipInputStream;
public class ArchiveReader implements DeploymentConstants {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(ArchiveReader.class);
private ArrayList buildServiceGroup(InputStream zin, DeploymentEngine engine,
AxisServiceGroup axisServiceGroup, HashMap wsdlServices,
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java Thu May 4 07:52:32 2006
@@ -28,7 +28,7 @@
public static final String STYLE_RPC = "rpc";
public static final String STYLE_MSG = "msg";
public static final String STYLE_DOC = "doc";
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AxisOperation.class);
private int mep = MEP_CONSTANT_INVALID;
public static final String SOAP_ACTION = "soapaction";
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Thu May 4 07:52:32 2006
@@ -64,7 +64,7 @@
public class AxisService extends AxisDescription {
private int nsCount = 0;
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AxisService.class);
private URL fileName;
private HashMap operationsAliasesMap = null;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java Thu May 4 07:52:32 2006
@@ -32,7 +32,7 @@
public class AxisServiceGroup extends AxisDescription {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AxisServiceGroup.class);
// to store module ref at deploy time parsing
private ArrayList modulesList = new ArrayList();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java Thu May 4 07:52:32 2006
@@ -42,7 +42,7 @@
* Field NAME
*/
public static final QName NAME = new QName("http://ws.apache.org/axis2/", "AbstractDispatcher");
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AbstractDispatcher.class);
public AbstractDispatcher() {
init(new HandlerDescription(NAME));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Thu May 4 07:52:32 2006
@@ -46,7 +46,7 @@
*/
public static final QName NAME = new QName("http://ws.apache.org/axis2/",
"AddressingBasedDispatcher");
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AddressingBasedDispatcher.class);
// TODO this logic needed to be improved, as the Dispatching is almost guaranteed to fail
public AxisOperation findOperation(AxisService service, MessageContext messageContext)
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Thu May 4 07:52:32 2006
@@ -36,7 +36,7 @@
*/
public class AxisConfiguration extends AxisDescription {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AxisConfiguration.class);
/**
* Field modules
*/
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Thu May 4 07:52:32 2006
@@ -53,7 +53,7 @@
/**
* Field log
*/
- private static final Log log = LogFactory.getLog(AxisEngine.class);
+ private static final Log log = LogFactory.getLog(AxisEngine.class);
private ConfigurationContext engineContext;
/**
@@ -637,7 +637,6 @@
* way transport.
*/
private class TransportNonBlockingInvocationWorker implements Runnable {
- private Log log = LogFactory.getLog(getClass());
private MessageContext msgctx;
private TransportSender sender;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java Thu May 4 07:52:32 2006
@@ -37,7 +37,7 @@
public class ListenerManager {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(ListenerManager.class);
public static ConfigurationContext defaultConfigurationContext;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java Thu May 4 07:52:32 2006
@@ -62,7 +62,7 @@
/**
* Field log
*/
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(Phase.class);
/**
* Field handlers
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java Thu May 4 07:52:32 2006
@@ -41,7 +41,7 @@
*/
public static final QName NAME = new QName("http://ws.apache.org/axis2/",
"RequestURIBasedDispatcher");
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(RequestURIBasedDispatcher.class);
String serviceName = null;
QName operationName = null;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java Thu May 4 07:52:32 2006
@@ -39,7 +39,7 @@
*/
public static final QName NAME = new QName("http://ws.apache.org/axis2/",
"SOAPActionBasedDispatcher");
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(SOAPActionBasedDispatcher.class);
public AxisOperation findOperation(AxisService service, MessageContext messageContext)
throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java Thu May 4 07:52:32 2006
@@ -43,7 +43,7 @@
*/
public static final QName NAME = new QName("http://ws.apache.org/axis2/",
"SOAPMessageBodyBasedDispatcher");
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(SOAPMessageBodyBasedDispatcher.class);
String serviceName = null;
QName operationName = null;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInMessageReceiver.java Thu May 4 07:52:32 2006
@@ -26,7 +26,7 @@
* This is takes care of the IN-OUT sync MEP in the server side
*/
public abstract class AbstractInMessageReceiver extends AbstractMessageReceiver {
- protected Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AbstractInMessageReceiver.class);
public abstract void invokeBusinessLogic(MessageContext inMessage) throws AxisFault;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractInOutAsyncMessageReceiver.java Thu May 4 07:52:32 2006
@@ -28,7 +28,7 @@
* This is takes care of the IN-OUT sync MEP in the server side
*/
public abstract class AbstractInOutAsyncMessageReceiver extends AbstractMessageReceiver {
- protected Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AbstractInOutAsyncMessageReceiver.class);
public abstract void invokeBusinessLogic(MessageContext inMessage,
MessageContext outMessage) throws AxisFault;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractRobustInMessageReceiver.java Thu May 4 07:52:32 2006
@@ -26,7 +26,7 @@
* This is takes care of the IN-OUT sync MEP in the server side
*/
public abstract class AbstractRobustInMessageReceiver extends AbstractMessageReceiver {
- protected Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AbstractRobustInMessageReceiver.class);
public abstract void invokeBusinessLogic(MessageContext inMessage) throws AxisFault;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java Thu May 4 07:52:32 2006
@@ -38,7 +38,7 @@
/**
* Field log
*/
- protected Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(RawXMLINOnlyMessageReceiver.class);
/**
* Field scope
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Thu May 4 07:52:32 2006
@@ -41,7 +41,7 @@
/**
* Field log
*/
- protected Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(RawXMLINOutMessageReceiver.class);
/**
* Constructor RawXMLProvider
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java Thu May 4 07:52:32 2006
@@ -41,7 +41,7 @@
protected static final String DEFAULT_INDEX_JSP = "index.jsp";
private static final String METHOD_PREFIX = "process";
- private static final Log log = LogFactory.getLog(AbstractAgent.class);
+ private static final Log log = LogFactory.getLog(AbstractAgent.class);
protected transient Map operationCache = new HashMap();
protected transient ConfigurationContext configContext;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractHTTPSender.java Thu May 4 07:52:32 2006
@@ -45,7 +45,7 @@
protected static final String PROXY_PORT = "proxy_port";
protected boolean chunked = false;
protected String httpVersion = HTTPConstants.HEADER_PROTOCOL_11;
- protected Log log = LogFactory.getLog(getClass().getName());
+ private static final Log log = LogFactory.getLog(AbstractHTTPSender.class);
int soTimeout = HTTPConstants.DEFAULT_SO_TIMEOUT;
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisSOAPServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisSOAPServlet.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisSOAPServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisSOAPServlet.java Thu May 4 07:52:32 2006
@@ -19,7 +19,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.AxisFault;
-import org.apache.log4j.Logger;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -32,7 +34,7 @@
*
*/
public class AxisSOAPServlet extends AxisServlet {
- private Logger log = Logger.getLogger(AxisSOAPServlet.class);
+ private static final Log log = LogFactory.getLog(AxisSOAPServlet.class);
protected void doGet(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) throws ServletException, IOException {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Thu May 4 07:52:32 2006
@@ -52,7 +52,7 @@
*/
public class AxisServlet extends HttpServlet implements TransportListener {
- private transient Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AxisServlet.class);
private static final long serialVersionUID = -2085869393709833372L;
public static final String CONFIGURATION_CONTEXT = "CONFIGURATION_CONTEXT";
public static final String SESSION_ID = "SessionId";
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Thu May 4 07:52:32 2006
@@ -55,7 +55,7 @@
* proxydiscription
*/
protected TransportOutDescription proxyOutSetting = null;
- protected Log log = LogFactory.getLog(getClass().getName());
+ private static final Log log = LogFactory.getLog(CommonsHTTPTransportSender.class);
protected String httpVersion = HTTPConstants.HEADER_PROTOCOL_11;
private boolean chunked = false;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java Thu May 4 07:52:32 2006
@@ -48,7 +48,7 @@
public class HTTPWorker implements HttpRequestHandler {
- protected Log log = LogFactory.getLog(getClass().getName());
+ private static final Log log = LogFactory.getLog(HTTPWorker.class);
private ConfigurationContext configurationContext;
// to store session object
private Hashtable sessionContextTable = new Hashtable();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/RESTSender.java Thu May 4 07:52:32 2006
@@ -27,7 +27,7 @@
import java.util.Iterator;
public class RESTSender extends AbstractHTTPSender {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(RESTSender.class);
/*Obtain two strings;one to go in the url and rest to pass in the body
**when doing POST in application/x-www-form-urlencoded form.
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Thu May 4 07:52:32 2006
@@ -52,7 +52,7 @@
/**
* Field log
*/
- protected static Log log = LogFactory.getLog(SimpleHTTPServer.class.getName());
+ private static final Log log = LogFactory.getLog(SimpleHTTPServer.class);
/**
* Embedded commons http client based server
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleConnectionThread.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleConnectionThread.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleConnectionThread.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleConnectionThread.java Thu May 4 07:52:32 2006
@@ -40,8 +40,7 @@
* Simple HTTP connection thread.
*/
public class SimpleConnectionThread implements Runnable {
- private static final Log log =
- LogFactory.getLog(SimpleConnectionThread.class);
+ private static final Log log = LogFactory.getLog(SimpleConnectionThread.class);
public static final String DEFAULT_CONTENT_CHARSET = "ISO-8859-1";
private SimpleHttpServerConnection conn = null;
private SimpleConnSet connpool = null;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java Thu May 4 07:52:32 2006
@@ -44,7 +44,7 @@
* A simple, but extensible HTTP server, mostly for testing purposes.
*/
public class SimpleHttpServer implements Runnable {
- private static final Log LOG = LogFactory.getLog(SimpleHttpServer.class);
+ private static final Log log = LogFactory.getLog(SimpleHttpServer.class);
private String testname = "Simple test";
private ServerSocket listener = null;
private long count = 0;
@@ -120,8 +120,8 @@
this.threadPool = threadPool;
listener = socketfactory.createServerSocket(port);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Starting test HTTP server on port " + getLocalPort());
+ if (log.isDebugEnabled()) {
+ log.debug("Starting test HTTP server on port " + getLocalPort());
}
t = new Thread(this);
@@ -138,8 +138,8 @@
this.stopped = true;
- if (LOG.isDebugEnabled()) {
- LOG.debug("Stopping test HTTP server on port " + getLocalPort());
+ if (log.isDebugEnabled()) {
+ log.debug("Stopping test HTTP server on port " + getLocalPort());
}
t.interrupt();
@@ -172,7 +172,7 @@
this.threadPool.execute(new SimpleConnectionThread(this.testname + " thread "
+ this.count, conn, this.connectionsPool, this.requestHandler));
} catch (IOException e) {
- LOG.debug("I/O error: " + e.getMessage());
+ log.debug("I/O error: " + e.getMessage());
}
this.count++;
@@ -182,7 +182,7 @@
}
catch (IOException e) {
if (!stopped) {
- LOG.debug("I/O error: " + e.getMessage());
+ log.debug("I/O error: " + e.getMessage());
}
} finally {
destroy();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorFactory.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorFactory.java Thu May 4 07:52:32 2006
@@ -32,7 +32,7 @@
* JMSConnector from an existing pool of connectors.
*/
public abstract class JMSConnectorFactory {
- protected static Log log = LogFactory.getLog(JMSConnectorFactory.class.getName());
+ private static final Log log = LogFactory.getLog(JMSConnectorFactory.class);
/**
* Static method to create a client connector. Client connectors cannot
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java Thu May 4 07:52:32 2006
@@ -30,8 +30,7 @@
* vendor adapters to support the reuse of JMS connections.
*/
public class JMSConnectorManager {
- protected static Log log =
- LogFactory.getLog(JMSConnectorManager.class.getName());
+ private static final Log log = LogFactory.getLog(JMSConnectorManager.class);
private static JMSConnectorManager s_instance = new JMSConnectorManager();
private static HashMap vendorConnectorPools = new HashMap();
private int DEFAULT_WAIT_FOR_SHUTDOWN = 90000; // 1.5 minutes
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java Thu May 4 07:52:32 2006
@@ -50,7 +50,7 @@
private static final long serialVersionUID = -3883554138407525394L;
- protected static Log log = LogFactory.getLog(JMSSender.class.getName());
+ private static final Log log = LogFactory.getLog(JMSSender.class);
HashMap params = new HashMap();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java Thu May 4 07:52:32 2006
@@ -53,7 +53,7 @@
* for production code, but for demos, debugging, and performance profiling.
*/
public class SimpleJMSListener implements MessageListener, TransportListener {
- protected static Log log = LogFactory.getLog(SimpleJMSListener.class.getName());
+ private static final Log log = LogFactory.getLog(SimpleJMSListener.class);
// Do we use (multiple) threads to process incoming messages?
private boolean doThreads = true;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java?rev=399719&r1=399718&r2=399719&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java Thu May 4 07:52:32 2006
@@ -56,7 +56,7 @@
* the server, and sends back response msg to the replyTo destination.
*/
public class SimpleJMSWorker implements Runnable {
- protected static Log log = LogFactory.getLog(SimpleJMSWorker.class.getName());
+ private static final Log log = LogFactory.getLog(SimpleJMSWorker.class);
private ConfigurationContext configurationContext;
SimpleJMSListener listener;
BytesMessage message;