You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/08/28 22:26:59 UTC
svn commit: r1378311 - in /cxf/branches/2.5.x-fixes/common:
common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java
Author: dkulp
Date: Tue Aug 28 20:26:59 2012
New Revision: 1378311
URL: http://svn.apache.org/viewvc?rev=1378311&view=rev
Log:
Merged revisions 1378299 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1378299 | dkulp | 2012-08-28 16:19:31 -0400 (Tue, 28 Aug 2012) | 10 lines
Merged revisions 1378288 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1378288 | dkulp | 2012-08-28 16:13:27 -0400 (Tue, 28 Aug 2012) | 2 lines
Update a couple of tests so that they will compile if xerces 2.10 is pulled in instead of 2.9
........
........
Modified:
cxf/branches/2.5.x-fixes/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
cxf/branches/2.5.x-fixes/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java
Modified: cxf/branches/2.5.x-fixes/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java?rev=1378311&r1=1378310&r2=1378311&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java (original)
+++ cxf/branches/2.5.x-fixes/common/common/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java Tue Aug 28 20:26:59 2012
@@ -69,19 +69,21 @@ public class ImportRepairTest extends As
static boolean dumpSchemas;
- private static final class ListLSInput implements LSInputList {
- private final List<DOMLSInput> inputs;
-
- private ListLSInput(List<DOMLSInput> inputs) {
- this.inputs = inputs;
+ @SuppressWarnings("rawtypes")
+ private static final class ListLSInput extends ArrayList implements LSInputList {
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings("unchecked")
+ private ListLSInput(List inputs) {
+ super(inputs);
}
public int getLength() {
- return inputs.size();
+ return size();
}
public LSInput item(int index) {
- return inputs.get(index);
+ return (LSInput)get(index);
}
}
Modified: cxf/branches/2.5.x-fixes/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java?rev=1378311&r1=1378310&r2=1378311&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java (original)
+++ cxf/branches/2.5.x-fixes/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java Tue Aug 28 20:26:59 2012
@@ -46,22 +46,24 @@ import org.apache.xerces.xs.XSLoader;
*/
class XercesSchemaValidationUtils {
- private static final class ListLSInput implements LSInputList {
- private final List<DOMLSInput> inputs;
-
- private ListLSInput(List<DOMLSInput> inputs) {
- this.inputs = inputs;
+ @SuppressWarnings("rawtypes")
+ private static final class ListLSInput extends ArrayList implements LSInputList {
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings("unchecked")
+ private ListLSInput(List inputs) {
+ super(inputs);
}
public int getLength() {
- return inputs.size();
+ return size();
}
public LSInput item(int index) {
- return inputs.get(index);
+ return (LSInput)get(index);
}
}
-
+
private XSImplementation impl;
XercesSchemaValidationUtils() {