From: Steve L. <st...@us...> - 2005-10-25 16:53:18
|
Update of /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv428/src/org/smartfrog/services/deployapi/system Modified Files: Constants.java Utils.java Log Message: moving away from a home rolled QualifiedName to javax.xml.QName. Index: Utils.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/system/Utils.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Utils.java 3 Oct 2005 17:26:17 -0000 1.13 --- Utils.java 25 Oct 2005 16:53:07 -0000 1.14 *************** *** 30,34 **** import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; - import org.ggf.cddlm.utils.QualifiedName; import org.ggf.xbeans.cddlm.cmp.DeploymentFaultType; import org.smartfrog.services.deployapi.binding.NuxStaxBuilder; --- 30,33 ---- *************** *** 38,66 **** import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; ! import javax.xml.stream.XMLInputFactory; ! import java.util.ArrayList; ! import java.util.UUID; ! import java.util.Date; ! import java.io.StringReader; ! import java.io.IOException; ! import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; import java.io.Closeable; import java.io.File; import java.io.FileInputStream; ! import java.io.BufferedInputStream; ! import java.io.InputStreamReader; ! import java.io.StringWriter; import java.io.InputStream; import java.io.OutputStream; - import java.io.FileOutputStream; - import java.io.BufferedOutputStream; - import java.io.Writer; import java.io.OutputStreamWriter; import java.nio.charset.Charset; - import java.text.SimpleDateFormat; import java.text.DateFormat; /** --- 37,65 ---- import javax.xml.namespace.QName; + import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; ! import java.io.BufferedInputStream; ! import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; + import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.File; import java.io.FileInputStream; ! import java.io.FileOutputStream; ! import java.io.IOException; import java.io.InputStream; + import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; + import java.io.StringReader; + import java.io.StringWriter; + import java.io.Writer; import java.nio.charset.Charset; import java.text.DateFormat; + import java.text.SimpleDateFormat; + import java.util.ArrayList; + import java.util.Date; + import java.util.UUID; /** *************** *** 73,85 **** } - /** - * Turn a ggf qualifiedname into a proper java one - * - * @param in - * @return a converted qname - */ - public static QName convert(QualifiedName in) { - return new QName(in.getNamespaceURI(), in.getLocalPart()); - } /** --- 72,75 ---- *************** *** 89,94 **** * @return a converted qname */ ! public static QualifiedName convert(QName in) { ! return new QualifiedName(in.getNamespaceURI(), in.getLocalPart()); } --- 79,84 ---- * @return a converted qname */ ! public static QName convert(QName in) { ! return in; } *************** *** 146,150 **** } ! public static OMElement createOmElement(QualifiedName qname) { OMFactory factory = OMAbstractFactory.getOMFactory(); OMElement element = factory.createOMElement(qname.getLocalPart(), --- 136,140 ---- } ! public static OMElement createOmElement(QName qname) { OMFactory factory = OMAbstractFactory.getOMFactory(); OMElement element = factory.createOMElement(qname.getLocalPart(), Index: Constants.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/system/Constants.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Constants.java 3 Oct 2005 17:26:17 -0000 1.13 --- Constants.java 25 Oct 2005 16:53:07 -0000 1.14 *************** *** 22,27 **** import nu.xom.XPathContext; import org.ggf.cddlm.generated.api.CddlmConstants; - import org.ggf.cddlm.utils.QualifiedName; import java.nio.charset.Charset; --- 22,27 ---- import nu.xom.XPathContext; import org.ggf.cddlm.generated.api.CddlmConstants; + import javax.xml.namespace.QName; import java.nio.charset.Charset; *************** *** 127,132 **** * Internal errors */ ! public static final QualifiedName QNAME_SMARTFROG_INTERNAL_FAULT ! =new QualifiedName(SMARTFROG_NAMESPACE,"internalError"); public static final String WSA_ELEMENT_ADDRESS = "Address"; public static final String WSA_ATTR_PORTNAME = "PortName"; --- 127,132 ---- * Internal errors */ ! public static final QName QNAME_SMARTFROG_INTERNAL_FAULT ! =new QName(SMARTFROG_NAMESPACE,"internalError"); public static final String WSA_ELEMENT_ADDRESS = "Address"; public static final String WSA_ATTR_PORTNAME = "PortName"; |