svn commit: r161086 - in incubator/apollo/trunk/src/java/org/apache/ws/resource: impl/ResourceDefinitionImpl.java tool/Wsdl2Java.java

[scamp]

Author: scamp
Date: Tue Apr 12 11:37:49 2005
New Revision: 161086

URL: http://svn.apache.org/viewcvs?view=rev&rev=161086
Log: (empty)


Modified:
    
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
    incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java

Modified: 
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java?view=diff&r1=161085&r2=161086
==============================================================================
--- 
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
 (original)
+++ 
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/ResourceDefinitionImpl.java
 Tue Apr 12 11:37:49 2005
@@ -24,6 +24,7 @@
 import javax.wsdl.PortType;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.xml.namespace.QName;
 import java.util.List;
 import java.net.URL;
 
@@ -38,14 +39,16 @@
     private Port m_port;
     private String m_name;
     private String m_endpointURL;
+    private QName m_serviceName;
 
-    public ResourceDefinitionImpl(Definition def, javax.wsdl.Port port, URL 
baseUrl)
+    public ResourceDefinitionImpl(Definition def, javax.wsdl.Port port, QName 
serviceName, URL baseUrl)
             throws InvalidWsrfWsdlException
     {
         super( def, getResourcePortType( port ), baseUrl);
         m_port = port;
         m_endpointURL = extractEndpointURL( m_port );
         m_name = m_port.getName();
+        m_serviceName = serviceName;
     }
 
 
@@ -116,4 +119,8 @@
         return endpointURL;
     }
 
+    public QName getServiceName()
+    {
+        return m_serviceName;
+    }
 }

Modified: 
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
URL: 
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?view=diff&r1=161085&r2=161086
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java 
(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java 
Tue Apr 12 11:37:49 2005
@@ -59,6 +59,8 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
+import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
+
 /**
  * Generates Java Web service types and skeletons from a WSRF WSDL.
  *
@@ -203,7 +205,7 @@
             while (iterator.hasNext())
             {
                 Port port = (Port) iterator.next();
-                ResourceDefinition resourceDef = new ResourceDefinitionImpl( 
def, port, wsdlFile.toURL());
+                ResourceDefinition resourceDef = new ResourceDefinitionImpl( 
def, port, service.getQName(), wsdlFile.toURL());
                 File serviceDir = new File( m_outputDir, resourceDef.getName() 
);
                 System.out.println( "Processing WSRF WSDL port \"" + 
resourceDef.getName() + "\"..." );
                 processTemplates( resourceDef, wsdlFile, serviceDir );
@@ -428,6 +430,14 @@
         {
             
props.setNamespaceVersionHolder(org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl.class);
         }
+
+        /** These props are for JIRA Apollo-4 and could be added to context obj
+         *  The question is whether the service name here should be the real 
wsdl
+         * service name or the service name as we use it...
+         * **/
+        String portName = resourceDef.getPort().getName();
+        QName portTypeQName = resourceDef.getPortType().getQName();
+        QName wsdlServiceName = 
((ResourceDefinitionImpl)resourceDef).getServiceName();
 
         return props;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]