You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2007/07/25 14:07:07 UTC
svn commit: r559414 - in
/webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport:
http/HTTPWorker.java http/ListingAgent.java nhttp/ServerWorker.java
Author: deepal
Date: Wed Jul 25 05:07:06 2007
New Revision: 559414
URL: http://svn.apache.org/viewvc?view=rev&rev=559414
Log:
fixing the schema import issue when a schema has import statement to another
Modified:
webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/nhttp/ServerWorker.java
Modified: webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java?view=diff&rev=559414&r1=559413&r2=559414
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java Wed Jul 25 05:07:06 2007
@@ -171,6 +171,13 @@
//write out the correct schema
Map schemaTable = service.getSchemaMappingTable();
XmlSchema schema = (XmlSchema) schemaTable.get(schemaName);
+ if (schema == null) {
+ int dotIndex = schemaName.indexOf('.');
+ if (dotIndex > 0) {
+ String schemaKey = schemaName.substring(0,dotIndex);
+ schema = (XmlSchema) schemaTable.get(schemaKey);
+ }
+ }
//schema found - write it to the stream
if (schema != null) {
response.setStatus(HttpStatus.SC_OK);
Modified: webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java?view=diff&rev=559414&r1=559413&r2=559414
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java Wed Jul 25 05:07:06 2007
@@ -272,6 +272,13 @@
if (!"".equals(xsds)) {
XmlSchema schema =
(XmlSchema) schemaMappingtable.get(xsds);
+ if (schema == null) {
+ int dotIndex = xsds.indexOf('.');
+ if (dotIndex > 0) {
+ String schemaKey = xsds.substring(0,dotIndex);
+ schema = (XmlSchema) schemaMappingtable.get(schemaKey);
+ }
+ }
if (schema != null) {
//schema is there - pump it outs
OutputStream out = res.getOutputStream();
Modified: webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/nhttp/ServerWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/nhttp/ServerWorker.java?view=diff&rev=559414&r1=559413&r2=559414
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/nhttp/ServerWorker.java (original)
+++ webservices/axis2/branches/java/1_3/modules/kernel/src/org/apache/axis2/transport/nhttp/ServerWorker.java Wed Jul 25 05:07:06 2007
@@ -336,7 +336,14 @@
service.populateSchemaMappings();
//write out the correct schema
Map schemaTable = service.getSchemaMappingTable();
- final XmlSchema schema = (XmlSchema)schemaTable.get(schemaName);
+ XmlSchema schema = (XmlSchema)schemaTable.get(schemaName);
+ if (schema == null) {
+ int dotIndex = schemaName.indexOf('.');
+ if (dotIndex > 0) {
+ String schemaKey = schemaName.substring(0,dotIndex);
+ schema = (XmlSchema) schemaTable.get(schemaKey);
+ }
+ }
//schema found - write it to the stream
if (schema != null) {
response.addHeader(CONTENT_TYPE, TEXT_XML);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org