svn commit: r1052529 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver: AARBasedWSDLLocator.java AARFileBasedURIResolver.java
Author: amilas
Date: Fri Dec 24 16:36:39 2010
New Revision: 1052529
URL: http://svn.apache.org/viewvc?rev=1052529&view=rev
Log:
applied to method suggested in AXIS2-3191 to fixe relative schema import problem
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java?rev=1052529&r1=1052528&r2=1052529&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
Fri Dec 24 16:36:39 2010
@@ -73,7 +73,7 @@ public class AARBasedWSDLLocator extends
public InputSource getImportInputSource(String parentLocation, String
importLocation) {
lastImportLocation =
URI.create(parentLocation).resolve(importLocation);
-if (isAbsolute(importLocation)) {
+if (isAbsolute(lastImportLocation.toString())) {
return super.resolveEntity(
null, importLocation, parentLocation);
} else {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java?rev=1052529&r1=1052528&r2=1052529&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java
Fri Dec 24 16:36:39 2010
@@ -52,8 +52,12 @@ public class AARFileBasedURIResolver ext
String targetNamespace,
String schemaLocation,
String baseUri) {
-//no issue with
-if (isAbsolute(schemaLocation)) {
+//no issue with abloslute schemas
+// this schema can be in a relative location for another base scheama.
so first
+// try to see the proper location
+
+ lastImportLocation = URI.create(baseUri).resolve(schemaLocation);
+if (isAbsolute(lastImportLocation.toString())) {
return super.resolveEntity(
targetNamespace, schemaLocation, baseUri);
} else {
@@ -63,7 +67,6 @@ public class AARFileBasedURIResolver ext
"Unsupported schema location " + schemaLocation);
}
-lastImportLocation = URI.create(baseUri).resolve(schemaLocation);
ZipInputStream zin = null;
try {
zin = new ZipInputStream(new FileInputStream(aarFile));
@@ -106,4 +109,5 @@ public class AARFileBasedURIResolver ext
log.info("AARFileBasedURIResolver: Unable to resolve" +
lastImportLocation);
return null;
}
+
}
svn commit: r1052745 - /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Author: amilas
Date: Sat Dec 25 03:33:34 2010
New Revision: 1052745
URL: http://svn.apache.org/viewvc?rev=1052745&view=rev
Log:
fixing the issue AXIS2-3034
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1052745&r1=1052744&r2=1052745&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Sat Dec 25 03:33:34 2010
@@ -2087,7 +2087,9 @@
-if (enumeration==null) throw new
java.lang.IllegalArgumentException();
+if ((enumeration == null) && !((value == null) ||
(value.equals("" {
+throw new java.lang.IllegalArgumentException();
+}
return enumeration;
}
public static
fromString(java.lang.String value,java.lang.String namespaceURI)
svn commit: r1052751 - /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Author: amilas
Date: Sat Dec 25 04:18:31 2010
New Revision: 1052751
URL: http://svn.apache.org/viewvc?rev=1052751&view=rev
Log:
fixed the issue AXIS2-3029
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1052751&r1=1052750&r2=1052751&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Sat Dec 25 04:18:31 2010
@@ -348,6 +348,13 @@ public class SchemaCompiler {
//add the schema to the loaded schema list
if (!loadedSchemaMap.containsKey(schema.getTargetNamespace())) {
loadedSchemaMap.put(schema.getTargetNamespace(), schema);
+// when the target name space is not given
schema.getTargetNamesapce returns null.
+// but when importing import namesapce location is given as "".
+// this causese a problem in finding reference elements. see
AXIS2-3029
+// kept the null entry as well to safe gaurd any thing which acess
using null
+if (schema.getTargetNamespace() == null){
+loadedSchemaMap.put("", schema);
+}
}
// If we have/are loading a schema with a specific targetnamespace
from a certain URI,
