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/07/27 10:18:31 UTC
svn commit: r426001 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: context/
deployment/resolver/ description/
Author: deepal
Date: Thu Jul 27 01:18:30 2006
New Revision: 426001
URL: http://svn.apache.org/viewvc?rev=426001&view=rev
Log:
- sending the correct SOAP action when creating dynamic client
- When deploying service in application scope , create service context even if you deploy service at the runtime
- fixing AXIS2-748
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=426001&r1=426000&r2=426001&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Thu Jul 27 01:18:30 2006
@@ -111,8 +111,9 @@
if (serviceContext == null) {
if (Constants.SCOPE_APPLICATION.equals(axisService.getScope())) {
+ String serviceGroupName = ((AxisServiceGroup) axisService.getParent()).getServiceGroupName();
serviceGroupContext = (ServiceGroupContext) applicationSessionServiceGroupContextTable.get(
- ((AxisServiceGroup) axisService.getParent()).getServiceGroupName());
+ serviceGroupName);
if (serviceGroupContext == null) {
AxisServiceGroup axisServiceGroup = messageContext.getAxisServiceGroup();
if (axisServiceGroup == null) {
@@ -120,6 +121,7 @@
}
serviceGroupContext = new ServiceGroupContext(messageContext.getConfigurationContext(),
axisServiceGroup);
+ applicationSessionServiceGroupContextTable.put(serviceGroupName, serviceGroupContext);
}
serviceContext = serviceGroupContext.getServiceContext(axisService);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java?rev=426001&r1=426000&r2=426001&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java Thu Jul 27 01:18:30 2006
@@ -42,9 +42,6 @@
this.aarFile = zipFile;
}
- /**
- * @return
- */
public InputSource getBaseInputSource() {
return new InputSource(baseInputStream);
}
@@ -52,7 +49,6 @@
/**
* @param parentLocation
* @param importLocation
- * @return
*/
public InputSource getImportInputSource(String parentLocation, String importLocation) {
if (isAbsolute(importLocation)) {
@@ -68,13 +64,11 @@
byte[] buf = new byte[1024];
int read;
ByteArrayOutputStream out;
+ String searchingStr;
while ((entry = zin.getNextEntry()) != null) {
- String entryName = entry.getName();
- if ((entryName.startsWith(DeploymentConstants.META_INF.toLowerCase())
- || entryName.startsWith(DeploymentConstants.META_INF))
- && entryName.endsWith(importLocation)) {
- //read the item into a byte array to allow the
- //stream to be closed
+ String entryName = entry.getName().toLowerCase();
+ searchingStr = (DeploymentConstants.META_INF + "/" + importLocation).toLowerCase();
+ if (entryName.equals(searchingStr)) {
out = new ByteArrayOutputStream();
while ((read = zin.read(buf)) > 0) {
out.write(buf, 0, read);
@@ -102,8 +96,6 @@
/**
* As for the zip there is no point in returning
* a base URI
- *
- * @return
*/
public String getBaseURI() {
// we don't care
@@ -112,8 +104,6 @@
/**
* returns the latest import
- *
- * @return
*/
public String getLatestImportURI() {
//we don't care about this either
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java?rev=426001&r1=426000&r2=426001&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java Thu Jul 27 01:18:30 2006
@@ -80,13 +80,11 @@
byte[] buf = new byte[1024];
int read;
ByteArrayOutputStream out;
+ String searchingStr;
while ((entry = zin.getNextEntry()) != null) {
- String entryName = entry.getName();
- if ((entryName.startsWith(DeploymentConstants.META_INF.toLowerCase())
- || entryName.startsWith(DeploymentConstants.META_INF))
- && entryName.endsWith(schemaLocation)) {
- //read the item into a byte array to allow the
- //stream to be closed
+ String entryName = entry.getName().toLowerCase();
+ searchingStr = (DeploymentConstants.META_INF + "/" + schemaLocation).toLowerCase();
+ if (entryName.equals(searchingStr)) {
out = new ByteArrayOutputStream();
while ((read = zin.read(buf)) > 0) {
out.write(buf, 0, read);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java?rev=426001&r1=426000&r2=426001&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutInAxisOperation.java Thu Jul 27 01:18:30 2006
@@ -248,9 +248,9 @@
}
if (mc.getSoapAction() == null || "".equals(mc.getSoapAction())) {
- Parameter soapaction = axisOp.getParameter(AxisOperation.SOAP_ACTION);
+ String soapaction = axisOp.getSoapAction();
if (soapaction != null) {
- mc.setSoapAction((String) soapaction.getValue());
+ mc.setSoapAction(soapaction);
}
}
addReferenceParameters(mc);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java?rev=426001&r1=426000&r2=426001&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/OutOnlyAxisOperation.java Thu Jul 27 01:18:30 2006
@@ -334,9 +334,9 @@
mc.setTransportOut(senderTransport);
if (mc.getSoapAction() == null) {
- Parameter soapaction = axisOp.getParameter(AxisOperation.SOAP_ACTION);
+ String soapaction = axisOp.getSoapAction();
if (soapaction != null) {
- mc.setSoapAction((String) soapaction.getValue());
+ mc.setSoapAction(soapaction);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org