[jboss-svn-commits] JBL Code SVN: r20285 - in labs/jbosstm/workspace/adinn/wsbrew/src: org/jboss/ws/extensions/addressing/jaxws and 1 other directory.

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

Author: adinn
Date: 2008-06-04 04:54:49 -0400 (Wed, 04 Jun 2008)
New Revision: 20285

Added:
   labs/jbosstm/workspace/adinn/wsbrew/src/javax/xml/ws/Service21.java
Modified:
   labs/jbosstm/workspace/adinn/wsbrew/src/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java
   labs/jbosstm/workspace/adinn/wsbrew/src/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
Log:
modified to provide missing functionality required for running XTS 1.1 code over JBossWS-Metro stack

Added: labs/jbosstm/workspace/adinn/wsbrew/src/javax/xml/ws/Service21.java
===================================================================
--- labs/jbosstm/workspace/adinn/wsbrew/src/javax/xml/ws/Service21.java	                        (rev 0)
+++ labs/jbosstm/workspace/adinn/wsbrew/src/javax/xml/ws/Service21.java	2008-06-04 08:54:49 UTC (rev 20285)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package javax.xml.ws;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+//$Id:$
+
+public class Service21 extends Service
+{
+    protected Service21(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+}

Modified: labs/jbosstm/workspace/adinn/wsbrew/src/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java
===================================================================
--- labs/jbosstm/workspace/adinn/wsbrew/src/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java	2008-06-04 06:23:53 UTC (rev 20284)
+++ labs/jbosstm/workspace/adinn/wsbrew/src/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java	2008-06-04 08:54:49 UTC (rev 20285)
@@ -78,10 +78,11 @@
     public boolean handleMessage(SOAPMessageContext msgContext)
     {
         Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-        if (outbound == null)
-            throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-
-        return outbound ? handleOutbound(msgContext) : handleInbound(msgContext);
+        if (outbound == null || !outbound) {
+            return handleInbound(msgContext);
+        } else {
+            return handleOutbound(msgContext);
+        }
     }
 
     public boolean handleFault(SOAPMessageContext msgContext)
@@ -95,7 +96,7 @@
 
     protected boolean handleOutbound(SOAPMessageContext msgContext)
 	{
-		log.log(Level.INFO, "handleOutbound");
+		// log.log(Level.INFO, "handleOutbound");
 
         SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
 		if (addrProps != null)
@@ -103,10 +104,12 @@
 			SOAPMessage soapMessage = msgContext.getMessage();
             addrProps.writeHeaders(soapMessage);
 
+            /*
             try {
                 soapMessage.writeTo(System.out);
             } catch (Exception e) {
             }
+            */
         }
 		else
 		{
@@ -121,7 +124,7 @@
 
 	protected boolean handleInbound(SOAPMessageContext msgContext)
 	{
-		log.log(Level.INFO, "handleInbound");
+		// log.log(Level.INFO, "handleInbound");
 
 		try
 		{

Modified: labs/jbosstm/workspace/adinn/wsbrew/src/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
===================================================================
--- labs/jbosstm/workspace/adinn/wsbrew/src/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java	2008-06-04 06:23:53 UTC (rev 20284)
+++ labs/jbosstm/workspace/adinn/wsbrew/src/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java	2008-06-04 08:54:49 UTC (rev 20285)
@@ -75,10 +75,11 @@
     public boolean handleMessage(SOAPMessageContext msgContext)
     {
         Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-        if (outbound == null)
-            throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-
-        return outbound ? handleOutbound(msgContext) : handleInbound(msgContext);
+        if (outbound == null || !outbound) {
+            return handleInbound(msgContext);
+        } else {
+            return handleOutbound(msgContext);
+        }
     }
 
     public void close(MessageContext context)
@@ -87,7 +88,7 @@
 
 	protected boolean handleInbound(SOAPMessageContext msgContext)
 	{
-		log.log(Level.INFO, "handleInbound");
+		// log.log(Level.INFO, "handleInbound");
 
 		SOAPAddressingProperties addrProps = (SOAPAddressingProperties)ADDR_BUILDER.newAddressingProperties();
 		SOAPMessage soapMessage = msgContext.getMessage();
@@ -106,7 +107,7 @@
 
 	protected boolean handleOutbound(SOAPMessageContext msgContext)
 	{
-		log.log(Level.INFO, "handleOutbound");
+		// log.log(Level.INFO, "handleOutbound");
 		handleResponseOrFault(msgContext, false);
 		return true;
 	}
@@ -117,7 +118,7 @@
 	 */
 	public boolean handleFault(SOAPMessageContext msgContext)
 	{
-		log.log(Level.INFO, "handleFault");
+		// log.log(Level.INFO, "handleFault");
 		handleResponseOrFault(msgContext, true);
 		return true;
 	}
@@ -140,11 +141,12 @@
 
 		outProps.initializeAsReply(inProps, isFault);
 
-
+        /*
         try {
             soapMessage.writeTo(System.out);
         } catch (Exception e) {
         }
+        */
         /*
          * cannot do this bit but we don't care
 		try
@@ -180,7 +182,7 @@
 		}
          */
 
-        // don't need to do this for glassfish
+        // don't need to do this
         // outProps.writeHeaders(soapMessage);
 	}