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 2005/11/26 14:10:22 UTC
svn commit: r349113 [2/2] - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/template/java/
core/src/org/apache/axis2/context/ core/src/org/apache/axis2/deployment/
core/src/org/apache/axis2/description/ core/src/org/apache/a...
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java?rev=349113&r1=349112&r2=349113&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java Sat Nov 26 05:09:20 2005
@@ -17,22 +17,12 @@
package org.apache.axis2.phaseresolver;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.deployment.DeploymentErrorMsgs;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.engine.Phase;
-import org.apache.axis2.i18n.Messages;
import org.apache.axis2.phaseresolver.util.PhaseValidator;
-import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -46,17 +36,12 @@
* Field axisConfig
*/
private AxisConfiguration axisConfig;
-
- /**
- * Field axisService
- */
- private AxisService axisService;
-
-
/**
* Field phaseHolder
*/
private PhaseHolder phaseHolder;
+ private static final int IN_FLOW = 1;
+ private static final int OUT_FAULT_FLOW = 5;
public PhaseResolver() {
}
@@ -71,198 +56,6 @@
}
/**
- * Constructor PhaseResolver
- *
- * @param axisConfig
- * @param serviceContext
- */
- public PhaseResolver(AxisConfiguration axisConfig,
- AxisService serviceContext) {
- this.axisConfig = axisConfig;
- this.axisService = serviceContext;
- }
-
- /**
- * Method buildchains
- *
- * @throws PhaseException
- * @throws AxisFault
- */
- public void buildchains() throws PhaseException, AxisFault {
- HashMap operations = axisService.getOperations();
- Collection col = operations.values();
- for (Iterator iterator = col.iterator(); iterator.hasNext();) {
- AxisOperation axisOperation = (AxisOperation) iterator.next();
- for (int i = 1; i < 5; i++) {
- buildExecutionChains(i, axisOperation);
- }
- }
- ArrayList modulqnames = (ArrayList) ((AxisConfigurationImpl) axisConfig).getEngadgedModules();
- for (int i = 0; i < modulqnames.size(); i++) {
- QName modulename = (QName) modulqnames.get(i);
- ModuleDescription module = axisConfig.getModule(modulename);
- axisService.addModuleOperations(module,axisConfig);
- }
- }
-
- /**
- * To build the opration for the opeartion which the module going to be added
- *
- * @param operation <code>AxisOperation</code>
- * @throws AxisFault
- */
- public void buildModuleOperation(AxisOperation operation) throws AxisFault {
- for (int i = 1; i < 5; i++) {
- buildExecutionChains(i, operation);
- }
- }
-
- /**
- * this opeartion is used to build all the three cahins ,
- * so type varible is used to difrenciate them
- * type = 1 inflow
- * type = 2 out flow
- * type = 3 fault flow
- *
- * @param type
- * @throws AxisFault
- * @throws PhaseException
- */
- private void buildExecutionChains(int type, AxisOperation axisOperation)
- throws AxisFault, PhaseException {
- ArrayList allHandlers = new ArrayList();
- ModuleDescription module;
- Flow flow = null;
- ///////////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////// Handlers from axis2.xml from modules/////////////////////////
- ArrayList modulqnames = (ArrayList) ((AxisConfigurationImpl) axisConfig).getEngadgedModules();
- for (int i = 0; i < modulqnames.size(); i++) {
- QName modulename = (QName) modulqnames.get(i);
- module = axisConfig.getModule(modulename);
- if (module != null) {
- switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
- flow = module.getInFlow();
- break;
- }
- case PhaseMetadata.OUT_FLOW:
- {
- flow = module.getOutFlow();
- break;
- }
- case PhaseMetadata.FAULT_IN_FLOW:
- {
- flow = module.getFaultInFlow();
- break;
- }
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
- flow = module.getFaultOutFlow();
- break;
- }
- }
- axisService.addToEngagModuleList(module);
- axisOperation.addToEngageModuleList(module);
- } else {
- throw new PhaseException(Messages.getMessage(
- DeploymentErrorMsgs.INVALID_MODULE_REF, modulename.getLocalPart()));
- }
-
- if (flow != null) {
- for (int j = 0; j < flow.getHandlerCount(); j++) {
- HandlerDescription metadata = flow.getHandler(j);
-
- if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) {
- allHandlers.add(metadata);
- } else {
- /**
- *This handler is trying to added to system pre defined phases , but those handlers
- * are already added to global chain which run irrespective of the service
- *
- */
- }
- }
- }
-
- }
-
- ///////////////////////////////////////////////////////////////////////////////////////////
- ////////////////////////// SERVICE HANDLERS ///////////////////////////////////////////////
- switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
- flow = axisService.getInFlow();
- break;
- }
- case PhaseMetadata.OUT_FLOW:
- {
- flow = axisService.getOutFlow();
- break;
- }
- case PhaseMetadata.FAULT_IN_FLOW:
- {
- flow = axisService.getFaultInFlow();
- break;
- }
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
- flow = axisService.getFaultOutFlow();
- break;
- }
- }
- if (flow != null) {
- for (int j = 0; j < flow.getHandlerCount(); j++) {
- HandlerDescription metadata = flow.getHandler(j);
-
- // todo change this in properway
- if (metadata.getRules().getPhaseName().equals("")) {
- throw new PhaseException(
- Messages.getMessage(DeploymentErrorMsgs.PHASE_DOES_NOT_SPECIFED,
- metadata.getName().getLocalPart()));
- } else if(PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())){
- throw new PhaseException(Messages.getMessage(
- DeploymentErrorMsgs.SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE,
- metadata.getRules().getPhaseName()));
- } else {
- allHandlers.add(metadata);
- }
- }
- }
- switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
- phaseHolder =
- new PhaseHolder(axisOperation.getRemainingPhasesInFlow());
- break;
- }
- case PhaseMetadata.OUT_FLOW:
- {
- phaseHolder =
- new PhaseHolder(axisOperation.getPhasesOutFlow());
- break;
- }
- case PhaseMetadata.FAULT_IN_FLOW:
- {
- phaseHolder =
- new PhaseHolder(axisOperation.getPhasesInFaultFlow());
- break;
- }
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
- phaseHolder =
- new PhaseHolder(axisOperation.getPhasesOutFaultFlow());
- break;
- }
- }
- for (int i = 0; i < allHandlers.size(); i++) {
- HandlerDescription handlerMetaData =
- (HandlerDescription) allHandlers.get(i);
- phaseHolder.addHandler(handlerMetaData);
- }
- }
-
- /**
* Method buildTranspotsChains
*
* @throws PhaseException
@@ -291,16 +84,14 @@
throws PhaseException {
Flow flow = null;
Phase phase = null;
- for (int type = 1; type < 4; type++) {
+ for (int type = IN_FLOW; type < 4; type++) {
switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
+ case PhaseMetadata.IN_FLOW: {
flow = transport.getInFlow();
phase = transport.getInPhase();
break;
}
- case PhaseMetadata.FAULT_IN_FLOW:
- {
+ case PhaseMetadata.FAULT_IN_FLOW: {
flow = transport.getFaultFlow();
phase = transport.getFaultPhase();
break;
@@ -330,16 +121,14 @@
throws PhaseException {
Flow flow = null;
Phase phase = null;
- for (int type = 1; type < 5; type++) {
+ for (int type = IN_FLOW; type < OUT_FAULT_FLOW; type++) {
switch (type) {
- case PhaseMetadata.OUT_FLOW:
- {
+ case PhaseMetadata.OUT_FLOW: {
flow = transport.getOutFlow();
phase = transport.getOutPhase();
break;
}
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
+ case PhaseMetadata.FAULT_OUT_FLOW: {
flow = transport.getFaultFlow();
phase = transport.getFaultPhase();
break;
@@ -402,28 +191,24 @@
continue;
}
Flow flow = null;
- for (int type = 1; type < 5; type++) {
+ for (int type = IN_FLOW; type < OUT_FAULT_FLOW; type++) {
switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
+ case PhaseMetadata.IN_FLOW: {
phaseHolder =
new PhaseHolder(opDesc.getRemainingPhasesInFlow());
break;
}
- case PhaseMetadata.OUT_FLOW:
- {
+ case PhaseMetadata.OUT_FLOW: {
phaseHolder =
new PhaseHolder(opDesc.getPhasesOutFlow());
break;
}
- case PhaseMetadata.FAULT_IN_FLOW:
- {
+ case PhaseMetadata.FAULT_IN_FLOW: {
phaseHolder =
new PhaseHolder(opDesc.getPhasesInFaultFlow());
break;
}
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
+ case PhaseMetadata.FAULT_OUT_FLOW: {
phaseHolder =
new PhaseHolder(opDesc.getPhasesOutFaultFlow());
break;
@@ -433,23 +218,19 @@
/////////////////// Modules refered by axis2.xml //////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
+ case PhaseMetadata.IN_FLOW: {
flow = module.getInFlow();
break;
}
- case PhaseMetadata.OUT_FLOW:
- {
+ case PhaseMetadata.OUT_FLOW: {
flow = module.getOutFlow();
break;
}
- case PhaseMetadata.FAULT_IN_FLOW:
- {
+ case PhaseMetadata.FAULT_IN_FLOW: {
flow = module.getFaultInFlow();
break;
}
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
+ case PhaseMetadata.FAULT_OUT_FLOW: {
flow = module.getFaultOutFlow();
break;
}
@@ -470,29 +251,25 @@
private void enageToGlobalChain(ModuleDescription module) throws PhaseException {
Flow flow = null;
- for (int type = 1; type < 5; type++) {
+ for (int type = IN_FLOW; type < OUT_FAULT_FLOW; type++) {
switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
+ case PhaseMetadata.IN_FLOW: {
phaseHolder =
new PhaseHolder(axisConfig.
getInPhasesUptoAndIncludingPostDispatch());
break;
}
- case PhaseMetadata.OUT_FLOW:
- {
+ case PhaseMetadata.OUT_FLOW: {
phaseHolder =
new PhaseHolder(((AxisConfigurationImpl) axisConfig).getOutFlow());
break;
}
- case PhaseMetadata.FAULT_IN_FLOW:
- {
+ case PhaseMetadata.FAULT_IN_FLOW: {
phaseHolder =
new PhaseHolder(axisConfig.getInFaultFlow());
break;
}
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
+ case PhaseMetadata.FAULT_OUT_FLOW: {
phaseHolder =
new PhaseHolder(((AxisConfigurationImpl) axisConfig).getOutFaultFlow());
break;
@@ -502,23 +279,19 @@
/////////////////// Modules refered by axis2.xml //////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
+ case PhaseMetadata.IN_FLOW: {
flow = module.getInFlow();
break;
}
- case PhaseMetadata.OUT_FLOW:
- {
+ case PhaseMetadata.OUT_FLOW: {
flow = module.getOutFlow();
break;
}
- case PhaseMetadata.FAULT_IN_FLOW:
- {
+ case PhaseMetadata.FAULT_IN_FLOW: {
flow = module.getFaultInFlow();
break;
}
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
+ case PhaseMetadata.FAULT_OUT_FLOW: {
flow = module.getFaultOutFlow();
break;
}
@@ -570,28 +343,50 @@
public void engageModuleToOperation(AxisOperation axisOperation,
ModuleDescription module) throws PhaseException {
Flow flow = null;
- for (int type = 1; type < 5; type++) {
+ for (int type = IN_FLOW; type < OUT_FAULT_FLOW; type++) {
switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
+ case PhaseMetadata.IN_FLOW: {
+ ArrayList phases = new ArrayList();
+ if (axisConfig != null) {
+ Iterator itr_axis_config = axisConfig.getInPhasesUptoAndIncludingPostDispatch().iterator();
+ while (itr_axis_config.hasNext()) {
+ Object o = itr_axis_config.next();
+ phases.add(o);
+ }
+ }
+ Iterator itr_ops = axisOperation.getRemainingPhasesInFlow().iterator();
+ while (itr_ops.hasNext()) {
+ Object o = itr_ops.next();
+ phases.add(o);
+ }
phaseHolder =
- new PhaseHolder(axisOperation.getRemainingPhasesInFlow());
+ new PhaseHolder(phases);
break;
}
- case PhaseMetadata.OUT_FLOW:
- {
+ case PhaseMetadata.OUT_FLOW: {
phaseHolder =
new PhaseHolder(axisOperation.getPhasesOutFlow());
break;
}
- case PhaseMetadata.FAULT_IN_FLOW:
- {
+ case PhaseMetadata.FAULT_IN_FLOW: {
+ ArrayList phases = new ArrayList();
+ if (axisConfig != null) {
+ Iterator itr_axis_config = axisConfig.getInFaultFlow().iterator();
+ while (itr_axis_config.hasNext()) {
+ Object o = itr_axis_config.next();
+ phases.add(o);
+ }
+ }
+ Iterator itr_ops = axisOperation.getPhasesInFaultFlow().iterator();
+ while (itr_ops.hasNext()) {
+ Object o = itr_ops.next();
+ phases.add(o);
+ }
phaseHolder =
new PhaseHolder(axisOperation.getPhasesInFaultFlow());
break;
}
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
+ case PhaseMetadata.FAULT_OUT_FLOW: {
phaseHolder =
new PhaseHolder(axisOperation.getPhasesOutFaultFlow());
break;
@@ -599,23 +394,19 @@
}
switch (type) {
- case PhaseMetadata.IN_FLOW:
- {
+ case PhaseMetadata.IN_FLOW: {
flow = module.getInFlow();
break;
}
- case PhaseMetadata.OUT_FLOW:
- {
+ case PhaseMetadata.OUT_FLOW: {
flow = module.getOutFlow();
break;
}
- case PhaseMetadata.FAULT_IN_FLOW:
- {
+ case PhaseMetadata.FAULT_IN_FLOW: {
flow = module.getFaultInFlow();
break;
}
- case PhaseMetadata.FAULT_OUT_FLOW:
- {
+ case PhaseMetadata.FAULT_OUT_FLOW: {
flow = module.getFaultOutFlow();
break;
}
@@ -623,12 +414,15 @@
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
HandlerDescription metadata = flow.getHandler(j);
- if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) {
- phaseHolder.addHandler(metadata);
- } else {
- throw new PhaseException(Messages.getMessage(DeploymentErrorMsgs.SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE,
- metadata.getRules().getPhaseName()));
- }
+ phaseHolder.addHandler(metadata);
+ //commented the following code to provide ability to add service module to global
+ //chain
+// if (!PhaseValidator.isSystemPhases(metadata.getRules().getPhaseName())) {
+// phaseHolder.addHandler(metadata);
+// } else {
+// throw new PhaseException(Messages.getMessage(DeploymentErrorMsgs.SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE,
+// metadata.getRules().getPhaseName()));
+// }
}
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=349113&r1=349112&r2=349113&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Sat Nov 26 05:09:20 2005
@@ -341,7 +341,7 @@
.getOperation(new QName(operationName));
od.engageModule(
configContext.getAxisConfiguration().getModule(
- new QName(moduleName)));
+ new QName(moduleName)), configContext.getAxisConfiguration());
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName +
" module engaged to the operation Successfully");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java?rev=349113&r1=349112&r2=349113&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisObserverImpl.java Sat Nov 26 05:09:20 2005
@@ -17,6 +17,7 @@
package org.apache.axis2.deployment;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.om.OMElement;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterIncludeImpl;
import org.apache.axis2.engine.AxisEvent;
@@ -50,5 +51,9 @@
//to check whether the paramter is locked at any levle
public boolean isParameterLocked(String paramterName) {
return false;
+ }
+
+ public void deserializeParameters(OMElement parameterElement) throws AxisFault {
+ this.paramterimpl.deserializeParameters(parameterElement);
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=349113&r1=349112&r2=349113&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java Sat Nov 26 05:09:20 2005
@@ -51,7 +51,7 @@
protected AxisService service;
protected boolean finish = false;
-
+
public EchoRawXMLTest() {
super(EchoRawXMLTest.class.getName());
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=349113&r1=349112&r2=349113&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java Sat Nov 26 05:09:20 2005
@@ -38,10 +38,12 @@
import org.apache.commons.logging.LogFactory;
import javax.xml.stream.XMLOutputFactory;
+import java.util.ArrayList;
public class HandlerFailureTest extends TestCase implements TestConstants {
private Log log = LogFactory.getLog(getClass());
+
public HandlerFailureTest() {
super(HandlerFailureTest.class.getName());
}
@@ -55,33 +57,40 @@
public void testFailureAtServerRequestFlow() throws Exception {
- Flow flow = new FlowImpl();
- Utils.addHandler(flow,
- new SpeakingHandler(),
- PhaseMetadata.PHASE_POLICY_DETERMINATION);
- Utils.addHandler(flow,
- new SpeakingHandler(),
- PhaseMetadata.PHASE_POLICY_DETERMINATION);
- Utils.addHandler(flow,
- new SpeakingHandler(),
- PhaseMetadata.PHASE_POLICY_DETERMINATION);
- Utils.addHandler(flow,
- new SpeakingHandler(),
- PhaseMetadata.PHASE_POLICY_DETERMINATION);
- Utils.addHandler(flow,
- culprit,
- PhaseMetadata.PHASE_POLICY_DETERMINATION);
- Utils.addHandler(flow,
- new SpeakingHandler(),
- PhaseMetadata.PHASE_POLICY_DETERMINATION);
+// Flow flow = new FlowImpl();
+// Utils.addHandler(flow,
+// new SpeakingHandler(),
+// PhaseMetadata.PHASE_POLICY_DETERMINATION);
+// Utils.addHandler(flow,
+// new SpeakingHandler(),
+// PhaseMetadata.PHASE_POLICY_DETERMINATION);
+// Utils.addHandler(flow,
+// new SpeakingHandler(),
+// PhaseMetadata.PHASE_POLICY_DETERMINATION);
+// Utils.addHandler(flow,
+// new SpeakingHandler(),
+// PhaseMetadata.PHASE_POLICY_DETERMINATION);
+// Utils.addHandler(flow,
+// culprit,
+// PhaseMetadata.PHASE_POLICY_DETERMINATION);
+// Utils.addHandler(flow,
+// new SpeakingHandler(),
+// PhaseMetadata.PHASE_POLICY_DETERMINATION);
AxisService service = Utils.createSimpleService(serviceName,
Echo.class.getName(),
operationName);
- service.setInFlow(flow);
+// service.setInFlow(flow); // we do not support this
UtilServer.start();
UtilServer.deployService(service);
+ ArrayList phase = service.getOperation(operationName).getRemainingPhasesInFlow();
+ for (int i = 0; i < phase.size(); i++) {
+ Phase phase1 = (Phase) phase.get(i);
+ if(PhaseMetadata.PHASE_POLICY_DETERMINATION.equals(phase1.getPhaseName())){
+ phase1.addHandler(culprit);
+ }
+ }
try {
callTheService();
} finally {
@@ -143,9 +152,9 @@
method.addChild(value);
org.apache.axis2.client.Call call =
- new org.apache.axis2.client.Call("target/test-resources/intregrationRepo");
+ new org.apache.axis2.client.Call("target/test-resources/intregrationRepo");
//EndpointReference targetEPR = new EndpointReference(AddressingConstants.WSA_TO, "http://127.0.0.1:" + Utils.TESTING_PORT + "/axis/services/EchoXMLService");
-
+
call.setTransportInfo(Constants.TRANSPORT_HTTP,
Constants.TRANSPORT_HTTP,
false);
@@ -153,7 +162,7 @@
OMElement result = call.invokeBlocking(
operationName.getLocalPart(), method);
result.serializeAndConsume(XMLOutputFactory.newInstance().createXMLStreamWriter(
- System.out));
+ System.out));
fail("the test must fail due to bad service Name");
} catch (AxisFault e) {
log.info(e.getMessage());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=349113&r1=349112&r2=349113&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Sat Nov 26 05:09:20 2005
@@ -38,7 +38,7 @@
public static final String FAILURE_MESSAGE = "Intentional Failure";
private static ThreadPool tp = null;
-
+
public static synchronized void deployService(AxisService service) throws AxisFault {
receiver.getSystemContext().getAxisConfiguration().addService(service);
Utils.resolvePhases(receiver.getSystemContext().getAxisConfiguration(),
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java?rev=349113&r1=349112&r2=349113&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java Sat Nov 26 05:09:20 2005
@@ -160,4 +160,5 @@
com.setPersons(tems);
return com;
}
+
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=349113&r1=349112&r2=349113&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Sat Nov 26 05:09:20 2005
@@ -66,6 +66,7 @@
private boolean finish = false;
private Log log = LogFactory.getLog(getClass());
+
public TCPEchoRawXMLTest() {
super(TCPEchoRawXMLTest.class.getName());
}
@@ -77,7 +78,6 @@
protected void setUp() throws Exception {
UtilsTCPServer.start();
-
//create and deploy the service
service =
Utils.createSimpleService(serviceName,
@@ -206,7 +206,7 @@
public void testEchoXMLSyncMC() throws Exception {
ConfigurationContextFactory confac = new ConfigurationContextFactory();
- ConfigurationContext configContext= confac.buildClientConfigurationContext(Constants.TESTING_REPOSITORY);
+ ConfigurationContext configContext = confac.buildClientConfigurationContext(Constants.TESTING_REPOSITORY);
AxisOperation opdesc = new OutInAxisOperation(new QName("echoOMElement"));
org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(Constants.TESTING_REPOSITORY);
@@ -236,9 +236,9 @@
// requestContext.setTo(targetEPR);
requestContext.setEnvelope(envelope);
- MessageContext res= call.invokeBlocking(opdesc, requestContext);
+ MessageContext res = call.invokeBlocking(opdesc, requestContext);
- SOAPEnvelope env= call.invokeBlocking("echoOMElement", envelope);
+ SOAPEnvelope env = call.invokeBlocking("echoOMElement", envelope);
// SOAPEnvelope env= res.getEnvelope();
env.getBody().serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
System.out));