Author: dkulp
Date: Tue Aug 26 10:27:47 2008
New Revision: 689143
URL: http://svn.apache.org/viewvc?rev=689143&view=rev
Log:
Merged revisions 688870 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r688870 | bimargulies | 2008-08-25 16:43:34 -0400 (Mon, 25 Aug 2008) | 2 lines
Fix the superficial symptom of CXF-1738, since it might come up in a real
case.
........
Added:
cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java
- copied unchanged from r688870,
cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 26 10:27:47 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 26 10:27:47 2008
@@ -1 +1 @@
-/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735
+/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870
Modified:
cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java?rev=689143&r1=689142&r2=689143&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
Tue Aug 26 10:27:47 2008
@@ -213,6 +213,9 @@
.toString(), element.getQName(), element);
}
}
+ } else if (elementInfo.type.getQName() != null
+ &&
XmlSchemaConstants.ANY_TYPE_QNAME.equals(elementInfo.type.getQName())) {
+ elementInfo.anyType = true;
}
}