Menu
▾
▴
[Smartfrog-checkins] core/components/cddlm/src/org/smartfrog/services/cddlm/cdl XmlHelper.java,NONE,1.1 CdlDocument.java,1.5,1.6 CdlParser.java,1.11,1.12 Constants.java,1.4,1.5
|
From: Steve L. <st...@us...> - 2004-08-13 15:30:03
|
Update of /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17062/components/cddlm/src/org/smartfrog/services/cddlm/cdl Modified Files: CdlDocument.java CdlParser.java Constants.java Added Files: XmlHelper.java Log Message: this compiles and parses tests, but every endpoint language throws 'not implemented' I need to extract the XML payload of the descriptors, save to file, then deploy. --- NEW FILE: XmlHelper.java --- /** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA For more information: www.smartfrog.org */ package org.smartfrog.services.cddlm.cdl; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; /** * created Aug 13, 2004 2:39:09 PM */ public class XmlHelper { public static final String PARSER_NAME = "org.apache.xerces.parsers.SAXParser"; /** * create our XML parser. We are relying on xerces here, and will fail if it * is not found. * * @param validate * @return * @throws org.xml.sax.SAXException */ public static XMLReader createXmlParser(boolean validate) throws SAXException { XMLReader xerces = null; try { xerces = XMLReaderFactory.createXMLReader(PARSER_NAME); xerces.setFeature( "http://apache.org/xml/features/validation/schema", validate); xerces.setFeature( "http://apache.org/xml/features/validation/schema-full-checking", validate); xerces.setFeature( "http://apache.org/xml/features/standard-uri-conformant", true); xerces.setFeature( "http://apache.org/xml/features/disallow-doctype-decl", false); xerces.setFeature( "http://xml.org/sax/features/external-general-entities", false); } catch (SAXException e) { throw e; } return xerces; } } Index: Constants.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/Constants.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Constants.java 11 Aug 2004 09:24:31 -0000 1.4 --- Constants.java 13 Aug 2004 15:29:23 -0000 1.5 *************** *** 45,48 **** --- 45,55 ---- public static final String SMARTFROG_NAMESPACE = "http://gridforge.org/cddlm/smartfrog/2004/07/30"; + public static final String FAULTS_NAMESPACE = "http://gridforge.org/cddlm/serviceAPI/faults/2004/07/30"; + public static final String ANT_NAMESPACE = "http://ant.apache.org/xsd/1.7"; + + public static final String OPTION_VALIDATE_ONLY="http://gridforum.org/cddlm/serviceAPI/options/validateOnly/2004/07/30"; + + public static final String OPTION_PROPERTIES = "http://gridforum.org/cddlm/serviceAPI/options/propertyMap/2004/07/30"; + } Index: CdlParser.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/CdlParser.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CdlParser.java 12 Aug 2004 16:03:44 -0000 1.11 --- CdlParser.java 13 Aug 2004 15:29:23 -0000 1.12 *************** *** 58,62 **** resourceLoader = loader; //we mandate Xerces, as the others cannot handle schema so well ! XMLReader xerces = createXercesParser(validate); if ( validate ) { --- 58,62 ---- resourceLoader = loader; //we mandate Xerces, as the others cannot handle schema so well ! XMLReader xerces = XmlHelper.createXmlParser(validate); if ( validate ) { *************** *** 67,97 **** } - /** - * create our XML parser. - * We are relying on xerces here, and will fail if it is not found. - * - * @param validate - * @return - * @throws SAXException - */ - private XMLReader createXercesParser(boolean validate) throws SAXException { - XMLReader xerces = null; - try { - xerces = XMLReaderFactory.createXMLReader("org.apache.xerces.parsers.SAXParser"); - xerces.setFeature("http://apache.org/xml/features/validation/schema", - validate); - xerces.setFeature("http://apache.org/xml/features/validation/schema-full-checking", - validate); - xerces.setFeature("http://apache.org/xml/features/standard-uri-conformant", true); - xerces.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false); - xerces.setFeature("http://xml.org/sax/features/external-general-entities", false); - } catch (SAXException e) { - - throw e; - - } - return xerces; - } - /** --- 67,70 ---- Index: CdlDocument.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/CdlDocument.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CdlDocument.java 12 Aug 2004 16:03:44 -0000 1.5 --- CdlDocument.java 13 Aug 2004 15:29:23 -0000 1.6 *************** *** 35,43 **** private ParsingException exception; ! public static final String ERROR_WRONG_NAMESPACE = "Cannot find the declaration of element 'cdl:cdl'"; public static final String ERROR_WRONG_ROOT_ELEMENT = "Root element is not 'cdl'"; public static final String ERROR_BAD_PATHLANGUAGE = "Attribute 'pathlanguage' is not allowed to appear in element 'cdl:cdl'"; public static final String ERROR_NO_PATHLANGUAGE = "pathlanguage attribute not found"; ! public CdlDocument(Document doc) throws CdlParsingException { --- 35,44 ---- private ParsingException exception; ! public static final String ERROR_WRONG_NAMESPACE = "The document is not in CDL namespace"; public static final String ERROR_WRONG_ROOT_ELEMENT = "Root element is not 'cdl'"; + /* public static final String ERROR_BAD_PATHLANGUAGE = "Attribute 'pathlanguage' is not allowed to appear in element 'cdl:cdl'"; public static final String ERROR_NO_PATHLANGUAGE = "pathlanguage attribute not found"; ! */ public CdlDocument(Document doc) throws CdlParsingException { *************** *** 95,98 **** --- 96,100 ---- assertTrue(ERROR_WRONG_NAMESPACE, Constants.CDL_NAMESPACE.equals(uri)); assertTrue(ERROR_WRONG_ROOT_ELEMENT, Constants.CDL_ELT_CDL.equals(root.getLocalName())); + /* Attribute pathLangAttr = root.getAttribute("pathlanguage", Constants.CDL_NAMESPACE); if ( pathLangAttr != null ) { *************** *** 101,104 **** --- 103,107 ---- assertTrue(ERROR_BAD_PATHLANGUAGE, Constants.XPATH_URI.equals(language)); } + */ } |