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 2006/05/19 22:33:34 UTC
svn commit: r407905 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
client/ServiceClient.java description/AxisService.java
description/AxisServiceGroup.java engine/AxisConfiguration.java
Author: deepal
Date: Fri May 19 13:33:34 2006
New Revision: 407905
URL: http://svn.apache.org/viewvc?rev=407905&view=rev
Log:
-oops isclientside flag should be there in AxisService not AxisServiceGroup
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=407905&r1=407904&r2=407905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java Fri May 19 13:33:34 2006
@@ -92,6 +92,7 @@
this.axisService = createAnonymousService();
}
if (this.axisConfig.getService(this.axisService.getName()) == null) {
+ this.axisService.setClientSide(true);
this.axisConfig.addService(this.axisService);
} else {
throw new AxisFault(Messages.getMessage(
@@ -99,7 +100,6 @@
this.axisService.getName()));
}
AxisServiceGroup axisServiceGroup = (AxisServiceGroup) this.axisService.getParent();
- axisServiceGroup.setClientSide(true);
ServiceGroupContext sgc = new ServiceGroupContext(this.configContext,
axisServiceGroup);
this.serviceContext = sgc.getServiceContext(this.axisService);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=407905&r1=407904&r2=407905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Fri May 19 13:33:34 2006
@@ -158,6 +158,7 @@
// Flag representing whether WS-Addressing is required to use this service.
// Reflects the wsaw:UsingAddressing wsdl extension element
private String wsaddressingFlag = AddressingConstants.ADDRESSING_UNSPECIFIED;
+ private boolean clientSide = false;
public String getWSAddressingFlag() {
return wsaddressingFlag;
@@ -1369,6 +1370,14 @@
}
return swappedTable;
+ }
+
+ public boolean isClientSide() {
+ return clientSide;
+ }
+
+ public void setClientSide(boolean clientSide) {
+ this.clientSide = clientSide;
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java?rev=407905&r1=407904&r2=407905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java Fri May 19 13:33:34 2006
@@ -47,7 +47,6 @@
private String serviceGroupName;
//To check whether server side service or client side service
- private boolean clientSide = false;
/**
* Field services
@@ -212,13 +211,5 @@
}
}
return false;
- }
-
- public boolean isClientSide() {
- return clientSide;
- }
-
- public void setClientSide(boolean clientSide) {
- this.clientSide = clientSide;
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=407905&r1=407904&r2=407905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Fri May 19 13:33:34 2006
@@ -228,7 +228,7 @@
while (services.hasNext()) {
description = (AxisService) services.next();
allservices.put(description.getName(), description);
- if (!axisServiceGroup.isClientSide()) {
+ if (!description.isClientSide()) {
notifyObservers(AxisEvent.SERVICE_DEPLOY, description);
}
}
@@ -246,7 +246,7 @@
while (services.hasNext()) {
AxisService axisService = (AxisService) services.next();
allservices.remove(axisService.getName());
- if (!axisServiceGroup.isClientSide()) {
+ if (!axisService.isClientSide()) {
notifyObservers(AxisEvent.SERVICE_REMOVE, axisService);
}
}
@@ -373,8 +373,7 @@
AxisObserver axisObserver = (AxisObserver) observersList.get(i);
try {
- AxisServiceGroup parent = (AxisServiceGroup) service.getParent();
- if (!parent.isClientSide()) {
+ if (!service.isClientSide()) {
axisObserver.serviceUpdate(event, service);
}
} catch (Throwable e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org