You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by aj...@apache.org on 2007/10/22 17:46:09 UTC
svn commit: r587131 - in /webservices/commons/trunk/modules/XmlSchema/src:
main/java/org/apache/ws/commons/schema/SchemaBuilder.java
main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java
test/java/tests/ExternalAttTest.java
Author: ajith
Date: Mon Oct 22 08:46:08 2007
New Revision: 587131
URL: http://svn.apache.org/viewvc?rev=587131&view=rev
Log:
Fixing WSCOMMONS-261. Need a test case but the code modifications did not break any existing tests
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=587131&r1=587130&r2=587131&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java Mon Oct 22 08:46:08 2007
@@ -1925,7 +1925,7 @@
if (namespaceURI!= null &&
!"".equals(namespaceURI) && //ignore unqualified attributes
- !name.startsWith(Constants.XMLNS_ATTRIBUTE) && //ignore namespaces
+ !namespaceURI.startsWith(Constants.XMLNS_ATTRIBUTE_NS_URI) && //ignore namespaces
!Constants.URI_2001_SCHEMA_XSD.equals(namespaceURI))
//does not belong to the schema namespace by any chance!
{
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java?rev=587131&r1=587130&r2=587131&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java Mon Oct 22 08:46:08 2007
@@ -49,7 +49,11 @@
// we just attach the raw node either to the meta map of
// elements or the attributes
- Map metaInfoMap = new HashMap();
+
+ Map metaInfoMap = schemaObject.getMetaInfoMap();
+ if (metaInfoMap==null){
+ metaInfoMap = new HashMap();
+ }
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java?rev=587131&r1=587130&r2=587131&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java Mon Oct 22 08:46:08 2007
@@ -47,7 +47,9 @@
Map extenalAttributeMap = (Map)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
assertNotNull(extenalAttributeMap);
-
+
+ System.out.println(extenalAttributeMap);
+
assertEquals(1,extenalAttributeMap.size());
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org