Index: import-parsers/common-cartridge/src/java/org/sakaiproject/importer/impl/CommonCartridgeFileParser.java =================================================================== --- import-parsers/common-cartridge/src/java/org/sakaiproject/importer/impl/CommonCartridgeFileParser.java (revision 78511) +++ import-parsers/common-cartridge/src/java/org/sakaiproject/importer/impl/CommonCartridgeFileParser.java (working copy) @@ -60,7 +60,7 @@ import org.xml.sax.SAXException; public class CommonCartridgeFileParser extends IMSFileParser { - private static final String CC_SCHEMA_NAME = "IMS Common Cartridge"; + private static final String CC_NAMESPACE_URI = "http://www.imsglobal.org/xsd/imscc/imscp_v1p1"; public CommonCartridgeFileParser() { // add resource translators here @@ -78,9 +78,13 @@ public boolean isValidArchive(byte[] fileData) { if (super.isValidArchive(fileData)) { Document manifest = extractFileAsDOM("/imsmanifest.xml", fileData); - return CC_SCHEMA_NAME.equals(XPathHelper.getNodeValue("/manifest/metadata/schema", manifest)); + return (enclosingDocumentContainsNamespaceDeclaration(manifest, CC_NAMESPACE_URI)); } else return false; } + + private boolean enclosingDocumentContainsNamespaceDeclaration(Node node, String nameSpaceURI) { + return node.isDefaultNamespace(CC_NAMESPACE_URI); + } public ImportFileParser newParser() { return new CommonCartridgeFileParser();