[Smartfrog-checkins] core/components/cddlm/src/org/smartfrog/services/cddlm/cdl CdlCatalog.java,1.4,

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16025/components/cddlm/src/org/smartfrog/services/cddlm/cdl

Modified Files:
	CdlCatalog.java CdlDocument.java CdlParser.java Constants.java 
	ResourceLoader.java 
Log Message:
no code changes, just IDE reformatted code/xml

Index: CdlCatalog.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/CdlCatalog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CdlCatalog.java	10 Aug 2004 22:36:26 -0000	1.4
--- CdlCatalog.java	11 Aug 2004 09:24:31 -0000	1.5
***************
*** 20,28 ****
  package org.smartfrog.services.cddlm.cdl;

  import org.xml.sax.EntityResolver;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;
- import org.apache.commons.logging.LogFactory;
- import org.apache.commons.logging.Log;

  import javax.xml.transform.Source;
--- 20,28 ----
  package org.smartfrog.services.cddlm.cdl;

+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  import org.xml.sax.EntityResolver;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;

  import javax.xml.transform.Source;
***************
*** 38,42 ****
   */

! public class CdlCatalog implements URIResolver,EntityResolver {

      /**
--- 38,42 ----
   */

! public class CdlCatalog implements URIResolver, EntityResolver {

      /**
***************
*** 45,54 ****
      private ResourceLoader loader;

!     private static Log log=LogFactory.getLog(CdlCatalog.class);

      /**
       * where all the files really live
       */
!     private String packageBase =XSD;

      /**
--- 45,54 ----
      private ResourceLoader loader;

!     private static Log log = LogFactory.getLog(CdlCatalog.class);

      /**
       * where all the files really live
       */
!     private String packageBase = XSD;

      /**
***************
*** 70,79 ****
      }

!     private static final String XSD="org/smartfrog/services/cddlm/xsd/";

!     private static final String CDDLM_MAPPINGS[] ={
!       Constants.CDL_NAMESPACE,Constants.CDDLM_XSD_FILENAME,
!       Constants.CDL_API_NAMESPACE, Constants.DEPLOY_API_SCHEMA_FILENAME,
!       Constants.WS_ADDRESSING_NAMESPACE, "ws-addressing.xsd",
      };

--- 70,79 ----
      }

!     private static final String XSD = "org/smartfrog/services/cddlm/xsd/";

!     private static final String CDDLM_MAPPINGS[] = {
!         Constants.CDL_NAMESPACE, Constants.CDDLM_XSD_FILENAME,
!         Constants.CDL_API_NAMESPACE, Constants.DEPLOY_API_SCHEMA_FILENAME,
!         Constants.WS_ADDRESSING_NAMESPACE, "ws-addressing.xsd",
      };

***************
*** 87,103 ****
      /**
       * load a set of mappings in.
       * @param map array of name,value pairs to load
       */
      public void loadMappings(String map[]) {
!         assert map.length%2==0;
!         for(int i=0;i<map.length;i+=2) {
              String schema = map[i];
!             String filename = map[i+1];
!             mappings.put(schema,filename);
!             mappings.put(filename,filename);
          }
      }
      /**
       * look up a mapping
       * @param uri
       * @return
--- 87,106 ----
      /**
       * load a set of mappings in.
+      *
       * @param map array of name,value pairs to load
       */
      public void loadMappings(String map[]) {
!         assert map.length % 2 == 0;
!         for ( int i = 0; i < map.length; i += 2 ) {
              String schema = map[i];
!             String filename = map[i + 1];
!             mappings.put(schema, filename);
!             mappings.put(filename, filename);
          }
      }
+ 
      /**
       * look up a mapping
+      *
       * @param uri
       * @return
***************
*** 105,110 ****
      public String lookup(String uri) {
          Object value = mappings.get(uri);
!         if(value!=null) {
!             return packageBase + (String)value;
          } else {
              return null;
--- 108,113 ----
      public String lookup(String uri) {
          Object value = mappings.get(uri);
!         if ( value != null ) {
!             return packageBase + (String) value;
          } else {
              return null;
***************
*** 126,136 ****
      public Source resolve(String href, String base)
              throws TransformerException {
!         String resource=lookup(href);
!         if(resource==null) {
              return null;
          }
          try {
!             InputStream in=loader.loadResource(resource);
!             StreamSource source=new StreamSource(in,href);
              return source;
          } catch (IOException e) {
--- 129,139 ----
      public Source resolve(String href, String base)
              throws TransformerException {
!         String resource = lookup(href);
!         if ( resource == null ) {
              return null;
          }
          try {
!             InputStream in = loader.loadResource(resource);
!             StreamSource source = new StreamSource(in, href);
              return source;
          } catch (IOException e) {
***************
*** 174,185 ****
      public InputSource resolveEntity(String publicId, String systemId)
              throws SAXException, IOException {
!         if(log.isDebugEnabled()) {
!             log.debug("resolving "+systemId);
          }
          String resource = lookup(systemId);
!         if(resource==null) {
!             String filename=getFilenameFromSystemID(systemId);
!             if(filename!=null) {
!                 return resolveEntity(publicId,filename);
              }
              log.debug("no match");
--- 177,188 ----
      public InputSource resolveEntity(String publicId, String systemId)
              throws SAXException, IOException {
!         if ( log.isDebugEnabled() ) {
!             log.debug("resolving " + systemId);
          }
          String resource = lookup(systemId);
!         if ( resource == null ) {
!             String filename = getFilenameFromSystemID(systemId);
!             if ( filename != null ) {
!                 return resolveEntity(publicId, filename);
              }
              log.debug("no match");
***************
*** 196,212 ****
      /**
       * extract any filename from this file.
       * @param systemId
       * @return
       */
      String getFilenameFromSystemID(String systemId) {
!         if(!systemId.startsWith("file://")) {
              return null;
          }
!         int lastSlash=systemId.lastIndexOf('/');
!         if(lastSlash==-1) {
              return null;
          }
!         String endString=systemId.substring(lastSlash+1);
!         if(endString.length()>0) {
              return endString;
          } else {
--- 199,216 ----
      /**
       * extract any filename from this file.
+      *
       * @param systemId
       * @return
       */
      String getFilenameFromSystemID(String systemId) {
!         if ( !systemId.startsWith("file://") ) {
              return null;
          }
!         int lastSlash = systemId.lastIndexOf('/');
!         if ( lastSlash == -1 ) {
              return null;
          }
!         String endString = systemId.substring(lastSlash + 1);
!         if ( endString.length() > 0 ) {
              return endString;
          } else {

Index: ResourceLoader.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/ResourceLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ResourceLoader.java	14 Jul 2004 12:46:36 -0000	1.3
--- ResourceLoader.java	11 Aug 2004 09:24:31 -0000	1.4
***************
*** 33,37 ****
   * loading.
   * created Jul 1,
!  *
   * 2004 4:44:38 PM
   */
--- 33,37 ----
   * loading.
   * created Jul 1,
!  * <p/>
   * 2004 4:44:38 PM
   */
***************
*** 103,107 ****
      private void assertResourceLoaded(InputStream in, String resourcename)
              throws IOException {
!         if (in == null) {
              throw new IOException("Not found: " + resourcename);
          }
--- 103,107 ----
      private void assertResourceLoaded(InputStream in, String resourcename)
              throws IOException {
!         if ( in == null ) {
              throw new IOException("Not found: " + resourcename);
          }
***************
*** 117,121 ****
      public InputStream loadResource(String resourceName) throws IOException {
          InputStream in;
!         if (codebase != null) {
              in = loadResourceThroughSmartFrog(resourceName);
          } else {
--- 117,121 ----
      public InputStream loadResource(String resourceName) throws IOException {
          InputStream in;
!         if ( codebase != null ) {
              in = loadResourceThroughSmartFrog(resourceName);
          } else {

Index: Constants.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/Constants.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Constants.java	4 Aug 2004 16:07:02 -0000	1.3
--- Constants.java	11 Aug 2004 09:24:31 -0000	1.4
***************
*** 35,48 ****
      }

!     public static final String CDL_NAMESPACE="http://gridforge.org/cddlm/xml/2004/07/30/";

      public static final String CDL_API_NAMESPACE = "http://gridforum.org/cddlm/serviceAPI/api/2004/07/30";

!     public static final String CDL_ELT_CDL="cdl";

!     public static final String XPATH_URI="http://www.w3.org/TR/1999/REC-xpath-19991116";

!     public static final String SMARTFROG_NAMESPACE= "http://gridforge.org/cddlm/smartfrog/2004/07/30";

!     public static final String ANT_NAMESPACE="http://ant.apache.org/xsd/1.7";
  }
--- 35,48 ----
      }

!     public static final String CDL_NAMESPACE = "http://gridforge.org/cddlm/xml/2004/07/30/";

      public static final String CDL_API_NAMESPACE = "http://gridforum.org/cddlm/serviceAPI/api/2004/07/30";

!     public static final String CDL_ELT_CDL = "cdl";

!     public static final String XPATH_URI = "http://www.w3.org/TR/1999/REC-xpath-19991116";

!     public static final String SMARTFROG_NAMESPACE = "http://gridforge.org/cddlm/smartfrog/2004/07/30";

!     public static final String ANT_NAMESPACE = "http://ant.apache.org/xsd/1.7";
  }

Index: CdlParser.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/CdlParser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CdlParser.java	27 Jul 2004 15:07:30 -0000	1.9
--- CdlParser.java	11 Aug 2004 09:24:31 -0000	1.10
***************
*** 21,25 ****

- 
  import nu.xom.Builder;
  import nu.xom.ParsingException;
--- 21,24 ----
***************
*** 45,49 ****
      /**
       * builder class
!       */
      private Builder builder;

--- 44,48 ----
      /**
       * builder class
!      */
      private Builder builder;

***************
*** 60,68 ****
          XMLReader xerces = createXercesParser(validate);

!         if(validate) {
!             CdlCatalog resolver=new CdlCatalog(loader);
              xerces.setEntityResolver(resolver);
          }
!         builder = new Builder(xerces,validate);
      }

--- 59,67 ----
          XMLReader xerces = createXercesParser(validate);

!         if ( validate ) {
!             CdlCatalog resolver = new CdlCatalog(loader);
              xerces.setEntityResolver(resolver);
          }
!         builder = new Builder(xerces, validate);
      }

***************
*** 70,73 ****
--- 69,73 ----
       * create our XML parser.
       * We are relying on xerces here, and will fail if it is not found.
+      *
       * @param validate
       * @return
***************
*** 77,84 ****
          XMLReader 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);
--- 77,84 ----
          XMLReader 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);
***************
*** 95,99 ****
       * @throws ParsingException
       */
!     public CdlDocument parseFile(String filename) throws IOException,  ParsingException {
          File f = new File(filename);
          return new CdlDocument(builder.build(f));
--- 95,99 ----
       * @throws ParsingException
       */
!     public CdlDocument parseFile(String filename) throws IOException, ParsingException {
          File f = new File(filename);
          return new CdlDocument(builder.build(f));
***************
*** 102,105 ****
--- 102,106 ----
      /**
       * parse a stream that we are provided
+      *
       * @param instream
       * @return
***************
*** 107,112 ****
       * @throws ParsingException
       */
!     public CdlDocument parseStream(InputStream instream) throws IOException, ParsingException
!              {
          return new CdlDocument(builder.build(instream));
      }
--- 108,112 ----
       * @throws ParsingException
       */
!     public CdlDocument parseStream(InputStream instream) throws IOException, ParsingException {
          return new CdlDocument(builder.build(instream));
      }
***************
*** 114,117 ****
--- 114,118 ----
      /**
       * load and parse a resoure through our current resource loader
+      *
       * @param resource
       * @return

Index: CdlDocument.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/CdlDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CdlDocument.java	16 Jul 2004 16:25:39 -0000	1.3
--- CdlDocument.java	11 Aug 2004 09:24:31 -0000	1.4
***************
*** 53,61 ****
      /**
       * validity test
       * @return
       */
      public boolean isValid() {
          //TODO
!         return document!=null;
      }

--- 53,62 ----
      /**
       * validity test
+      *
       * @return
       */
      public boolean isValid() {
          //TODO
!         return document != null;
      }

***************
*** 73,81 ****

      public int getErrorColumn() {
!         return exception==null?0:exception.getColumnNumber();
      }

      public void throwAnyException() throws ParsingException {
!         if (exception!=null) {
              throw exception;
          }
--- 74,82 ----

      public int getErrorColumn() {
!         return exception == null ? 0 : exception.getColumnNumber();
      }

      public void throwAnyException() throws ParsingException {
!         if ( exception != null ) {
              throw exception;
          }
***************
*** 83,89 ****

! 
!     public void assertTrue(String message,boolean test ) throws CdlParsingException {
!         if(test==false) {
              throw new CdlParsingException(message);
          }
--- 84,89 ----

!     public void assertTrue(String message, boolean test) throws CdlParsingException {
!         if ( test == false ) {
              throw new CdlParsingException(message);
          }
***************
*** 93,103 ****
          Element root = document.getRootElement();
          String uri = root.getNamespaceURI();
!         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) {
              assertTrue(ERROR_NO_PATHLANGUAGE, pathLangAttr != null);
!             String language=pathLangAttr.getValue();
!             assertTrue(ERROR_BAD_PATHLANGUAGE,Constants.XPATH_URI.equals(language));
          }
      }
--- 93,103 ----
          Element root = document.getRootElement();
          String uri = root.getNamespaceURI();
!         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 ) {
              assertTrue(ERROR_NO_PATHLANGUAGE, pathLangAttr != null);
!             String language = pathLangAttr.getValue();
!             assertTrue(ERROR_BAD_PATHLANGUAGE, Constants.XPATH_URI.equals(language));
          }
      }

[Smartfrog-checkins] core/components/cddlm/src/org/smartfrog/services/cddlm/cdl CdlCatalog.java,1.4,

[Smartfrog-checkins] core/components/cddlm/src/org/smartfrog/services/cddlm/cdl CdlCatalog.java,1.4,1.5 CdlDocument.java,1.3,1.4 CdlParser.java,1.9,1.10 Constants.java,1.3,1.4 ResourceLoader.java,1.3,1.4