tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r591888 - in /openejb/trunk/openejb3/container: openejb-core/src/main/java/org/apache/openejb/config/ openejb-jee/src/main/java/org/apache/openejb/jee/
Date Mon, 05 Nov 2007 06:15:06 GMT
Author: dain
Date: Sun Nov  4 22:15:05 2007
New Revision: 591888

URL: http://svn.apache.org/viewvc?rev=591888&view=rev
Log:
ServiceQName in ServiceRef JaxB element should be type QName and not String

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
    openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=591888&r1=591887&r2=591888&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Sun Nov  4 22:15:05 2007
@@ -1477,10 +1477,10 @@
 
             // service qname
             if (serviceRef.getServiceQname() == null && refType != null) {
-                serviceRef.setServiceQname(JaxWsUtils.getServiceQName(refType).toString());
+                serviceRef.setServiceQname(JaxWsUtils.getServiceQName(refType));
             }
             if (serviceRef.getServiceQname() == null && serviceInterface != null)
{
-                serviceRef.setServiceQname(JaxWsUtils.getServiceQName(serviceInterface).toString());
+                serviceRef.setServiceQname(JaxWsUtils.getServiceQName(serviceInterface));
             }
 
             // handlers

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=591888&r1=591887&r2=591888&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Sun Nov  4 22:15:05 2007
@@ -58,7 +58,6 @@
 import org.apache.openejb.util.Logger;
 import org.apache.openejb.util.Messages;
 
-import javax.xml.namespace.QName;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -233,9 +232,7 @@
         for (ServiceRef ref : jndiConsumer.getServiceRef()) {
             ServiceReferenceInfo info = new ServiceReferenceInfo();
             info.referenceName = ref.getName();
-            if (ref.getServiceQname() != null && ref.getServiceQname().length() !=
0) {
-                info.serviceQName = QName.valueOf(ref.getServiceQname());
-            }
+            info.serviceQName = ref.getServiceQname();
             info.wsdlFile = ref.getWsdlFile();
             info.jaxrpcMappingFile = ref.getJaxrpcMappingFile();
             info.referenceType = ref.getServiceRefType();

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java?rev=591888&r1=591887&r2=591888&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
Sun Nov  4 22:15:05 2007
@@ -106,7 +106,7 @@
                     Set serviceQNames = definition.getServices().keySet();
                     if (serviceQNames.size() == 1) {
                         QName serviceQName = (QName) serviceQNames.iterator().next();
-                        serviceRef.setServiceQname(serviceQName.toString());
+                        serviceRef.setServiceQname(serviceQName);
                     } else if (serviceQNames.isEmpty()) {
                         logger.error("The service-ref " + serviceRef.getName() + " must define
service-qname because the wsdl-file " + serviceRef.getWsdlFile() + " does not constain any
service definitions ");
                     } else {

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java?rev=591888&r1=591887&r2=591888&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
(original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
Sun Nov  4 22:15:05 2007
@@ -26,6 +26,7 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -75,7 +76,7 @@
     @XmlElement(name = "jaxrpc-mapping-file")
     protected String jaxrpcMappingFile;
     @XmlElement(name = "service-qname")
-    protected String serviceQname;
+    protected QName serviceQname;
     @XmlElement(name = "port-component-ref", required = true)
     protected List<PortComponentRef> portComponentRef;
     @XmlElement(required = true)
@@ -174,14 +175,14 @@
     /**
      * Gets the value of the serviceQname property.
      */
-    public String getServiceQname() {
+    public QName getServiceQname() {
         return serviceQname;
     }
 
     /**
      * Sets the value of the serviceQname property.
      */
-    public void setServiceQname(String value) {
+    public void setServiceQname(QName value) {
         this.serviceQname = value;
     }
 



Mime
View raw message