You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2008/06/24 13:07:10 UTC
svn commit: r671127 [1/8] - in /webservices/axis2/trunk/java: ./
modules/addressing/ modules/clustering/
modules/clustering/test/org/apache/axis2/clustering/ modules/integration/
modules/integration/test-resources/deployment/ modules/integration/test/o...
Author: deepal
Date: Tue Jun 24 04:07:03 2008
New Revision: 671127
URL: http://svn.apache.org/viewvc?rev=671127&view=rev
Log:
as we discussed in the mailing list I did the first step of moving transports into a separate module
Added:
webservices/axis2/trunk/java/modules/integration/test-resources/deployment/server-transport.xml (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server-transport.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/AbstractTestCase.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/LifecycleTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TransportDeploymentTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSave2Test.java
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSave2Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSaveTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSaveTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OptionsSaveTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/FaultSerializationTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/SendingResponseFaultTest.java (contents, props changed)
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/SendingResponseFaultTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java
- copied, changed from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/NonProxyHostTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TestServletRequest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TransportHeadersTest.java
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/exculeRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/moduleDisEngegeRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/repositories/moduleLoadTest/axis2.xml
webservices/axis2/trunk/java/modules/transports/
webservices/axis2/trunk/java/modules/transports/pom.xml
webservices/axis2/trunk/java/modules/transports/src/
webservices/axis2/trunk/java/modules/transports/src/org/
webservices/axis2/trunk/java/modules/transports/src/org/apache/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AbstractAgent.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AdminAgent.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AxisAdminServlet.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AxisRequestEntity.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/CommonsTransportHeaders.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/CustomListener.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/HTTPSender.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/HTTPWorkerFactory.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/HttpTransportProperties.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/ProxyConfiguration.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/RESTRequestEntity.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/RESTRequestEntity2.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/TransportHeaders.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/AxisHttpConnection.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/AxisHttpRequest.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/AxisHttpRequestImpl.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/AxisHttpResponse.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/AxisHttpService.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/AxisParams.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/ConnectionListenerFailureHandler.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/DefaultConnectionListenerFailureHandler.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/HttpConnectionManager.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/HttpFactory.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/HttpUtils.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/IOProcessor.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/IOProcessorCallback.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/SessionManager.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/Worker.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/server/WorkerFactory.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/util/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/util/RESTUtil.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/jms/JMSConstants.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/local/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/local/LocalResponder.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/local/LocalResponseTransportOutDescription.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/local/LocalTransportSender.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/tcp/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/tcp/TCPServer.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/tcp/TCPWorker.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/XMPPListener.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/XMPPSender.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/util/
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/util/XMPPClientSidePacketListener.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/util/XMPPConnectionFactory.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/util/XMPPConstants.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/util/XMPPOutTransportInfo.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/util/XMPPServerCredentials.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/xmpp/util/XMPPUtils.java
Removed:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AdminAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisAdminServlet.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisRequestEntity.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsTransportHeaders.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CustomListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorkerFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HttpTransportProperties.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ProxyConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/TransportHeaders.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server-transport.xml
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/LocalTestCase.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/LifecycleTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSave2Test.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OptionsSaveTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/FaultSerializationTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/SendingResponseFaultTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/NonProxyHostTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/TransportHeadersTest.java
Modified:
webservices/axis2/trunk/java/modules/addressing/pom.xml
webservices/axis2/trunk/java/modules/clustering/pom.xml
webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java
webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java
webservices/axis2/trunk/java/modules/integration/itest-build.xml
webservices/axis2/trunk/java/modules/integration/pom.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml
webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/soapaction/server/SOAPActionTestsMessageReceiver.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointCallback.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
webservices/axis2/trunk/java/modules/jibx/pom.xml
webservices/axis2/trunk/java/modules/json/pom.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/axis2_a.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleDisengagementTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ModuleLoadingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationExcludeTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SOAPRoleConfigurationTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/SameServiceAddingTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/ServiceGroupTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/ParameterEditTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/description/WSDLToAllServicesBuilderTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ModuleEngageTest.java
webservices/axis2/trunk/java/modules/osgi/pom.xml
webservices/axis2/trunk/java/modules/saaj/pom.xml
webservices/axis2/trunk/java/pom.xml
Modified: webservices/axis2/trunk/java/modules/addressing/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/pom.xml?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/pom.xml Tue Jun 24 04:07:03 2008
@@ -38,6 +38,12 @@
<artifactId>axis2-kernel</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transports</artifactId>
+ <version>${version}</version>
+ </dependency>
+
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
Modified: webservices/axis2/trunk/java/modules/clustering/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/pom.xml?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/clustering/pom.xml Tue Jun 24 04:07:03 2008
@@ -38,6 +38,11 @@
<artifactId>axis2-kernel</artifactId>
<version>${version}</version>
</dependency>
+<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transports</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tribes</artifactId>
Modified: webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java Tue Jun 24 04:07:03 2008
@@ -29,7 +29,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.http.server.HttpUtils;
+import org.apache.axis2.util.Utils;
public abstract class ClusterManagerTestCase extends TestCase {
@@ -88,7 +88,7 @@
axisConfiguration2.addServiceGroup(serviceGroup2);
//Initiating ClusterManagers
- System.setProperty(ClusteringConstants.LOCAL_IP_ADDRESS, HttpUtils.getIpAddress());
+ System.setProperty(ClusteringConstants.LOCAL_IP_ADDRESS, Utils.getIpAddress());
try {
clusterManager1.init();
System.out.println("ClusterManager-1 successfully initialized");
Modified: webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ContextReplicationTest.java Tue Jun 24 04:07:03 2008
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.util.Utils;
import org.apache.axis2.clustering.configuration.ConfigurationManager;
import org.apache.axis2.clustering.configuration.DefaultConfigurationManager;
import org.apache.axis2.clustering.configuration.DefaultConfigurationManagerListener;
@@ -37,7 +38,6 @@
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.http.server.HttpUtils;
import java.io.IOException;
import java.net.DatagramPacket;
@@ -190,7 +190,7 @@
return;
}
- System.setProperty(ClusteringConstants.LOCAL_IP_ADDRESS, HttpUtils.getIpAddress());
+ System.setProperty(ClusteringConstants.LOCAL_IP_ADDRESS, Utils.getIpAddress());
// First cluster
configurationContext1 =
Modified: webservices/axis2/trunk/java/modules/integration/itest-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/itest-build.xml?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-build.xml Tue Jun 24 04:07:03 2008
@@ -270,12 +270,16 @@
<!-- Test with target resolver -->
<mkdir dir="target/test-resources/deployment_repo"/>
+ <mkdir dir="target/test-resources/deployment"/>
<mkdir dir="target/test-resources/deployment_repo/conf"/>
<mkdir dir="target/test-resources/deployment_repo/services"/>
<mkdir dir="target/test-resources/deployment_repo/modules"/>
- <copy file="test-resources/deployment/deployment.both.axis2.xml"
+ <copy file="test-resources/deployment/server-transport.xml"
+ tofile="target/test-resources/deployment/server-transport.xml"/>
+<copy file="test-resources/deployment/deployment.both.axis2.xml"
tofile="target/test-resources/deployment_repo/conf/axis2.xml"/>
+
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/deployment_repo/modules/addressing-${addressing_version}.mar"/>
Modified: webservices/axis2/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/pom.xml?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/pom.xml Tue Jun 24 04:07:03 2008
@@ -43,6 +43,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transports</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
Copied: webservices/axis2/trunk/java/modules/integration/test-resources/deployment/server-transport.xml (from r670446, webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server-transport.xml)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/deployment/server-transport.xml?p2=webservices/axis2/trunk/java/modules/integration/test-resources/deployment/server-transport.xml&p1=webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/server-transport.xml&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/integration/test-resources/deployment/server-transport.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/AbstractTestCase.java?rev=671127&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/AbstractTestCase.java (added)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/AbstractTestCase.java Tue Jun 24 04:07:03 2008
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.axis2;
+
+import junit.framework.TestCase;
+
+import java.io.File;
+
+/**
+ * Abstract base class for test cases.
+ */
+public abstract class AbstractTestCase
+ extends TestCase {
+ protected String testDir = "test" + File.separator;
+ protected String sampleDir = "samples" + File.separator;
+ protected String outDir = "target" + File.separator + "generated" +
+ File.separator +
+ "samples" +
+ File.separator;
+ protected String tempDir = "target" + File.separator + "generated" +
+ File.separator +
+ "temp";
+ protected String testResourceDir = "test-resources";
+
+
+ /**
+ * Basedir for all file I/O. Important when running tests from
+ * the reactor. Note that anyone can use this statically.
+ */
+ public static String basedir;
+
+ static {
+ basedir = System.getProperty("basedir");
+ if (basedir == null) {
+ basedir = new File(".").getAbsolutePath();
+ }
+ }
+
+ /**
+ * @param testName
+ */
+ public AbstractTestCase(String testName) {
+ super(testName);
+ testDir = new File(basedir, testDir).getAbsolutePath();
+ sampleDir = new File(basedir, sampleDir).getAbsolutePath();
+ outDir = new File(basedir, outDir).getAbsolutePath();
+ tempDir = new File(basedir, tempDir).getAbsolutePath();
+ }
+
+
+ public File getTestResourceFile(String relativePath) {
+ return new File(testResourceDir, relativePath);
+ }
+}
+
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/LifecycleTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/LifecycleTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/LifecycleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java Tue Jun 24 04:07:03 2008
@@ -21,7 +21,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.LocalTestCase;
+import org.apache.axis2.integration.LocalTestCase;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.service.Lifecycle;
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/LifecycleTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TransportDeploymentTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TransportDeploymentTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TransportDeploymentTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/TransportDeploymentTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/deployment/TransportDeploymentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EnginePausingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Tue Jun 24 04:07:03 2008
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -37,7 +38,9 @@
import javax.xml.namespace.QName;
-public class EngineWithoutPhaseResolvingTest extends AbstractEngineTest {
+import junit.framework.TestCase;
+
+public class EngineWithoutPhaseResolvingTest extends TestCase {
private MessageContext mc;
private QName serviceName = new QName("axis2/services/NullService");
private QName operationName = new QName("NullOperation");
@@ -97,8 +100,16 @@
public void testServerReceive() throws Exception {
mc.setTo(
new EndpointReference("axis2/services/NullService"));
- AxisEngine engine = new AxisEngine(configContext);
mc.setServerSide(true);
- engine.receive(mc);
+ AxisEngine.receive(mc);
+ }
+
+ public class NullMessageReceiver extends AbstractInOutSyncMessageReceiver {
+
+ public void invokeBusinessLogic(MessageContext inMessage,
+ MessageContext outMessage)
+ throws AxisFault {
+
+ }
}
}
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextChangeTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java Tue Jun 24 04:07:03 2008
@@ -109,10 +109,10 @@
new FieldDescription("boolean", "reconcileAxisMessage"),
new FieldDescription("boolean", "executedPhasesReset"),
new FieldDescription("java.lang.String", "selfManagedDataDelimiter"),
- new FieldDescription("java.lang.Class",
- new String[] {"class$org$apache$axis2$context$MessageContext","class$0"}),
- new FieldDescription("java.lang.Class",
- new String[] {"class$org$apache$axis2$context$SelfManagedDataManager","class$1"}),
+// new FieldDescription("java.lang.Class",
+// new String[] {"class$org$apache$axis2$context$MessageContext","class$0"}),
+// new FieldDescription("java.lang.Class",
+// new String[] {"class$org$apache$axis2$context$SelfManagedDataManager","class$1"}),
new FieldDescription("java.lang.Exception", "failureReason"),
};
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java Tue Jun 24 04:07:03 2008
@@ -304,15 +304,14 @@
public void testReceive() throws Exception {
- AxisEngine engine = new AxisEngine(configurationContext);
log.debug(
"MessageContextSaveATest:testReceive(): start - - engine.receive(mc) - - - - - - - - - - - - - - - -");
- engine.receive(mc);
+ AxisEngine.receive(mc);
log.debug(
"MessageContextSaveATest:testReceive(): resume - - engine.resume(mc) - - - - - - - - - - - - - - - -");
- engine.resume(mc);
+ AxisEngine.resume(mc);
assertEquals(30, executedHandlers.size());
for (int i = 15; i < 30; i++) {
@@ -361,7 +360,7 @@
// -------------------------------------------------------------------
log.debug(
"MessageContextSaveATest:testReceive(): resume - - engine.resume(mc) - - - - - - - - - - - - - - - -");
- engine.resume(mc);
+ AxisEngine.resume(mc);
assertEquals(35, executedHandlers.size());
for (int i = 31; i < 35; i++) {
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveATest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveBTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java Tue Jun 24 04:07:03 2008
@@ -553,7 +553,6 @@
public void testServiceProperties() throws Exception {
String title = "MessageContextSaveBTest: testServiceProperties(): ";
- AxisEngine engine = new AxisEngine(configurationContext);
MessageContext mc = msgCtx_1_1;
@@ -566,7 +565,7 @@
showProperties(properties_original, "original properties");
log.debug(title + "start - - engine.receive(mc) - - - - - - - - - - - - - - - -");
- engine.receive(mc);
+ AxisEngine.receive(mc);
// get the service level properties into a separate table
Map properties2 = new HashMap(getServiceProperties(restoredMessageContext));
@@ -578,7 +577,7 @@
// resume the paused message context
log.debug(title + "resume - - engine.resume(mc) - - - - - - - - - - - - - - - -");
- engine.resume(restoredMessageContext);
+ AxisEngine.resume(restoredMessageContext);
// get the service level properties into a separate table
Map properties3 = new HashMap(getServiceProperties(restoredMessageContext));
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveBTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveCTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java Tue Jun 24 04:07:03 2008
@@ -547,7 +547,6 @@
public void testHierarchyNewContext() throws Exception {
String title = "MessageContextSaveCTest:testHierarchyNewContext(): ";
- AxisEngine engineSave = new AxisEngine(saveConfigurationContext);
MessageContext mc = msgCtx_A1_2_save;
OperationContext oc = mc.getOperationContext();
@@ -557,7 +556,7 @@
// run the message through the message processing
// this causes the message context to get saved
log.debug(title + "- - - Save the message context from the engine - - - -");
- engineSave.receive(mc);
+ AxisEngine.receive(mc);
LinkedHashMap original_object_graph = getObjectGraphInfo(mc);
log.debug(title + "*** Originial object graph ****");
@@ -565,7 +564,6 @@
log.debug(title +
"- - - Restore the message context on a separate engine - - - - - - - - - - - - - - - -");
- AxisEngine engineRestore = new AxisEngine(restoreConfigurationContext);
MessageContext mc2 = restoreMessageContext(persistentStore, restoreConfigurationContext);
LinkedHashMap restored_object_graph = getObjectGraphInfo(mc2);
@@ -584,7 +582,7 @@
// but doesn't have the Context objects
log.debug(title +
"- - - Resume the restored message context - - - - - - - - - - - - - - - -");
- engineRestore.resume(mc2);
+ AxisEngine.resume(mc2);
LinkedHashMap resumed_object_graph = getObjectGraphInfo(mc2);
log.debug(title + "*** Post Resumed object graph ****");
@@ -607,14 +605,13 @@
public void testHierarchyReuse() throws Exception {
String title = "MessageContextSaveCTest:testHierarchyReuse(): ";
- AxisEngine engineSave = new AxisEngine(saveConfigurationContext);
MessageContext mc = msgCtx_A1_1_save;
// run the message through the message processing
// this causes the message context to get saved
log.debug(title + "- - - Save the message context from the engine - - - -");
- engineSave.receive(mc);
+ AxisEngine.receive(mc);
LinkedHashMap original_object_graph = getObjectGraphInfo(mc);
log.debug(title + "*** Originial object graph ****");
@@ -622,7 +619,6 @@
log.debug(title +
"- - - Restore the message context on a separate engine - - - - - - - - - - - - - - - -");
- AxisEngine engineEquiv = new AxisEngine(equivConfigurationContext);
MessageContext mc2 = restoreMessageContext(persistentStore, equivConfigurationContext);
LinkedHashMap restored_object_graph = getObjectGraphInfo(mc2);
@@ -651,7 +647,7 @@
// and save has the Service-level Context objects
log.debug(title +
"- - - Resume the restored message context - - - - - - - - - - - - - - - -");
- engineEquiv.resume(mc2);
+ AxisEngine.resume(mc2);
LinkedHashMap resumed_object_graph = getObjectGraphInfo(mc2);
log.debug(title + "*** Post Resumed object graph ****");
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSaveCTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Tue Jun 24 04:07:03 2008
@@ -348,8 +348,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
@@ -384,8 +383,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
e.printStackTrace();
@@ -413,8 +411,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
e.printStackTrace();
@@ -440,8 +437,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
e.printStackTrace();
@@ -469,8 +465,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
e.printStackTrace();
@@ -497,8 +492,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
@@ -558,8 +552,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
e.printStackTrace();
@@ -647,8 +640,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
e.printStackTrace();
@@ -676,8 +668,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
@@ -707,8 +698,7 @@
mc.setTo(new EndpointReference("axis2/services/NullService"));
mc.setWSAAction("DummyOp");
- AxisEngine engine = new AxisEngine(cfgContext);
- engine.receive(mc);
+ AxisEngine.receive(mc);
}
catch (Exception e) {
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSave2Test.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSave2Test.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSave2Test.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSave2Test.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSave2Test.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSaveTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSaveTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSaveTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSaveTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/ObjectSaveTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ObjectSaveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OperationContextSaveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OptionsSaveTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OptionsSaveTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OptionsSaveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java Tue Jun 24 04:07:03 2008
@@ -392,7 +392,6 @@
try {
System.out.println("Worker thread started");
Thread.sleep(5000);
- AxisEngine axisEngine = new AxisEngine(configurationContext);
FileInputStream inStream = null;
ObjectInputStream objectInputStream = null;
@@ -442,7 +441,7 @@
if (reconstitutedMessageContext != null) {
System.out.println("Worker thread resuming message context");
- axisEngine.resume(reconstitutedMessageContext);
+ AxisEngine.resume(reconstitutedMessageContext);
} else {
fail("An error occurred in the worker thread - no message context");
}
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/FaultSerializationTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/FaultSerializationTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/SendingResponseFaultTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/SendingResponseFaultTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/SendingResponseFaultTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/SendingResponseFaultTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/SendingResponseFaultTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/faults/SendingResponseFaultTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/SendingResponseFaultTest.java Tue Jun 24 04:07:03 2008
@@ -23,7 +23,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.LocalTestCase;
+import org.apache.axis2.integration.LocalTestCase;
import org.apache.axis2.client.ServiceClient;
import javax.xml.namespace.QName;
Propchange: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/faults/SendingResponseFaultTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java Tue Jun 24 04:07:03 2008
@@ -55,12 +55,15 @@
/** Our client ConfigurationContext */
protected ConfigurationContext clientCtx;
+ protected ConfigurationContext serverCtx;
+
LocalTransportSender sender = new LocalTransportSender();
protected void setUp() throws Exception {
// Configuration - server side
- serverConfig = ConfigurationContextFactory.
- createConfigurationContextFromFileSystem(null).getAxisConfiguration();
+ serverCtx = ConfigurationContextFactory.
+ createConfigurationContextFromFileSystem(null);
+ serverConfig = serverCtx.getAxisConfiguration();
LocalTransportReceiver.CONFIG_CONTEXT = new ConfigurationContext(serverConfig);
LocalTransportReceiver.CONFIG_CONTEXT.setServicePath("services");
LocalTransportReceiver.CONFIG_CONTEXT.setContextRoot("local:/");
@@ -132,6 +135,39 @@
}
/**
+ * Deploy a class as a service.
+ *
+ * @param name the service name
+ * @param myClass the Java class to deploy (all methods exposed by default)
+ * @return a fully configured AxisService, already deployed into the server
+ * @throws Exception in case of problems
+ */
+ /**
+ * Deploy a class as a service.
+ *
+ * @param name the service name
+ * @param myClass the Java class to deploy (all methods exposed by default)
+ * @param scope the service scope
+ * @return a fully configured AxisService, already deployed into the server
+ * @throws Exception in case of problems
+ */
+ protected AxisService deployClassAsService(String name, Class myClass, String scope)
+ throws Exception {
+ AxisService service = new AxisService(name);
+ if (scope != null) service.setScope(scope);
+
+ service.addParameter(Constants.SERVICE_CLASS,
+ myClass.getName());
+
+ Utils.fillAxisService(service, serverConfig, null, null);
+
+ serverCtx.deployService(service);
+ return service;
+ }
+
+
+
+ /**
* Get a pre-initialized ServiceClient set up to talk to our local
* server. If you want to set options, call this and then use getOptions()
* on the return.
@@ -160,7 +196,7 @@
client.setOptions(opts);
return client;
}
-
+
/**
* Get a pre-initialized ServiceClient set up to talk to our local
* server. If you want to set options, call this and then use getOptions()
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java Tue Jun 24 04:07:03 2008
@@ -238,14 +238,13 @@
try {
System.out.println("MessageSaveAndRestoreWithMTOMTest:Worker thread started");
Thread.sleep(5000);
- AxisEngine axisEngine = new AxisEngine(configurationContext);
System.out.println("MessageSaveAndRestoreWithMTOMTest:Resuming processing");
ObjectInputStream objectInputStream =
new ObjectInputStream(new ByteArrayInputStream(serializedMessageContext));
MessageContext reconstitutedMessageContext =
(MessageContext)objectInputStream.readObject();
reconstitutedMessageContext.activate(configurationContext);
- axisEngine.resume(reconstitutedMessageContext);
+ AxisEngine.resume(reconstitutedMessageContext);
}
catch (Exception e) {
e.printStackTrace();
Copied: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java (from r670446, webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/NonProxyHostTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java?p2=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java&p1=webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/NonProxyHostTest.java&r1=670446&r2=671127&rev=671127&view=diff
==============================================================================
(empty)
Added: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TestServletRequest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TestServletRequest.java?rev=671127&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TestServletRequest.java (added)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TestServletRequest.java Tue Jun 24 04:07:03 2008
@@ -0,0 +1,268 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.axis2.transport.http;
+
+import junit.framework.TestCase;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.Map;
+
+/*
+ * Note that ONLY the methods used by TransportHeaders are implemented!
+ */
+class TestServletRequest implements HttpServletRequest {
+
+ private Hashtable headers = null;
+
+ TestServletRequest() {
+ headers = new Hashtable();
+ headers.put("header1", "h1Value");
+ headers.put("header2", "h2Value");
+ headers.put("header3", "h3Value");
+ }
+
+
+ public int getRemotePort() {
+ return 0;
+ }
+
+ public String getLocalAddr() {
+ return null;
+ }
+
+ public String getLocalName() {
+ return null;
+ }
+
+ public int getLocalPort() {
+ return 0;
+ }
+
+ public String getAuthType() {
+ return null;
+ }
+
+ public String getContextPath() {
+ return null;
+ }
+
+ public Cookie[] getCookies() {
+ return null;
+ }
+
+ public long getDateHeader(String s) {
+ return 0;
+ }
+
+ public String getHeader(String s) {
+ return (String) headers.get(s);
+ }
+
+ public Enumeration getHeaderNames() {
+ return headers.keys();
+ }
+
+ public Enumeration getHeaders(String s) {
+ return null;
+ }
+
+ public int getIntHeader(String s) {
+ return 0;
+ }
+
+ public String getMethod() {
+ return null;
+ }
+
+ public String getPathInfo() {
+ return null;
+ }
+
+ public String getPathTranslated() {
+ return null;
+ }
+
+ public String getQueryString() {
+ return null;
+ }
+
+ public String getRemoteUser() {
+ return null;
+ }
+
+ public String getRequestURI() {
+ return null;
+ }
+
+ public StringBuffer getRequestURL() {
+ return null;
+ }
+
+ public String getRequestedSessionId() {
+ return null;
+ }
+
+ public String getServletPath() {
+ return null;
+ }
+
+ public HttpSession getSession() {
+ return null;
+ }
+
+ public HttpSession getSession(boolean flag) {
+ return null;
+ }
+
+ public Principal getUserPrincipal() {
+ return null;
+ }
+
+ public boolean isRequestedSessionIdFromCookie() {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromURL() {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromUrl() {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdValid() {
+ return false;
+ }
+
+ public boolean isUserInRole(String s) {
+ return false;
+ }
+
+ public Object getAttribute(String s) {
+ return null;
+ }
+
+ public Enumeration getAttributeNames() {
+ return null;
+ }
+
+ public String getCharacterEncoding() {
+ return null;
+ }
+
+ public int getContentLength() {
+ return 0;
+ }
+
+ public String getContentType() {
+ return null;
+ }
+
+ public ServletInputStream getInputStream() throws IOException {
+ return null;
+ }
+
+ public Locale getLocale() {
+ return null;
+ }
+
+ public Enumeration getLocales() {
+ return null;
+ }
+
+ public String getParameter(String s) {
+ return null;
+ }
+
+ public Map getParameterMap() {
+ return null;
+ }
+
+ public Enumeration getParameterNames() {
+ return null;
+ }
+
+ public String[] getParameterValues(String s) {
+ return null;
+ }
+
+ public String getProtocol() {
+ return null;
+ }
+
+ public BufferedReader getReader() throws IOException {
+ return null;
+ }
+
+ public String getRealPath(String s) {
+ return null;
+ }
+
+ public String getRemoteAddr() {
+ return null;
+ }
+
+ public String getRemoteHost() {
+ return null;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String s) {
+ return null;
+ }
+
+ public String getScheme() {
+ return null;
+ }
+
+ public String getServerName() {
+ return null;
+ }
+
+ public int getServerPort() {
+ return 0;
+ }
+
+ public boolean isSecure() {
+ return false;
+ }
+
+ public void removeAttribute(String s) {
+
+ }
+
+ public void setAttribute(String s, Object obj) {
+
+ }
+
+ public void setCharacterEncoding(String s) throws UnsupportedEncodingException {
+
+ }
+}
Added: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TransportHeadersTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TransportHeadersTest.java?rev=671127&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TransportHeadersTest.java (added)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/http/TransportHeadersTest.java Tue Jun 24 04:07:03 2008
@@ -0,0 +1,89 @@
+package org.apache.axis2.transport.http;
+
+import junit.framework.TestCase;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+/**
+ *
+ */
+public class TransportHeadersTest extends TestCase {
+
+ public void testServletRequest() {
+ // This just validates that the HttpServletRequest test class below works as expected
+ HttpServletRequest req = new TestServletRequest();
+ assertEquals("h1Value", req.getHeader("header1"));
+ assertEquals("h2Value", req.getHeader("header2"));
+ assertEquals("h3Value", req.getHeader("header3"));
+ assertNull(req.getHeader("newHeader1"));
+ assertNull(req.getHeader("newHeader2"));
+
+ Enumeration headers = req.getHeaderNames();
+ assertNotNull(headers);
+ }
+
+ public void testLocalMap() {
+ HttpServletRequest req = new TestServletRequest();
+ TransportHeaders headers = new TransportHeaders(req);
+ String checkValue = null;
+ assertNull(headers.headerMap);
+ assertNotNull(headers.localHeaderMap);
+ assertTrue(headers.localHeaderMap.isEmpty());
+
+ // Add a header that doesn't exist in the servlet request and make sure it doesn't
+ // populate the headerMap
+ headers.put("newHeader1", "newHeader1Value");
+ checkValue = (String) headers.get("newHeader1");
+ assertNull(headers.headerMap);
+ assertFalse(headers.localHeaderMap.isEmpty());
+ assertEquals(1, headers.localHeaderMap.size());
+ assertEquals("newHeader1Value", checkValue);
+
+ // Add a header that does exist in the servlet request with a new value still shouldn't
+ // populate
+ headers.put("header3", "h3ValueNew");
+ checkValue = (String) headers.get("header3");
+ assertNull(headers.headerMap);
+ assertFalse(headers.localHeaderMap.isEmpty());
+ assertEquals(2, headers.localHeaderMap.size());
+ assertEquals("h3ValueNew", checkValue);
+
+ // Now cause the map to be populated from the servlet request
+ int size = headers.size();
+ assertEquals(4, size);
+ assertNotNull(headers.headerMap);
+ assertNull(headers.localHeaderMap);
+
+ assertEquals("h1Value", (String) headers.get("header1"));
+ assertEquals("h2Value", (String) headers.get("header2"));
+ assertEquals("h3ValueNew", (String) headers.get("header3"));
+ assertEquals("newHeader1Value", (String) headers.get("newHeader1"));
+
+ // Now do another put of a new value and make sure it is put in the newly populated hashmap
+ headers.put("newHeader2", "newHeader2Value");
+ checkValue = (String) headers.get("newHeader2");
+ assertNotNull(headers.headerMap);
+ assertNull(headers.localHeaderMap);
+ size = headers.size();
+ assertEquals(5, size);
+ assertEquals("newHeader2Value", checkValue);
+
+ }
+
+ public void testNoPopulateOnGet() {
+ // Doing a get before a put shouldn't expand the headerMap.
+ HttpServletRequest req = new TestServletRequest();
+ TransportHeaders headers = new TransportHeaders(req);
+ String checkValue = null;
+ assertNull(headers.headerMap);
+ assertNotNull(headers.localHeaderMap);
+ assertTrue(headers.localHeaderMap.isEmpty());
+
+ checkValue = (String) headers.get("header1");
+ assertNotNull(checkValue);
+ assertNull(headers.headerMap);
+ assertNotNull(headers.localHeaderMap);
+ assertEquals("h1Value", checkValue);
+ }
+}
Modified: webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/pom.xml?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/pom.xml Tue Jun 24 04:07:03 2008
@@ -37,6 +37,11 @@
<artifactId>axis2-kernel</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transports</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml Tue Jun 24 04:07:03 2008
@@ -63,6 +63,11 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transports</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
<version>${version}</version>
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/soapaction/server/SOAPActionTestsMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/soapaction/server/SOAPActionTestsMessageReceiver.java?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/soapaction/server/SOAPActionTestsMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/client/soapaction/server/SOAPActionTestsMessageReceiver.java Tue Jun 24 04:07:03 2008
@@ -117,8 +117,7 @@
TestLogger.logger.debug("[server] response message [" + responseEnv.toString() + "]");
response.getOperationContext().addMessageContext(response);
- AxisEngine engine = new AxisEngine(response.getConfigurationContext());
- engine.send(response);
+ AxisEngine.send(response);
}
/*
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointCallback.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointCallback.java?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointCallback.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointCallback.java Tue Jun 24 04:07:03 2008
@@ -60,12 +60,10 @@
axisResponseMsgCtx);
//Create the AxisEngine for the reponse and send it.
- AxisEngine engine =
- new AxisEngine(axisResponseMsgCtx.getConfigurationContext());
if (log.isDebugEnabled()) {
log.debug("Sending async response.");
}
- engine.send(axisResponseMsgCtx);
+ AxisEngine.send(axisResponseMsgCtx);
//This assumes that we are on the ultimate execution thread
ThreadContextMigratorUtil.performContextCleanup(Constants.THREAD_CONTEXT_MIGRATOR_LIST_ID,
@@ -107,9 +105,7 @@
eic.getRequestMessageContext().getAxisMessageContext());
//Create the AxisEngine for the reponse and send it.
- AxisEngine engine =
- new AxisEngine(axisResponseMsgCtx.getConfigurationContext());
- engine.sendFault(axisResponseMsgCtx);
+ AxisEngine.sendFault(axisResponseMsgCtx);
} catch (Throwable t) {
Throwable faultMessage = InvocationHelper.determineMappedException(t, eic);
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java Tue Jun 24 04:07:03 2008
@@ -193,9 +193,7 @@
Constants.THREAD_CONTEXT_MIGRATOR_LIST_ID, axisResponseMsgCtx);
//Create the AxisEngine for the reponse and send it.
- AxisEngine engine =
- new AxisEngine(axisResponseMsgCtx.getConfigurationContext());
- engine.send(axisResponseMsgCtx);
+ AxisEngine.send(axisResponseMsgCtx);
//This assumes that we are on the ultimate execution thread
ThreadContextMigratorUtil.performContextCleanup(
Constants.THREAD_CONTEXT_MIGRATOR_LIST_ID, axisResponseMsgCtx);
Modified: webservices/axis2/trunk/java/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/pom.xml?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/pom.xml Tue Jun 24 04:07:03 2008
@@ -37,6 +37,12 @@
<artifactId>axis2-kernel</artifactId>
<version>${version}</version>
</dependency>
+<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transports</artifactId>
+ <version>${version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
Modified: webservices/axis2/trunk/java/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/pom.xml?rev=671127&r1=671126&r2=671127&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/json/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/json/pom.xml Tue Jun 24 04:07:03 2008
@@ -41,7 +41,14 @@
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</dependency>
+<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transports</artifactId>
+ <version>${version}</version>
+ </dependency>
+
</dependencies>
+
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>