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 gd...@apache.org on 2007/07/03 15:53:37 UTC
svn commit: r552843 - in /webservices/axis2/trunk/java/modules:
adb-codegen/src/org/apache/axis2/schema/
codegen/src/org/apache/axis2/wsdl/codegen/extension/
integration/test/org/apache/axis2/integration/
jibx/src/org/apache/axis2/jibx/ kernel/src/org/...
Author: gdaniels
Date: Tue Jul 3 06:53:34 2007
New Revision: 552843
URL: http://svn.apache.org/viewvc?view=rev&rev=552843
Log:
https://issues.apache.org/jira/browse/AXIS2-2805
Take care of a lot of the getParent() usage and extraneous casting by using specific methods (AxisOperation.getAxisService(), etc).
getChild() next.
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.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/AxisService2WSDL20.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.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/MessageContextSaveATest.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/OperationContextSaveTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java Tue Jul 3 06:53:34 2007
@@ -213,7 +213,7 @@
// find the schema type from all the schemas
// now we need to get the schema of the extension type from the parent schema. For that let's first retrieve
// the parent schema
- AxisService axisService = (AxisService) axisMessage.getParent().getParent();
+ AxisService axisService = axisMessage.getAxisOperation().getAxisService();
ArrayList schemasList = axisService.getSchema();
XmlSchema schema = null;
for (Iterator iter = schemasList.iterator(); iter.hasNext();) {
@@ -278,7 +278,7 @@
// find the schema type from all the schemas
// now we need to get the schema of the extension type from the parent schema. For that let's first retrieve
// the parent schema
- AxisService axisService = (AxisService) message.getParent().getParent();
+ AxisService axisService = message.getAxisOperation().getAxisService();
ArrayList schemasList = axisService.getSchema();
XmlSchema schema = null;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java Tue Jul 3 06:53:34 2007
@@ -125,7 +125,7 @@
// find the schema type from all the schemas
// now we need to get the schema of the extension type from the parent schema. For that let's first retrieve
// the parent schema
- AxisService axisService = (AxisService) message.getParent().getParent();
+ AxisService axisService = message.getAxisOperation().getAxisService();
ArrayList schemasList = axisService.getSchema();
XmlSchema schema = null;
@@ -146,7 +146,7 @@
qnameSuffix);
} else if ((schemaType instanceof XmlSchemaSimpleType) ||
((schemaTypeQname != null) && (schemaTypeQname.equals(new QName("http://www.w3.org/2001/XMLSchema", "anyType")))) ) {
- QName opName = ((AxisOperation) message.getParent()).getName();
+ QName opName = message.getAxisOperation().getName();
partNameList.add(WSDLUtil.getPartQName(opName.getLocalPart(),
qnameSuffix,
schemaElement.getQName().getLocalPart()));
@@ -170,7 +170,7 @@
// attach the opName and the parts name list into the
// axis message by using the holder
MessagePartInformationHolder infoHolder = new MessagePartInformationHolder();
- infoHolder.setOperationName(((AxisOperation) message.getParent()).getName());
+ infoHolder.setOperationName(message.getAxisOperation().getName());
infoHolder.setPartsList(partNameList);
//attach it to the parameters
@@ -212,7 +212,7 @@
AxisMessage message,
List partNameList,
String qnameSuffix) {
- QName opName = ((AxisOperation) message.getParent()).getName();
+ QName opName = message.getAxisOperation().getName();
XmlSchemaObjectCollection xmlObjectCollection = complexType.getAttributes();
XmlSchemaObject item;
XmlSchemaAttribute xmlSchemaAttribute;
@@ -249,7 +249,7 @@
// now we need to get the schema of the extension type from the parent schema. For that let's first retrieve
// the parent schema
- AxisService axisService = (AxisService) message.getParent().getParent();
+ AxisService axisService = message.getAxisOperation().getAxisService();
ArrayList schemasList = axisService.getSchema();
XmlSchema parentSchema = null;
@@ -310,7 +310,7 @@
// get the name of the operation name and namespace,
// part name and hang them somewhere ? The ideal place
// would be the property bag in the codegen config!
- QName opName = ((AxisOperation) message.getParent()).getName();
+ QName opName = message.getAxisOperation().getName();
XmlSchemaSequence sequence = (XmlSchemaSequence) schemaParticle;
XmlSchemaObjectCollection items = sequence.getItems();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- 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 Tue Jul 3 06:53:34 2007
@@ -192,7 +192,7 @@
ServiceGroupContext serviceGroupContext =
- configContext.createServiceGroupContext((AxisServiceGroup)service.getParent());
+ configContext.createServiceGroupContext(service.getAxisServiceGroup());
return serviceGroupContext.getServiceContext(service);
}
@@ -247,7 +247,7 @@
configContext.getAxisConfiguration().addService(service);
ServiceGroupContext serviceGroupContext =
- configContext.createServiceGroupContext((AxisServiceGroup)service.getParent());
+ configContext.createServiceGroupContext(service.getAxisServiceGroup());
return serviceGroupContext.getServiceContext(service);
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java Tue Jul 3 06:53:34 2007
@@ -47,8 +47,7 @@
throws AxisFault {
receiver.getConfigurationContext().getAxisConfiguration().addService(service);
- receiver.getConfigurationContext().
- createServiceGroupContext((AxisServiceGroup)service.getParent());
+ receiver.getConfigurationContext().createServiceGroupContext(service.getAxisServiceGroup());
}
public static synchronized void unDeployService(QName service)
Modified: webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java (original)
+++ webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/CodeGenerationUtility.java Tue Jul 3 06:53:34 2007
@@ -735,7 +735,7 @@
XmlSchemaSequence sequence = (XmlSchemaSequence)particle;
// add child param element matching each child of wrapper element
- QName opName = ((AxisOperation)msg.getParent()).getName();
+ QName opName = msg.getAxisOperation().getName();
XmlSchemaObjectCollection items = sequence.getItems();
boolean first = true;
for (Iterator iter = items.getIterator(); iter.hasNext();) {
@@ -953,7 +953,7 @@
// this magic code comes from org.apache.axis2.wsdl.codegen.extension.SchemaUnwrapperExtension
// it's used here to fit into the ADB-based code generation model
MessagePartInformationHolder infoHolder = new MessagePartInformationHolder();
- infoHolder.setOperationName(((AxisOperation)msg.getParent()).getName());
+ infoHolder.setOperationName(msg.getAxisOperation().getName());
infoHolder.setPartsList(partNameList);
try {
msg.addParameter(new Parameter(Constants.UNWRAPPED_DETAILS, infoHolder));
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/ServiceClient.java Tue Jul 3 06:53:34 2007
@@ -173,7 +173,7 @@
"twoservicecannothavesamename",
axisService.getName()));
}
- AxisServiceGroup axisServiceGroup = (AxisServiceGroup)axisService.getParent();
+ AxisServiceGroup axisServiceGroup = axisService.getAxisServiceGroup();
ServiceGroupContext sgc = configContext.createServiceGroupContext(axisServiceGroup);
serviceContext = sgc.getServiceContext(axisService);
}
@@ -775,8 +775,7 @@
// if a configuration context was created for this client there'll also
// be a service group, so discard that
if (!createConfigCtx) {
- String serviceGroupName =
- ((AxisServiceGroup) axisService.getParent()).getServiceGroupName();
+ String serviceGroupName = axisService.getAxisServiceGroup().getServiceGroupName();
AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
AxisServiceGroup asg = axisConfiguration.getServiceGroup(serviceGroupName);
if (asg != null) {
@@ -817,7 +816,7 @@
axisService.setClientSide(true);
axisConfig.addService(axisService);
- AxisServiceGroup axisServiceGroup = (AxisServiceGroup) axisService.getParent();
+ AxisServiceGroup axisServiceGroup = axisService.getAxisServiceGroup();
ServiceGroupContext serviceGroupContext =
configContext.createServiceGroupContext(axisServiceGroup);
this.serviceContext = serviceGroupContext.getServiceContext(axisService);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Tue Jul 3 06:53:34 2007
@@ -210,15 +210,14 @@
if (serviceContext == null) {
String scope = axisService.getScope();
if (Constants.SCOPE_APPLICATION.equals(scope)) {
- String serviceGroupName =
- ((AxisServiceGroup) axisService.getParent()).getServiceGroupName();
+ String serviceGroupName = axisService.getAxisServiceGroup().getServiceGroupName();
serviceGroupContext =
(ServiceGroupContext) applicationSessionServiceGroupContexts.get(
serviceGroupName);
if (serviceGroupContext == null) {
AxisServiceGroup axisServiceGroup = messageContext.getAxisServiceGroup();
if (axisServiceGroup == null) {
- axisServiceGroup = (AxisServiceGroup) axisService.getParent();
+ axisServiceGroup = axisService.getAxisServiceGroup();
messageContext.setAxisServiceGroup(axisServiceGroup);
}
ConfigurationContext cfgCtx = messageContext.getConfigurationContext();
@@ -238,15 +237,16 @@
// TODO: Adding this code so that requests to services deployed in soapsession scope will work
// TODO: However, soapsession functionality is still broken
- serviceGroupContext = new ServiceGroupContext(this,
- (AxisServiceGroup) axisService.getParent());
+ serviceGroupContext =
+ new ServiceGroupContext(this,
+ axisService.getAxisServiceGroup());
serviceGroupContext.setId(serviceGroupContextId);
addServiceGroupContextIntoSoapSessionTable(serviceGroupContext);
// throw new AxisFault("Unable to find corresponding context" +
// " for the serviceGroupId: " + serviceGroupContextId);
}
} else {
- AxisServiceGroup axisServiceGroup = (AxisServiceGroup) axisService.getParent();
+ AxisServiceGroup axisServiceGroup = axisService.getAxisServiceGroup();
serviceGroupContext = createServiceGroupContext(axisServiceGroup);
serviceContext = serviceGroupContext.getServiceContext(axisService);
// set the serviceGroupContextID
@@ -258,7 +258,7 @@
messageContext.setServiceGroupContext(serviceGroupContext);
messageContext.setServiceContext(serviceGroupContext.getServiceContext(axisService));
} else if (Constants.SCOPE_REQUEST.equals(scope)) {
- AxisServiceGroup axisServiceGroup = (AxisServiceGroup) axisService.getParent();
+ AxisServiceGroup axisServiceGroup = axisService.getAxisServiceGroup();
serviceGroupContext = createServiceGroupContext(axisServiceGroup);
messageContext.setServiceGroupContext(serviceGroupContext);
serviceContext = serviceGroupContext.getServiceContext(axisService);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Tue Jul 3 06:53:34 2007
@@ -1163,7 +1163,7 @@
public void setAxisService(AxisService axisService) {
this.axisService = axisService;
if (this.axisService != null) {
- this.axisServiceGroup = (AxisServiceGroup) this.axisService.getParent();
+ this.axisServiceGroup = axisService.getAxisServiceGroup();
} else {
this.axisServiceGroup = null;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java Tue Jul 3 06:53:34 2007
@@ -379,7 +379,7 @@
String axisServMarker = logCorrelationIDString + ".metaAxisService";
ObjectStateUtils.writeString(out, axisServMarker, axisServMarker);
- AxisService axisService = (AxisService) axisOperation.getParent();
+ AxisService axisService = axisOperation.getAxisService();
if (axisService == null) {
out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Tue Jul 3 06:53:34 2007
@@ -144,7 +144,7 @@
if (!file.isDirectory()) {
if (DeploymentFileData.isModuleArchiveFile(file.getName())) {
//adding modules in the class path
- addFileToDeploy(file, deployer,WSInfo.TYPE_MODULE);
+ addFileToDeploy(file, deployer, WSInfo.TYPE_MODULE);
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Tue Jul 3 06:53:34 2007
@@ -99,10 +99,11 @@
// then use that as the service name
if (serviceNameatt != null) {
if (!"".equals(serviceNameatt.getAttributeValue().trim())) {
- AxisService wsdlService = (AxisService) wsdlServiceMap.get(serviceNameatt.getAttributeValue());
- if(wsdlService!=null){
+ AxisService wsdlService = (AxisService)wsdlServiceMap.get(
+ serviceNameatt.getAttributeValue());
+ if (wsdlService != null) {
wsdlService.setClassLoader(service.getClassLoader());
- wsdlService.setParent(service.getParent());
+ wsdlService.setParent(service.getAxisServiceGroup());
service = wsdlService;
service.setWsdlFound(true);
service.setCustomWsdl(true);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Tue Jul 3 06:53:34 2007
@@ -208,7 +208,7 @@
policyList.addAll(getPolicyInclude().getAttachedPolicies());
// AxisEndpoint
- AxisEndpoint axisEndpoint = (AxisEndpoint) getParent();
+ AxisEndpoint axisEndpoint = getAxisEndpoint();
if (axisEndpoint != null) {
policyList.addAll(axisEndpoint.getPolicyInclude()
@@ -218,7 +218,7 @@
AxisService service = null;
if (axisEndpoint != null) {
- service = (AxisService) axisEndpoint.getParent();
+ service = axisEndpoint.getAxisService();
}
if (service != null) {
@@ -229,5 +229,9 @@
}
return PolicyUtil.getMergedPolicy(policyList, this);
+ }
+
+ public AxisEndpoint getAxisEndpoint() {
+ return (AxisEndpoint)parent;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java Tue Jul 3 06:53:34 2007
@@ -133,7 +133,6 @@
// If this is a fault, create a fault element and add fault specific properties
if (this.isFault()) {
-
if (this.getParent() instanceof AxisBinding) {
bindingMessageElement = omFactory.createOMElement(
WSDL2Constants.FAULT_LOCAL_NAME, wsdl);
@@ -215,7 +214,7 @@
policyList.addAll(policyInclude.getAttachedPolicies());
// AxisBindingOperation policies
- AxisBindingOperation axisBindingOperation = (AxisBindingOperation) getParent();
+ AxisBindingOperation axisBindingOperation = getAxisBindingOperation();
if (axisBindingOperation != null) {
policyList.add(axisBindingOperation.getPolicyInclude()
.getAttachedPolicies());
@@ -224,18 +223,17 @@
// AxisBinding policies
AxisBinding axisBinding = null;
if (axisBindingOperation != null) {
- axisBinding = (AxisBinding) axisBindingOperation.getParent();
+ axisBinding = axisBindingOperation.getAxisBinding();
}
if (axisBinding != null) {
- policyList.addAll(axisBinding.getPolicyInclude()
- .getAttachedPolicies());
+ policyList.addAll(axisBinding.getPolicyInclude().getAttachedPolicies());
}
// AxisEndpoint
AxisEndpoint axisEndpoint = null;
if (axisBinding != null) {
- axisEndpoint = (AxisEndpoint) axisBinding.getParent();
+ axisEndpoint = axisBinding.getAxisEndpoint();
}
if (axisEndpoint != null) {
@@ -254,6 +252,9 @@
return PolicyUtil.getMergedPolicy(policyList, this);
}
+ public AxisBindingOperation getAxisBindingOperation() {
+ return (AxisBindingOperation)parent;
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java Tue Jul 3 06:53:34 2007
@@ -83,7 +83,7 @@
Object property = this.options.get(name);
AxisBinding parent;
- if (property == null && (parent = (AxisBinding) this.getParent()) != null) {
+ if (property == null && (parent = getAxisBinding()) != null) {
property = parent.getProperty(name);
}
@@ -228,7 +228,7 @@
policyList.addAll(policyInclude.getAttachedPolicies());
// AxisBinding
- AxisBinding axisBinding = (AxisBinding) getParent();
+ AxisBinding axisBinding = getAxisBinding();
if (axisBinding != null) {
policyList.addAll(axisBinding.getPolicyInclude()
.getAttachedPolicies());
@@ -237,7 +237,7 @@
// AxisEndpoint
AxisEndpoint axisEndpoint = null;
if (axisBinding != null) {
- axisEndpoint = (AxisEndpoint) axisBinding.getParent();
+ axisEndpoint = axisBinding.getAxisEndpoint();
}
if (axisEndpoint != null) {
@@ -254,5 +254,9 @@
}
return PolicyUtil.getMergedPolicy(policyList, this);
+ }
+
+ public AxisBinding getAxisBinding() {
+ return (AxisBinding)parent;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java Tue Jul 3 06:53:34 2007
@@ -38,7 +38,7 @@
public abstract class AxisDescription implements ParameterInclude,
DescriptionConstants {
- private AxisDescription parent = null;
+ protected AxisDescription parent = null;
private ParameterInclude parameterInclude;
@@ -163,6 +163,7 @@
return policyInclude;
}
+ // NOTE - These are NOT typesafe!
public void addChild(AxisDescription child) {
children.put(child.getKey(), child);
}
@@ -490,7 +491,7 @@
if (axisDescription instanceof AxisOperation) {
AxisOperation operation = (AxisOperation) axisDescription;
- AxisService service = (AxisService) operation.getParent();
+ AxisService service = operation.getAxisService();
if (service != null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java Tue Jul 3 06:53:34 2007
@@ -138,4 +138,12 @@
WSDLSerializationUtil.addWSDLDocumentationElement(this, endpointElement, omFactory, wsdl);
return endpointElement;
}
+
+ public AxisService getAxisService() {
+ return (AxisService)parent;
+ }
+
+ public void setParent(AxisService service) {
+ parent = service;
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java Tue Jul 3 06:53:34 2007
@@ -81,13 +81,13 @@
public boolean isParameterLocked(String parameterName) {
// checking the locked value of parent
- boolean loscked = false;
+ boolean locked = false;
if (getParent() != null) {
- loscked = getParent().isParameterLocked(parameterName);
+ locked = getParent().isParameterLocked(parameterName);
}
- if (loscked) {
+ if (locked) {
return true;
} else {
Parameter parameter = getParameter(parameterName);
@@ -122,7 +122,7 @@
public XmlSchemaElement getSchemaElement() {
XmlSchemaElement xmlSchemaElement = null;
- AxisService service = (AxisService) getParent().getParent();
+ AxisService service = getAxisOperation().getAxisService();
ArrayList schemas = service.getSchema();
for (Iterator schemaIter = schemas.iterator(); schemaIter.hasNext();){
xmlSchemaElement = getSchemaElement((XmlSchema) schemaIter.next());
@@ -211,7 +211,7 @@
}
public AxisOperation getAxisOperation(){
- return (AxisOperation) getParent();
+ return (AxisOperation)parent;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Tue Jul 3 06:53:34 2007
@@ -162,7 +162,7 @@
// If I'm not, the operations will already have been added by someone above, so don't
// do it again.
if (selfEngaged) {
- AxisService service = (AxisService)getParent();
+ AxisService service = getAxisService();
if (service != null) {
service.addModuleOperations(axisModule);
}
@@ -173,24 +173,24 @@
}
protected void onDisengage(AxisModule module) {
- if (getParent() != null) {
- AxisService service = (AxisService) getParent();
- AxisConfiguration axisConfiguration = service.getAxisConfiguration();
- PhaseResolver phaseResolver = new PhaseResolver(axisConfiguration);
- if (!service.isEngaged(module.getName()) &&
- (axisConfiguration != null && !axisConfiguration.isEngaged(module.getName()))) {
- phaseResolver.disengageModuleFromGlobalChains(module);
- }
- phaseResolver.disengageModuleFromOperationChain(module, this);
+ AxisService service = getAxisService();
+ if (service == null) return;
- //removing operations added at the time of module engagemnt
- HashMap moduleOperations = module.getOperations();
- if (moduleOperations != null) {
- Iterator moduleOperations_itr = moduleOperations.values().iterator();
- while (moduleOperations_itr.hasNext()) {
- AxisOperation operation = (AxisOperation) moduleOperations_itr.next();
- service.removeOperation(operation.getName());
- }
+ AxisConfiguration axisConfiguration = service.getAxisConfiguration();
+ PhaseResolver phaseResolver = new PhaseResolver(axisConfiguration);
+ if (!service.isEngaged(module.getName()) &&
+ (axisConfiguration != null && !axisConfiguration.isEngaged(module.getName()))) {
+ phaseResolver.disengageModuleFromGlobalChains(module);
+ }
+ phaseResolver.disengageModuleFromOperationChain(module, this);
+
+ //removing operations added at the time of module engagemnt
+ HashMap moduleOperations = module.getOperations();
+ if (moduleOperations != null) {
+ Iterator moduleOperations_itr = moduleOperations.values().iterator();
+ while (moduleOperations_itr.hasNext()) {
+ AxisOperation operation = (AxisOperation) moduleOperations_itr.next();
+ service.removeOperation(operation.getName());
}
}
}
@@ -569,6 +569,15 @@
public Iterator getMessages(){
return getChildren();
+ }
+
+ /**
+ * Typesafe access to parent service
+ *
+ * @return the AxisService which contains this AxisOperation
+ */
+ public AxisService getAxisService() {
+ return (AxisService)getParent();
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Tue Jul 3 06:53:34 2007
@@ -593,8 +593,8 @@
return messageReceiver;
}
}
- if (getParent() != null && getParent().getParent() != null) {
- return ((AxisConfiguration) getParent().getParent()).getMessageReceiver(mepURL);
+ if (getAxisConfiguration() != null) {
+ return getAxisConfiguration().getMessageReceiver(mepURL);
}
return null;
}
@@ -2349,6 +2349,10 @@
}
public AxisServiceGroup getAxisServiceGroup() {
- return (AxisServiceGroup) getParent();
+ return (AxisServiceGroup)parent;
+ }
+
+ public void setParent(AxisServiceGroup parent) {
+ this.parent = parent;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java Tue Jul 3 06:53:34 2007
@@ -378,7 +378,7 @@
axisOperationElement.addAttribute(omFactory.createOMAttribute(
WSDL2Constants.ATTRIBUTE_SAFE, wsdlx, (param.getValue()).toString()));
}
- AxisService axisService = (AxisService) axisOperation.getParent();
+ AxisService axisService = axisOperation.getAxisService();
Map nameSpaceMap = axisService.getNameSpacesMap();
// Add the input element
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java Tue Jul 3 06:53:34 2007
@@ -84,7 +84,7 @@
service.setParent(this);
- AxisConfiguration axisConfig = (AxisConfiguration) getParent();
+ AxisConfiguration axisConfig = getAxisConfiguration();
if (axisConfig != null) {
for (Iterator iterator = getEngagedModules().iterator(); iterator.hasNext();) {
@@ -147,7 +147,7 @@
AxisService service = getService(name);
if (service != null) {
- ((AxisConfiguration) getParent()).notifyObservers(AxisEvent.SERVICE_REMOVE, service);
+ getAxisConfiguration().notifyObservers(AxisEvent.SERVICE_REMOVE, service);
}
removeChild(name);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Tue Jul 3 06:53:34 2007
@@ -515,14 +515,14 @@
axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
//This is a hack to get AXIS2-2771 working , I had to copy soap headers
// from binding message to AxisMessage
- List soapHeaders =
- (List) axisBindingInMessage.getProperty(WSDL2Constants.ATTR_WSOAP_HEADER);
- if (soapHeaders != null) {
- for (int i = 0; i < soapHeaders.size(); i++) {
- SOAPHeaderMessage headerMessage = (SOAPHeaderMessage) soapHeaders.get(i);
- axisInMessage.addSoapHeader(headerMessage);
- }
+ List soapHeaders = (List)axisBindingInMessage.getProperty(
+ WSDL2Constants.ATTR_WSOAP_HEADER);
+ if (soapHeaders != null) {
+ for (int i = 0; i < soapHeaders.size(); i++) {
+ SOAPHeaderMessage headerMessage = (SOAPHeaderMessage) soapHeaders.get(i);
+ axisInMessage.addSoapHeader(headerMessage);
}
+ }
if (isSetMessageQNames) {
addQNameReference(axisInMessage, wsdl4jOperation,
@@ -886,8 +886,6 @@
/**
* Finds a SOAP port given the port map
- *
- * @param pHttpAddressHttpAddressorts
*/
private Port findPort(Map ports) {
Port port;
@@ -1036,9 +1034,9 @@
// the list and add it - the name for this is just the
message.setElementQName((QName) resolvedRpcWrappedElementMap
.get(rpcOperationName));
- ((AxisService)message.getParent().getParent()).addMessageElementQNameToOperationMapping(
+ message.getAxisOperation().getAxisService().addMessageElementQNameToOperationMapping(
(QName)resolvedRpcWrappedElementMap.get(rpcOperationName),
- (AxisOperation)message.getParent());
+ message.getAxisOperation());
} else {
// now we are sure this is an document literal type element
List bindingPartsList = getPartsListFromSoapBody(extensibilityElements);
@@ -1052,10 +1050,10 @@
if (elementName != null) {
message.setElementQName(elementName);
message.setMessagePartName(part.getName());
- ((AxisService) message.getParent().getParent())
- .addMessageElementQNameToOperationMapping(elementName,
- (AxisOperation) message
- .getParent());
+ AxisOperation operation = message.getAxisOperation();
+ AxisService service = operation.getAxisService();
+ service.addMessageElementQNameToOperationMapping(elementName,
+ operation);
} else {
throw new WSDLProcessingException(
"No element type is defined for message " +
@@ -1083,10 +1081,10 @@
if (elementName != null) {
message.setElementQName(elementName);
message.setMessagePartName(part.getName());
- ((AxisService) message.getParent().getParent())
- .addMessageElementQNameToOperationMapping(elementName,
- (AxisOperation) message
- .getParent());
+ AxisOperation operation = message.getAxisOperation();
+ AxisService service = operation.getAxisService();
+ service.addMessageElementQNameToOperationMapping(elementName,
+ operation);
} else {
throw new WSDLProcessingException(
"No element type is defined for message" +
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Tue Jul 3 06:53:34 2007
@@ -519,7 +519,7 @@
public synchronized void removeService(String name) throws AxisFault {
AxisService service = (AxisService) allServices.remove(name);
if (service != null) {
- AxisServiceGroup serviceGroup = (AxisServiceGroup) service.getParent();
+ AxisServiceGroup serviceGroup = service.getAxisServiceGroup();
serviceGroup.removeService(name);
log.debug(Messages.getMessage("serviceremoved", name));
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java Tue Jul 3 06:53:34 2007
@@ -251,7 +251,7 @@
MessageContext msgContext,
SessionContext sessionContext) throws AxisFault {
ServiceGroupContext serviceGroupContext;
- AxisServiceGroup axisServiceGroup = (AxisServiceGroup) service.getParent();
+ AxisServiceGroup axisServiceGroup = service.getAxisServiceGroup();
ConfigurationContext configCtx = msgContext.getConfigurationContext();
serviceGroupContext = configCtx.createServiceGroupContext(axisServiceGroup);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java Tue Jul 3 06:53:34 2007
@@ -164,8 +164,7 @@
ConfigurationContext configurationContext) throws AxisFault {
String serviceGroupContextId = UUIDGenerator.getUUID();
ServiceGroupContext serviceGroupContext =
- configurationContext.createServiceGroupContext((AxisServiceGroup)axisService
- .getParent());
+ configurationContext.createServiceGroupContext(axisService.getAxisServiceGroup());
serviceGroupContext.setId(serviceGroupContextId);
configurationContext.addServiceGroupContextIntoSoapSessionTable(serviceGroupContext);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/ContextHierarchyTest.java Tue Jul 3 06:53:34 2007
@@ -23,7 +23,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
@@ -49,7 +48,7 @@
public void testCompleteHierarchy() throws AxisFault {
ServiceGroupContext serviceGroupContext = configurationContext.createServiceGroupContext(
- (AxisServiceGroup) axisService.getParent());
+ axisService.getAxisServiceGroup());
ServiceContext serviceContext = serviceGroupContext.getServiceContext(axisService);
OperationContext opContext = axisOperation.findOperationContext(msgctx,
serviceContext);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java Tue Jul 3 06:53:34 2007
@@ -47,7 +47,7 @@
AxisService axisService = new AxisService("TempSC");
configContext.getAxisConfiguration().addService(axisService);
ServiceGroupContext sgc = configContext.createServiceGroupContext(
- (AxisServiceGroup) axisService.getParent());
+ axisService.getAxisServiceGroup());
ServiceContext sessionContext = sgc.getServiceContext(axisService);
MessageContext messageContext1 = this.getBasicMessageContext();
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcherTest.java Tue Jul 3 06:53:34 2007
@@ -49,7 +49,7 @@
as1.addOperation(operation2);
ConfigurationContext cc = new ConfigurationContext(ac);
- ServiceGroupContext sgc = cc.createServiceGroupContext((AxisServiceGroup)as1.getParent());
+ ServiceGroupContext sgc = cc.createServiceGroupContext(as1.getAxisServiceGroup());
ServiceContext serviceContext = sgc.getServiceContext(as1);
OperationContext oc1 = serviceContext.createOperationContext(operation1);
OperationContext oc2 = serviceContext.createOperationContext(operation2);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Tue Jul 3 06:53:34 2007
@@ -77,7 +77,7 @@
mc.setTransportOut(transport);
ServiceGroupContext sgc = configContext.createServiceGroupContext(
- (AxisServiceGroup)service.getParent());
+ service.getAxisServiceGroup());
ServiceContext sc = sgc.getServiceContext(service);
OperationContext opContext = sc.createOperationContext(axisOp);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSaveATest.java Tue Jul 3 06:53:34 2007
@@ -166,7 +166,7 @@
//-----------------------------------------------------------------
serviceGroupContext = configurationContext.
- createServiceGroupContext((AxisServiceGroup)axisService.getParent());
+ createServiceGroupContext(axisService.getAxisServiceGroup());
serviceGroupContext.setId("ServiceGroupContextTest");
ServiceContext serviceContext = serviceGroupContext.getServiceContext(axisService);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/MessageContextSelfManagedDataTest.java Tue Jul 3 06:53:34 2007
@@ -225,7 +225,7 @@
//-----------------------------------------------------------------
serviceGroupContext =
- cfgContext.createServiceGroupContext((AxisServiceGroup)axisService.getParent());
+ cfgContext.createServiceGroupContext(axisService.getAxisServiceGroup());
serviceGroupContext.setId("ServiceGroupContextTest");
serviceContext = serviceGroupContext.getServiceContext(axisService);
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/OperationContextSaveTest.java Tue Jul 3 06:53:34 2007
@@ -159,8 +159,7 @@
//-----------------------------------------------------------------
serviceGroupContext =
- configurationContext.createServiceGroupContext((AxisServiceGroup)axisService
- .getParent());
+ configurationContext.createServiceGroupContext(axisService.getAxisServiceGroup());
serviceGroupContext.setId("ServiceGroupContextTest");
serviceContext = serviceGroupContext.getServiceContext(axisService);
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java?view=diff&rev=552843&r1=552842&r2=552843
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java Tue Jul 3 06:53:34 2007
@@ -147,7 +147,7 @@
configContext.getAxisConfiguration().addService(service);
- return new ServiceGroupContext(configContext, (AxisServiceGroup)service.getParent())
+ return new ServiceGroupContext(configContext, service.getAxisServiceGroup())
.getServiceContext(service);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org