[jbossws-commits] JBossWS SVN: r7333 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-06-04 08:17:33 -0400 (Wed, 04 Jun 2008)
New Revision: 7333

Modified:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java
Log:
[JBWS-2013] Implement standard message context properties


Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java	2008-06-04 12:03:18 UTC (rev 7332)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java	2008-06-04 12:17:33 UTC (rev 7333)
@@ -71,26 +71,25 @@
       MessageContext msgContext = (MessageContext)wsCtx.getMessageContext();
       if (msgContext == null)
          return "fail";
-      
+
+      // Check standard jaxws properties
+      InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
       QName service = (QName)msgContext.get(MessageContext.WSDL_SERVICE);
+      QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
+      QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
+      QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
+      
       if (!service.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointService")))
          throw new WebServiceException("Invalid qname: " + service);
-      
-      QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
       if (!portType.equals(new QName("http://org.jboss.ws/jaxws/context", "Endpoint")))
          throw new WebServiceException("Invalid qname: " + portType);
-      
-      QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
       if (!port.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointPort")))
          throw new WebServiceException("Invalid qname: " + port);
-      
-      QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
       if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testMessageContextProperties")))
          throw new WebServiceException("Invalid qname: " + operation);
       
       try
       {
-         InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
          Element root = DOMUtils.parse(wsdlSource);
          new DOMWriter(System.out).setPrettyprint(true).print(root);
       }

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java	2008-06-04 12:03:18 UTC (rev 7332)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java	2008-06-04 12:17:33 UTC (rev 7333)
@@ -62,25 +62,24 @@
       if (msgContext == null)
          return "fail";
 
+      // Check standard jaxws properties
+      InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
       QName service = (QName)msgContext.get(MessageContext.WSDL_SERVICE);
+      QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
+      QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
+      QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
+      
       if (!service.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointService")))
          throw new WebServiceException("Invalid qname: " + service);
-
-      QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
       if (!portType.equals(new QName("http://org.jboss.ws/jaxws/context", "Endpoint")))
          throw new WebServiceException("Invalid qname: " + portType);
-
-      QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
       if (!port.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointPort")))
          throw new WebServiceException("Invalid qname: " + port);
-
-      QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
       if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testMessageContextProperties")))
          throw new WebServiceException("Invalid qname: " + operation);
 
       try
       {
-         InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
          Element root = DOMUtils.parse(wsdlSource);
          new DOMWriter(System.out).setPrettyprint(true).print(root);
       }