[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/corba/security/config/css CSSConfigEditor.java

[djencks]

djencks     2005/03/09 01:00:45

  Modified:    
modules/openejb-builder/src/java/org/openejb/corba/security/config/css
                        CSSConfigEditor.java
  Log:

  keep the list of openorb jars in only one place, and make it complete.  
Convert the C/TSSConfigEditors to xml-attributes.  Fix the tss schema, and the 
xml in that schema.
  
  Revision  Changes    Path
  1.2       +38 -15    
openejb/modules/openejb-builder/src/java/org/openejb/corba/security/config/css/CSSConfigEditor.java
  
  Index: CSSConfigEditor.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/corba/security/config/css/CSSConfigEditor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CSSConfigEditor.java      8 Mar 2005 20:58:43 -0000       1.1
  +++ CSSConfigEditor.java      9 Mar 2005 06:00:45 -0000       1.2
  @@ -44,28 +44,51 @@
    */
   package org.openejb.corba.security.config.css;
   
  -import org.apache.geronimo.common.propertyeditor.TextPropertyEditorSupport;
  -import org.apache.geronimo.common.propertyeditor.PropertyEditorException;
  -
  -import org.openejb.xbeans.csiv2.css.CSSCssDocument;
  +import org.apache.geronimo.common.DeploymentException;
  +import org.apache.geronimo.deployment.service.XmlAttributeBuilder;
  +import org.apache.geronimo.gbean.GBeanInfo;
  +import org.apache.geronimo.gbean.GBeanInfoBuilder;
  +import org.apache.geronimo.schema.SchemaConversionUtils;
  +import org.apache.xmlbeans.XmlObject;
  +import org.apache.xmlbeans.XmlException;
   import org.openejb.xbeans.csiv2.css.CSSCssType;
   
   
   /**
    * @version $Revision$ $Date$
    */
  -public class CSSConfigEditor extends TextPropertyEditorSupport {
  +public class CSSConfigEditor implements XmlAttributeBuilder {
  +    private static final String NAMESPACE = 
"http://www.openejb.org/xml/ns/corba-css-config_1_0";;
   
  -    public Object getValue() {
  -        CSSConfig cssConfig = new CSSConfig();
  -        try {
  -            CSSCssDocument document = 
CSSCssDocument.Factory.parse(super.getAsText());
  -            CSSCssType tss = document.getCss();
  +    public String getNamespace() {
  +        return NAMESPACE;
  +    }
   
  -        } catch (Exception e) {
  -            throw new PropertyEditorException("Unable to parse property", e);
  +    public Object getValue(XmlObject xmlObject, String type, ClassLoader cl) 
throws DeploymentException {
  +        CSSCssType css;
  +        if (xmlObject instanceof CSSCssType) {
  +            css =  (CSSCssType) xmlObject;
  +        }
  +        css = (CSSCssType) xmlObject.copy().changeType(CSSCssType.type);
  +        try {
  +            SchemaConversionUtils.validateDD(css);
  +        } catch (XmlException e) {
  +            throw new DeploymentException(e);
           }
   
  -        return cssConfig;
  +        return css;
       }
  +
  +    public static final GBeanInfo GBEAN_INFO;
  +
  +    static {
  +        GBeanInfoBuilder infoBuilder = new 
GBeanInfoBuilder(CSSConfigEditor.class, "XmlAttributeBuilder");
  +        infoBuilder.addInterface(XmlAttributeBuilder.class);
  +        GBEAN_INFO = infoBuilder.getBeanInfo();
  +    }
  +
  +    public static GBeanInfo getGBeanInfo() {
  +        return GBEAN_INFO;
  +    }
  +
   }