[Smartfrog-checkins] core/components/deployapi/src/org/smartfrog/services/deployapi/binding Axis2Beans.java,1.9,1.10 DescriptorHelper.java,1.5,1.6 XomHelper.java,1.2,1.3

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

Update of /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/binding
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv428/src/org/smartfrog/services/deployapi/binding

Modified Files:
	Axis2Beans.java DescriptorHelper.java XomHelper.java 
Log Message:
moving away from a home rolled QualifiedName to javax.xml.QName.

Index: XomHelper.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/binding/XomHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XomHelper.java	10 Oct 2005 10:33:46 -0000	1.2
--- XomHelper.java	25 Oct 2005 16:53:06 -0000	1.3
***************
*** 21,33 ****
  package org.smartfrog.services.deployapi.binding;
  
- import org.smartfrog.services.deployapi.transport.faults.FaultRaiser;
- import org.smartfrog.services.deployapi.system.Constants;
- import org.ggf.cddlm.generated.api.CddlmConstants;
- import nu.xom.Element;
  import nu.xom.Attribute;
  import nu.xom.Node;
  import nu.xom.Nodes;
! 
! import javax.xml.namespace.QName;
  
  /** generic xom stuff */
--- 21,31 ----
  package org.smartfrog.services.deployapi.binding;
  
  import nu.xom.Attribute;
+ import nu.xom.Element;
  import nu.xom.Node;
  import nu.xom.Nodes;
! import org.ggf.cddlm.generated.api.CddlmConstants;
! import org.smartfrog.services.deployapi.system.Constants;
! import org.smartfrog.services.deployapi.transport.faults.FaultRaiser;
  
  /** generic xom stuff */

Index: Axis2Beans.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/binding/Axis2Beans.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Axis2Beans.java	30 Sep 2005 23:07:28 -0000	1.9
--- Axis2Beans.java	25 Oct 2005 16:53:06 -0000	1.10
***************
*** 29,36 ****
  import org.apache.xmlbeans.XmlObject;
  import org.apache.xmlbeans.XmlOptions;
- import org.smartfrog.services.deployapi.transport.faults.BaseException;
  import org.smartfrog.services.deployapi.system.Utils;
  
- import javax.xml.stream.XMLStreamException;
  import javax.xml.stream.XMLStreamReader;
  import java.io.IOException;
--- 29,35 ----
  import org.apache.xmlbeans.XmlObject;
  import org.apache.xmlbeans.XmlOptions;
  import org.smartfrog.services.deployapi.system.Utils;
+ import org.smartfrog.services.deployapi.transport.faults.BaseException;
  
  import javax.xml.stream.XMLStreamReader;
  import java.io.IOException;

Index: DescriptorHelper.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/binding/DescriptorHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DescriptorHelper.java	3 Oct 2005 17:26:17 -0000	1.5
--- DescriptorHelper.java	25 Oct 2005 16:53:06 -0000	1.6
***************
*** 21,47 ****
  package org.smartfrog.services.deployapi.binding;
  
! import static org.smartfrog.services.deployapi.system.Constants.*;
! import org.smartfrog.services.deployapi.transport.faults.FaultRaiser;
! import org.smartfrog.services.deployapi.system.Utils;
  import org.smartfrog.services.deployapi.system.Constants;
  import org.smartfrog.services.deployapi.system.DeploymentLanguage;
! import static org.smartfrog.services.deployapi.transport.faults.FaultRaiser.*;
! import java.io.File;
! import java.io.IOException;
! import java.io.OutputStream;
  import java.io.BufferedOutputStream;
  import java.io.FileOutputStream;
  import java.io.InputStream;
  import java.net.URL;
  
- import nu.xom.Element;
- import nu.xom.Attribute;
- import nu.xom.Serializer;
- import nu.xom.Document;
- import nu.xom.Builder;
- import nu.xom.ParsingException;
- import nu.xom.Nodes;
- import nu.xom.Elements;
- 
  /**
  
--- 21,55 ----
  package org.smartfrog.services.deployapi.binding;
  
! import nu.xom.Attribute;
! import nu.xom.Builder;
! import nu.xom.Document;
! import nu.xom.Element;
! import nu.xom.Elements;
! import nu.xom.Nodes;
! import nu.xom.ParsingException;
! import nu.xom.Serializer;
  import org.smartfrog.services.deployapi.system.Constants;
+ import static org.smartfrog.services.deployapi.system.Constants.API_ELEMENT_INITALIZE_REQUEST;
+ import static org.smartfrog.services.deployapi.system.Constants.CHARSET_SF_FILE;
+ import static org.smartfrog.services.deployapi.system.Constants.SMARTFROG_ELEMENT_NAME;
+ import static org.smartfrog.services.deployapi.system.Constants.SMARTFROG_ELEMENT_VERSION_ATTR;
+ import static org.smartfrog.services.deployapi.system.Constants.SMARTFROG_NAMESPACE;
+ import static org.smartfrog.services.deployapi.system.Constants.SMARTFROG_XML_VERSION;
+ import static org.smartfrog.services.deployapi.system.Constants.XML_CDL_NAMESPACE;
  import org.smartfrog.services.deployapi.system.DeploymentLanguage;
! import org.smartfrog.services.deployapi.system.Utils;
! import org.smartfrog.services.deployapi.transport.faults.FaultRaiser;
! import static org.smartfrog.services.deployapi.transport.faults.FaultRaiser.checkArg;
! import static org.smartfrog.services.deployapi.transport.faults.FaultRaiser.raiseBadArgumentFault;
! import static org.smartfrog.services.deployapi.transport.faults.FaultRaiser.raiseUnsupportedLanguageFault;
! 
  import java.io.BufferedOutputStream;
+ import java.io.File;
  import java.io.FileOutputStream;
+ import java.io.IOException;
  import java.io.InputStream;
+ import java.io.OutputStream;
  import java.net.URL;
  
  /**