[jbossws-commits] JBossWS SVN: r18687 - stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor.

[jbossws-commits at lists.jboss.org]

Author: asoldano
Date: 2014-05-21 05:51:22 -0400 (Wed, 21 May 2014)
New Revision: 18687

Modified:
   stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/WSDLSoapAddressRewriteInterceptor.java
Log:
Fixing compilation error + using proper WSDLGetInterceptor.DOCUMENT_HOLDER key to store the document in the Message for later retrieval in WSDLGetOutInterceptor


Modified: stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/WSDLSoapAddressRewriteInterceptor.java
===================================================================
--- stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/WSDLSoapAddressRewriteInterceptor.java	2014-05-20 20:21:58 UTC (rev 18686)
+++ stack/cxf/branches/rsearls/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/WSDLSoapAddressRewriteInterceptor.java	2014-05-21 09:51:22 UTC (rev 18687)
@@ -1,16 +1,20 @@
 package org.jboss.wsf.stack.cxf.interceptor;
 
+import java.util.Iterator;
+import java.util.Map;
+
 import org.apache.cxf.binding.soap.interceptor.EndpointSelectionInterceptor;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.UrlUtils;
 import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.frontend.WSDLGetInterceptor;
 import org.apache.cxf.frontend.WSDLGetOutInterceptor;
 import org.apache.cxf.frontend.WSDLGetUtils;
-import org.jboss.ws.common.management.AbstractServerConfig;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper;
-import org.jboss.wsf.stack.cxf.interceptor.util.WSDLSoapAddressRewriteUtils;
-import org.apache.cxf.interceptor.*;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.interceptor.MessageSenderInterceptor;
+import org.apache.cxf.interceptor.OutgoingChainInterceptor;
+import org.apache.cxf.interceptor.StaxOutInterceptor;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -19,11 +23,7 @@
 import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
 import org.w3c.dom.Document;
 
-import java.security.AccessController;
-import java.util.Iterator;
-import java.util.Map;
 
-
 /**
  * This is a customization of org.apache.cxf.frontend.WSDLGetInterceptor.  It
  * enables the handling of rewriting the path of a URL.
@@ -32,8 +32,6 @@
 public class WSDLSoapAddressRewriteInterceptor extends AbstractPhaseInterceptor<Message> {
    public static final WSDLSoapAddressRewriteInterceptor INSTANCE =
       new WSDLSoapAddressRewriteInterceptor();
-   public static final String DOCUMENT_HOLDER =
-      WSDLSoapAddressRewriteInterceptor.class.getName() + ".documentHolder";
    private static final String TRANSFORM_SKIP = "transform.skip";
    private Interceptor<Message> wsdlGetOutInterceptor = WSDLGetOutInterceptor.INSTANCE;
 
@@ -70,7 +68,7 @@
          mout.setInterceptorChain(OutgoingChainInterceptor.getOutInterceptorChain(message.getExchange()));
          message.getExchange().setOutMessage(mout);
 
-         mout.put(DOCUMENT_HOLDER, doc);
+         mout.put(WSDLGetInterceptor.DOCUMENT_HOLDER, doc);
          mout.put(Message.CONTENT_TYPE, "text/xml");
 
          // just remove the interceptor which should not be used