[jboss-cvs] JBossAS SVN: r59828 - in trunk/server/src: resources/dtd and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-01-19 09:36:45 -0500 (Fri, 19 Jan 2007)
New Revision: 59828

Modified:
   trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
   trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
   trunk/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java
   trunk/server/src/resources/dtd/service-ref_5_0.dtd
Log:
Change qname layout in <service-ref> to QName.valueOf()

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-01-19 14:22:44 UTC (rev 59827)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-01-19 14:36:45 UTC (rev 59828)
@@ -22,6 +22,7 @@
 package org.jboss.metamodel.descriptor;
 
 import javax.persistence.PersistenceContextType;
+import javax.xml.namespace.QName;
 
 import org.jboss.logging.Logger;
 import org.jboss.xb.binding.ObjectModelFactory;
@@ -336,7 +337,7 @@
       }
       else if (localName.equals("service-qname"))
       {
-         ref.setServiceQName(navigator.resolveQName(value));
+         ref.setServiceQName(QName.valueOf(value));
       }
       else if (localName.equals("config-name"))
       {
@@ -375,7 +376,7 @@
       }
       else if (localName.equals("port-qname"))
       {
-         portInfo.setPortQName(navigator.resolveQName(value));
+         portInfo.setPortQName(QName.valueOf(value));
       }
       else if (localName.equals("config-name"))
       {

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java	2007-01-19 14:22:44 UTC (rev 59827)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java	2007-01-19 14:36:45 UTC (rev 59828)
@@ -105,11 +105,7 @@
          xml.append("<service-endpoint-interface>" + serviceEndpointInterface + "</service-endpoint-interface>");
 
       if (portQName != null)
-      {
-         String nsDecl = "xmlns:" + portQName.getPrefix() + "='" + portQName.getNamespaceURI() + "'";
-         String qualname = portQName.getPrefix() + ":" + portQName.getLocalPart();
-         xml.append("<port-qname " + nsDecl + ">" + qualname + "</port-qname>");
-      }
+         xml.append("<port-qname>{" + portQName.getNamespaceURI() + "}" + portQName.getLocalPart() + "</port-qname>");
 
       if (configName != null)
          xml.append("<config-name>" + configName + "</config-name>");

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java	2007-01-19 14:22:44 UTC (rev 59827)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java	2007-01-19 14:36:45 UTC (rev 59828)
@@ -122,11 +122,7 @@
          xml.append("<service-class-name>" + serviceClassName + "</service-class-name>");
       
       if (serviceQName != null)
-      {
-         String nsDecl = "xmlns:" + serviceQName.getPrefix() + "='" + serviceQName.getNamespaceURI() + "'";
-         String qualname = serviceQName.getPrefix() + ":" + serviceQName.getLocalPart();
-         xml.append("<service-qname " + nsDecl + ">" + qualname + "</service-qname>");
-      }
+         xml.append("<service-qname>{" + serviceQName.getNamespaceURI() + "}" + serviceQName.getLocalPart() + "</service-qname>");
       
       if (configName != null)
          xml.append("<config-name>" + configName + "</config-name>");

Modified: trunk/server/src/resources/dtd/service-ref_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/service-ref_5_0.dtd	2007-01-19 14:22:44 UTC (rev 59827)
+++ trunk/server/src/resources/dtd/service-ref_5_0.dtd	2007-01-19 14:36:45 UTC (rev 59828)
@@ -32,15 +32,17 @@
   
   <service-ref>
     <service-ref-name>SecureService</service-ref-name>
+      <service-class-name>org.jboss.tests.ws.jaxws.webserviceref.SecureEndpointService</service-class-name>
+      <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
       <port-info>
         <service-endpoint-interface>org.jboss.tests.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
-        <wsdl-port xmlns:ns1='http://helloservice.org/wsdl'>HelloPort</wsdl-port>
+        <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
         <stub-property>
-          <name>javax.xml.ws.security.auth.password</name>
+          <name>javax.xml.ws.security.auth.username</name>
           <value>kermit</value>
         </stub-property>
         <stub-property>
-          <name>javax.xml.ws.security.auth.username</name>
+          <name>javax.xml.ws.security.auth.password</name>
           <value>thefrog</value>
         </stub-property>
     </port-info>
@@ -62,13 +64,12 @@
 
 <!-- 
   The service-qname element declares the specific WSDL service element.
-  Specify the qualified service name in the form prefix:localPart
+  Specify the qualified service name in the form defined by QName.valueOf()
   
   Example: 
-     <service-qname xmlns:nss='http://somensURI'>nss:SomeService</service-qname>
+     <service-qname>{http://somensURI}SomeService</service-qname>
 -->
 <!ELEMENT service-qname (#PCDATA)>
-<!ATTLIST service-qname xmlns:nss CDATA #REQUIRED>
 
 <!-- 
   The optional config-name element gives the client configuration name that must be present in
@@ -112,13 +113,12 @@
 
 <!-- 
   Port used in port-info.  
-  Specify the qualified port name in the form prefix:localPart
+  Specify the qualified port name in the form defined by QName.valueOf()
   
   Example: 
-     <port-qname xmlns:nsp='http://somensURI'>nsp:SomeService</port-qname>
+     <port-qname>{http://somensURI}SomeService</port-qname>
 -->
 <!ELEMENT port-qname (#PCDATA)>
-<!ATTLIST port-qname xmlns:nsp CDATA #REQUIRED>
 
 <!-- 
   Property values that should be set on a stub before it's returned to