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

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-serv8605/components/cddlm/src/org/smartfrog/services/cddlm/cdl

Modified Files:
	CdlCatalog.java Constants.java 
Log Message:
we have just done our first deploy!

Index: Constants.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/Constants.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Constants.java	2 Sep 2004 08:34:14 -0000	1.6
--- Constants.java	3 Sep 2004 15:47:37 -0000	1.7
***************
*** 23,28 ****

  /**
!  * Date: 15-Jul-2004
!  * Time: 22:26:34
   */
  public class Constants {
--- 23,27 ----

  /**
!  * Date: 15-Jul-2004 Time: 22:26:34
   */
  public class Constants {
***************
*** 31,40 ****
      }

-     public static final String WS_ADDRESSING_NAMESPACE = "http://schemas.xmlsoap.org/ws/2003/03/addressing";
      public static final String CDDLM_XSD_FILENAME = "cddlm.xsd";
      public static final String DEPLOY_API_SCHEMA_FILENAME = "deployAPIschema.xsd";

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

--- 30,37 ----
***************
*** 47,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";
--- 44,49 ----
      public static final String SMARTFROG_NAMESPACE = "http://gridforge.org/cddlm/smartfrog/2004/07/30";

!     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: CdlCatalog.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/cddlm/src/org/smartfrog/services/cddlm/cdl/CdlCatalog.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CdlCatalog.java	12 Aug 2004 16:03:44 -0000	1.6
--- CdlCatalog.java	3 Sep 2004 15:47:37 -0000	1.7
***************
*** 22,31 ****
  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 org.xml.sax.XMLReader;
- import org.xml.sax.SAXNotSupportedException;
  import org.xml.sax.SAXNotRecognizedException;

  import javax.xml.transform.Source;
--- 22,32 ----
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
+ import org.smartfrog.services.cddlm.generated.faults.FaultCodes;
  import org.xml.sax.EntityResolver;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;
  import org.xml.sax.SAXNotRecognizedException;
+ import org.xml.sax.SAXNotSupportedException;
+ import org.xml.sax.XMLReader;

  import javax.xml.transform.Source;
***************
*** 36,40 ****
  import java.io.InputStream;
  import java.util.HashMap;
- import java.util.Iterator;

  /**
--- 37,40 ----
***************
*** 54,60 ****

      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",
      };

--- 54,60 ----

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

***************
*** 102,106 ****
      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];
--- 102,106 ----
      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];
***************
*** 118,122 ****
      public String lookup(String uri) {
          Object value = mappings.get(uri);
!         if ( value != null ) {
              return packageBase + (String) value;
          } else {
--- 118,122 ----
      public String lookup(String uri) {
          Object value = mappings.get(uri);
!         if (value != null) {
              return packageBase + (String) value;
          } else {
***************
*** 140,144 ****
              throws TransformerException {
          String resource = lookup(href);
!         if ( resource == null ) {
              return null;
          }
--- 140,144 ----
              throws TransformerException {
          String resource = lookup(href);
!         if (resource == null) {
              return null;
          }
***************
*** 187,197 ****
      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);
              }
--- 187,197 ----
      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);
              }
***************
*** 199,203 ****
              return null;
          } else {
!             if ( log.isDebugEnabled() ) {
                  log.debug("resolved to " + resource);
              }
--- 199,203 ----
              return null;
          } else {
!             if (log.isDebugEnabled()) {
                  log.debug("resolved to " + resource);
              }
***************
*** 213,217 ****
       */
      String getFilenameFromSystemID(String systemId) {
!         if ( !systemId.startsWith("file://") ) {
              return null;
          }
--- 213,217 ----
       */
      String getFilenameFromSystemID(String systemId) {
!         if (!systemId.startsWith("file://")) {
              return null;
          }
***************
*** 221,229 ****
      private String extractLastPathElement(String systemId) {
          int lastSlash = systemId.lastIndexOf('/');
!         if ( lastSlash == -1 ) {
              return null;
          }
          String endString = systemId.substring(lastSlash + 1);
!         if ( endString.length() > 0 ) {
              return endString;
          } else {
--- 221,229 ----
      private String extractLastPathElement(String systemId) {
          int lastSlash = systemId.lastIndexOf('/');
!         if (lastSlash == -1) {
              return null;
          }
          String endString = systemId.substring(lastSlash + 1);
!         if (endString.length() > 0) {
              return endString;
          } else {
***************
*** 233,245 ****

      /**
!      * 	    parser.setProperty(
!      "http://apache.org/xml/properties/schema/external-schemaLocation",
!      "http: //domain.com/mynamespace mySchema.xsd");
       * @param parser
       */
      public void setImportPaths(XMLReader parser)
              throws SAXNotSupportedException, SAXNotRecognizedException {
!         String[] map= CDDLM_MAPPINGS;
!         StringBuffer buffer=new StringBuffer();
          for (int i = 0; i < map.length; i += 2) {
              String schema = map[i];
--- 233,245 ----

      /**
!      * parser.setProperty( "http://apache.org/xml/properties/schema/external-schemaLocation",
!      * "http: //domain.com/mynamespace mySchema.xsd");
!      *
       * @param parser
       */
      public void setImportPaths(XMLReader parser)
              throws SAXNotSupportedException, SAXNotRecognizedException {
!         String[] map = CDDLM_MAPPINGS;
!         StringBuffer buffer = new StringBuffer();
          for (int i = 0; i < map.length; i += 2) {
              String schema = map[i];
***************
*** 250,254 ****
              buffer.append(' ');
          }
!         String s=new String(buffer);
          parser.setProperty(SCHEMA_LOCATION, s);
      }
--- 250,254 ----
              buffer.append(' ');
          }
!         String s = new String(buffer);
          parser.setProperty(SCHEMA_LOCATION, s);
      }
***************
*** 256,259 ****
--- 256,260 ----
      /**
       * bind an XML reader to this bunny
+      *
       * @param parser
       */

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

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