You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ga...@apache.org on 2009/04/03 17:16:43 UTC
svn commit: r761707 - in
/webservices/commons/trunk/modules/transport/modules/tcp: ./ conf/ test/
test/org/ test/org/apache/ test/org/apache/axis2/
test/org/apache/axis2/transport/ test/org/apache/axis2/transport/tcp/
Author: gawor
Date: Fri Apr 3 15:16:42 2009
New Revision: 761707
URL: http://svn.apache.org/viewvc?rev=761707&view=rev
Log:
move some tcp tests from Axis2 to the tcp transport module
Added:
webservices/commons/trunk/modules/transport/modules/tcp/conf/
webservices/commons/trunk/modules/transport/modules/tcp/conf/axis2.xml (with props)
webservices/commons/trunk/modules/transport/modules/tcp/test/
webservices/commons/trunk/modules/transport/modules/tcp/test/org/
webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/
webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/
webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/
webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/
webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/Echo.java (with props)
webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java (contents, props changed)
- copied, changed from r761344, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java (contents, props changed)
- copied, changed from r761344, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java (contents, props changed)
- copied, changed from r761344, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
Modified:
webservices/commons/trunk/modules/transport/modules/tcp/pom.xml
Added: webservices/commons/trunk/modules/transport/modules/tcp/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/conf/axis2.xml?rev=761707&view=auto
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/tcp/conf/axis2.xml (added)
+++ webservices/commons/trunk/modules/transport/modules/tcp/conf/axis2.xml Fri Apr 3 15:16:42 2009
@@ -0,0 +1,249 @@
+<!--
+ ~ 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.
+ -->
+
+<axisconfig name="AxisJava2.0">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">false</parameter>
+ <parameter name="enableMTOM">false</parameter>
+
+ <!--If turned on with use the Accept header of the request to determine the contentType of the
+ response-->
+ <parameter name="httpContentNegotiation">false</parameter>
+
+ <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+ <!--that behaviour.-->
+ <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
+
+ <!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
+ <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
+ <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
+ <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
+ <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
+
+ <!--This is the user name and password of admin console-->
+ <parameter name="userName">admin</parameter>
+ <parameter name="password">axis2</parameter>
+
+ <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
+ <!--ServicesDirectory only works on the following cases-->
+ <!---File based configurator and in that case the value should be a file URL (http:// not allowed)-->
+ <!---When creating URL Based configurator with URL âfile://â -->
+ <!--- War based configurator with expanded case , -->
+
+ <!--All the other scenarios it will be ignored.-->
+ <!--<parameter name="ServicesDirectory">service</parameter>-->
+ <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
+ <!--<parameter name="ModulesDirectory">modules</parameter>-->
+
+ <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
+ <!--root which can configured using the following contextRoot parameter-->
+ <!--<parameter name="contextRoot">axis2</parameter>-->
+
+ <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguish those endpoints-->
+ <!--<parameter name="servicePath">services</parameter>-->
+ <!--<parameter name="restPath">rest</parameter>-->
+
+ <!-- Following parameter will completely disable REST handling in Axis2-->
+ <parameter name="disableREST" locked="false">false</parameter>
+
+ <!--POJO deployer , this will alow users to drop .class file and make that into a service-->
+ <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
+ <deployer extension=".jar" directory="transports" class="org.apache.axis2.deployment.TransportDeployer"/>
+
+ <!-- Following parameter will set the host name for the epr-->
+ <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
+
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!--This is the Default Message Receiver for the system , if you want to have MessageReceivers for -->
+ <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+ <!--any operation -->
+ <!--Note : You can override this for particular service by adding the same element with your requirement-->
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
+ class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
+ class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </messageReceivers>
+
+ <!-- ================================================= -->
+ <!-- Message Formatter -->
+ <!-- ================================================= -->
+ <!--Following content type to message formatter mapping can be used to implement support for different message -->
+ <!--format serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
+ <messageFormatters>
+ <messageFormatter contentType="application/x-www-form-urlencoded"
+ class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+ <messageFormatter contentType="multipart/form-data"
+ class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+ <messageFormatter contentType="application/xml"
+ class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+ <messageFormatter contentType="text/xml"
+ class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ <messageFormatter contentType="application/soap+xml"
+ class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ </messageFormatters>
+
+ <!-- ================================================= -->
+ <!-- Message Builders -->
+ <!-- ================================================= -->
+ <!--Following content type to builder mapping can be used to implement support for different message -->
+ <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
+ <messageBuilders>
+ <messageBuilder contentType="application/xml"
+ class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+ <messageBuilder contentType="application/x-www-form-urlencoded"
+ class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+ <!--Left commented because it adds the depandancy of servlet-api to other modules.
+ Please uncomment to Receive messages in multipart/form-data format-->
+ <!--<messageBuilder contentType="multipart/form-data"-->
+ <!--class="org.apache.axis2.builder.MultipartFormDataBuilder"/>-->
+ </messageBuilders>
+
+ <module ref="addressing"/>
+
+ <!-- ================================================= -->
+ <!-- Target Resolvers -->
+ <!-- ================================================= -->
+ <!-- Uncomment the following and specify the class name for your TargetResolver to add -->
+ <!-- a TargetResolver. TargetResolvers are used to process the To EPR for example to -->
+ <!-- choose a server in a cluster -->
+ <!--<targetResolvers>-->
+ <!--<targetResolver class="" />-->
+ <!--</targetResolvers>-->
+
+ <transportReceiver name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port">6060</parameter>
+ <!--If you want to give your own host address for EPR generation-->
+ <!--uncommet following paramter , and set as you required.-->
+ <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
+ </transportReceiver>
+
+ <transportSender name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+
+
+ <!-- ================================================= -->
+ <!-- SOAP Role Configuration -->
+ <!-- ================================================= -->
+ <!-- Use the following pattern to configure this axis2
+ instance to act in particular roles. Note that in
+ the absence of any configuration, Axis2 will act
+ only in the ultimate receiver role -->
+ <!--
+ <SOAPRoleConfiguration isUltimateReceiver="true">
+ <role>http://my/custom/role</role>
+ </SOAPRoleConfiguration>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="InFlow">
+ <!-- System pre-defined phases -->
+ <phase name="Transport">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ </phase>
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
+ <phase name="Security"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ </phase>
+ <phase name="RMPhase"/>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="OperationInPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationOutPhase"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="RMPhase"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+ </phaseOrder>
+ <phaseOrder type="InFaultFlow">
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
+ <phase name="Security"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ </phase>
+ <phase name="RMPhase"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationInFaultPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFaultFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationOutFaultPhase"/>
+ <phase name="RMPhase"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+ </phaseOrder>
+</axisconfig>
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/conf/axis2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/conf/axis2.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/conf/axis2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: webservices/commons/trunk/modules/transport/modules/tcp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/pom.xml?rev=761707&r1=761706&r2=761707&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/tcp/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/tcp/pom.xml Fri Apr 3 15:16:42 2009
@@ -37,6 +37,45 @@
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:../../log4j.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-repo</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="target/test-resources/samples/modules"/>
+ <mkdir dir="target/test-resources/samples/conf"/>
+ <copy file="${settings.localRepository}/org/apache/axis2/addressing/${axis2.version}/addressing-${axis2.version}.mar"
+ tofile="target/test-resources/samples/modules/addressing.mar"/>
+ <copy file="conf/axis2.xml"
+ tofile="target/test-resources/samples/conf/axis2.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -83,5 +122,17 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${axis2.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Added: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/Echo.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/Echo.java?rev=761707&view=auto
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/Echo.java (added)
+++ webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/Echo.java Fri Apr 3 15:16:42 2009
@@ -0,0 +1,70 @@
+/*
+ * 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.tcp;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMText;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class Echo {
+
+ private static final Log log = LogFactory.getLog(Echo.class);
+ public static final String SERVICE_NAME = "EchoXMLService";
+ public static final String ECHO_OM_ELEMENT_OP_NAME = "echoOMElement";
+
+ public Echo() {
+ }
+
+ public void echoVoid() {
+ log.info("echo Service Called");
+ }
+
+ public void echoOMElementNoResponse(OMElement omEle) {
+ log.info("echoOMElementNoResponse service called.");
+ }
+
+ public OMElement echoOMElement(OMElement omEle) {
+ omEle.buildWithAttachments();
+ omEle.setLocalName(omEle.getLocalName() + "Response");
+ if (omEle.getFirstElement().getText().trim().startsWith("fault")) {
+ throw new RuntimeException("fault string found in echoOMElement");
+ }
+ return omEle;
+ }
+
+ public OMElement echoOM(OMElement omEle) {
+ return omEle;
+ }
+
+ public String echoString(String in) {
+ return in;
+ }
+
+ public int echoInt(int in) {
+ return in;
+ }
+
+ public OMElement echoMTOMtoBase64(OMElement omEle) {
+ OMText omText = (OMText)(omEle.getFirstElement()).getFirstOMChild();
+ omText.setOptimize(false);
+ return omEle;
+ }
+}
\ No newline at end of file
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/Echo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/Echo.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/Echo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java (from r761344, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java?p2=webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java&r1=761344&r2=761707&rev=761707&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java Fri Apr 3 15:16:42 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.tcp;
+package org.apache.axis2.transport.tcp;
import junit.framework.TestCase;
@@ -35,9 +35,6 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.Echo;
-import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.integration.UtilsTCPServer;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -48,7 +45,7 @@
public class TCPEchoRawXMLTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference("tcp://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
+ + (UtilsTCPServer.TESTING_PORT)
+ "/axis2/services/EchoXMLService/echoOMElement");
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoOMElement");
@@ -80,7 +77,7 @@
clientService = Utils.createSimpleServiceforClient(serviceName,
Echo.class.getName(),
operationName);
- configContext = UtilServer.createClientConfigurationContext();
+ configContext = UtilsTCPServer.createClientConfigurationContext();
}
protected void tearDown() throws Exception {
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPEchoRawXMLTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 3 15:16:42 2009
@@ -0,0 +1 @@
+/webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java:745088,749052,749058,751161,751271,760467
Copied: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java (from r761344, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java?p2=webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java&r1=761344&r2=761707&rev=761707&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java (original)
+++ webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java Fri Apr 3 15:16:42 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.tcp;
+package org.apache.axis2.transport.tcp;
import junit.framework.TestCase;
@@ -35,9 +35,6 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.Echo;
-import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.integration.UtilsTCPServer;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -48,7 +45,7 @@
public class TCPTwoChannelEchoRawXMLTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference("tcp://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
+ + (UtilsTCPServer.TESTING_PORT)
+ "/axis2/services/EchoXMLService/echoOMElement");
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoOMElement");
@@ -77,7 +74,7 @@
operationName);
UtilsTCPServer.deployService(service);
- configContext = UtilServer.createClientConfigurationContext();
+ configContext = UtilsTCPServer.createClientConfigurationContext();
}
protected void tearDown() throws Exception {
@@ -121,7 +118,7 @@
AxisService serviceClient =
Utils.createSimpleServiceforClient(serviceName,
- org.apache.axis2.engine.Echo.class.getName(),
+ Echo.class.getName(),
operationName);
sender = new ServiceClient(configContext, serviceClient);
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/TCPTwoChannelEchoRawXMLTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 3 15:16:42 2009
@@ -0,0 +1 @@
+/webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java:745088,749052,749058,751161,751271,760467
Copied: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java (from r761344, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java?p2=webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java&p1=webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java&r1=761344&r2=761707&rev=761707&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java Fri Apr 3 15:16:42 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.integration;
+package org.apache.axis2.transport.tcp;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -29,6 +29,7 @@
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
+import java.io.IOException;
import java.io.File;
public class UtilsTCPServer {
@@ -59,23 +60,20 @@
if (count == 0) {
// start tcp server
-
- File file = new File(TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY));
+ File file = new File(prefixBaseDirectory(Constants.TESTING_REPOSITORY));
System.out.println(file.getAbsoluteFile());
if (!file.exists()) {
throw new Exception("Repository directory does not exist");
}
-
ConfigurationContext er =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem(file
- .getAbsolutePath(), file
- .getAbsolutePath() + "/conf/axis2.xml");
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(),
+ file.getAbsolutePath() + "/conf/axis2.xml");
try {
Thread.sleep(1000);
} catch (InterruptedException e1) {
throw new AxisFault("Thread interuptted", e1);
}
- receiver = new TCPServer(UtilServer.TESTING_PORT, er);
+ receiver = new TCPServer(TESTING_PORT, er);
receiver.start();
}
@@ -97,4 +95,22 @@
receiver.getConfigurationContext().terminate();
}
+ public static ConfigurationContext createClientConfigurationContext() throws Exception {
+ File file = new File(prefixBaseDirectory(Constants.TESTING_REPOSITORY));
+ ConfigurationContext configContext =
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(),
+ file.getAbsolutePath() + "/conf/axis2.xml");
+ return configContext;
+ }
+
+ public static String prefixBaseDirectory(String path) {
+ String baseDir;
+ try {
+ baseDir = new File(System.getProperty("basedir", ".")).getCanonicalPath();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return baseDir + "/" + path;
+ }
+
}
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/transport/modules/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 3 15:16:42 2009
@@ -0,0 +1 @@
+/webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java:745088,749052,749058,751161,751271,760467