[Smartfrog-checkins] core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl CdlCatalog.java,1.11,1.12 Constants.java,1.7,1.8

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13649/extras/cdl/src/org/smartfrog/sfcore/languages/cdl

Modified Files:
	CdlCatalog.java Constants.java 
Log Message:
changes to match changes in deployment test suite. These tests are now successfully failing

Index: Constants.java
===================================================================
RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/Constants.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Constants.java	14 Sep 2005 16:40:39 -0000	1.7
--- Constants.java	2 Dec 2005 18:00:08 -0000	1.8
***************
*** 33,36 ****
--- 33,38 ----
  
  
+     public static final String XML_NAMESPACE_URI="http://www.w3.org/2000/xmlns/";
+ 
      public static final String DEPLOY_API_SCHEMA_FILENAME =
              CddlmConstants.CDL_FILENAME_DEPLOYMENT_API;

Index: CdlCatalog.java
===================================================================
RCS file: /cvsroot/smartfrog/core/extras/cdl/src/org/smartfrog/sfcore/languages/cdl/CdlCatalog.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CdlCatalog.java	14 Sep 2005 16:40:39 -0000	1.11
--- CdlCatalog.java	2 Dec 2005 18:00:08 -0000	1.12
***************
*** 45,53 ****
  public class CdlCatalog extends XmlCatalogResolver {
  
!     protected static final String PACKAGE_BASE = "org/ggf/cddlm/";
      /**
       * where all the WSRF files really live {@value}
       */
!     private static final String WSRF_PACKAGE = PACKAGE_BASE
              + CddlmConstants.XML_FILENAME_WSRF_DIRECTORY;
  
--- 45,53 ----
  public class CdlCatalog extends XmlCatalogResolver {
  
!     public static final String PACKAGE_BASE = "org/ggf/cddlm/";
      /**
       * where all the WSRF files really live {@value}
       */
!     public  static final String WSRF_PACKAGE = PACKAGE_BASE
              + CddlmConstants.XML_FILENAME_WSRF_DIRECTORY;
  
***************
*** 55,72 ****
       * where the API files really live {@value}
       */
!     private static final String API_PACKAGE = PACKAGE_BASE
              + CddlmConstants.CDL_FILENAME_XML_DIRECTORY;
  
  
      /**
       * This maps from namespaces to resources in our classpath {@value}
       */
      private static final String CDDLM_MAPPINGS[] = {
!         CddlmConstants.XML_CDL_NAMESPACE, API_PACKAGE +
!             CddlmConstants.CDL_FILENAME_XML_CDL,
!         CddlmConstants.CDL_API_TYPES_NAMESPACE, API_PACKAGE +
!             Constants.DEPLOY_API_SCHEMA_FILENAME,
!         CddlmConstants.WS_ADDRESSING_NAMESPACE, WSRF_PACKAGE +
!             CddlmConstants.XML_FILENAME_WS_ADDRESSING,
      };
  
--- 55,75 ----
       * where the API files really live {@value}
       */
!     public static final String API_PACKAGE = PACKAGE_BASE
              + CddlmConstants.CDL_FILENAME_XML_DIRECTORY;
  
  
+     public static final String RESOURCE_XML_CDL_XSD = API_PACKAGE +
+        CddlmConstants.CDL_FILENAME_XML_CDL;
+     public static final String RESOURCE_DEPLOYAPI_XSD = API_PACKAGE +
+        Constants.DEPLOY_API_SCHEMA_FILENAME;
+     public static final String RESOURCE_WS_ADDR_XSD = WSRF_PACKAGE +
+        CddlmConstants.XML_FILENAME_WS_ADDRESSING;
      /**
       * This maps from namespaces to resources in our classpath {@value}
       */
      private static final String CDDLM_MAPPINGS[] = {
!         CddlmConstants.XML_CDL_NAMESPACE, RESOURCE_XML_CDL_XSD,
!         CddlmConstants.CDL_API_TYPES_NAMESPACE, RESOURCE_DEPLOYAPI_XSD,
!         CddlmConstants.WS_ADDRESSING_NAMESPACE, RESOURCE_WS_ADDR_XSD,
      };