11:18 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-03-04 12:18:14 -0500 (Sun, 04 Mar 2007)
New Revision: 2518
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/annotation/WebContext.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
Log:
[JBCTS-544] Binding.getHandlerChain() expected to return a modifyable list
Modified: trunk/jbossws-core/src/java/org/jboss/ws/annotation/WebContext.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/annotation/WebContext.java 2007-03-04
15:31:41 UTC (rev 2517)
+++ trunk/jbossws-core/src/java/org/jboss/ws/annotation/WebContext.java 2007-03-04
17:18:14 UTC (rev 2518)
@@ -85,11 +85,11 @@
String transportGuarantee() default "";
/**
- * A secure endpoint does not by default publish it's wsdl on an unsecure
transport.
- * You can override this behaviour by explicitly setting the secureWSDLAccess flag to
false.
+ * A secure endpoint does not secure wsdl access by default.
+ * Explicitly setting secureWSDLAccess overrides this behaviour.
*
* Protect access to WSDL. See http://jira.jboss.org/jira/browse/JBWS-723
*/
- boolean secureWSDLAccess() default true;
+ boolean secureWSDLAccess() default false;
}
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
===================================================================
---
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-04
15:31:41 UTC (rev 2517)
+++
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-04
17:18:14 UTC (rev 2518)
@@ -178,11 +178,11 @@
validHandlerChain = true;
handlerChain = resource;
}
-
- if (validHandlerChain == false)
- throw new IllegalStateException("Cannot find handler chain: "
+ handlerChain);
}
+ if (validHandlerChain == false)
+ throw new IllegalStateException("Cannot find handler chain: " +
handlerChain);
+
usRef.setHandlerChain(handlerChain);
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
===================================================================
---
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-03-04
15:31:41 UTC (rev 2517)
+++
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-03-04
17:18:14 UTC (rev 2518)
@@ -24,7 +24,6 @@
// $Id: $
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.xml.ws.handler.Handler;
@@ -61,7 +60,10 @@
if (handlerType == HandlerType.POST || handlerType == HandlerType.ALL)
handlerChain.addAll(postHandlerChain);
- return Collections.unmodifiableList(handlerChain);
+ log.warn("[JBCTS-544] - Binding.getHandlerChain() expected to return a
modifyable list");
+ // return Collections.unmodifiableList(handlerChain);
+
+ return handlerChain;
}
public void setHandlerChain(List<Handler> handlerChain, HandlerType
handlerType)
@@ -87,13 +89,15 @@
public List<Handler> getHandlerChain()
{
- if(log.isDebugEnabled()) log.debug("getHandlerChain: " +
jaxwsHandlerChain);
- return Collections.unmodifiableList(jaxwsHandlerChain);
+ log.warn("[JBCTS-544] - Binding.getHandlerChain() expected to return a
modifyable list");
+ // return Collections.unmodifiableList(handlerChain);
+
+ return jaxwsHandlerChain;
}
public void setHandlerChain(List<Handler> handlerChain)
{
- if(log.isDebugEnabled()) log.debug("setHandlerChain: " + handlerChain);
+ log.debug("setHandlerChain: " + handlerChain);
jaxwsHandlerChain.clear();
jaxwsHandlerChain.addAll(handlerChain);
}
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
---
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-03-04
15:31:41 UTC (rev 2517)
+++
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-03-04
17:18:14 UTC (rev 2518)
@@ -62,7 +62,7 @@
// The optional transport guarantee
private String transportGuarantee;
// The optional secure wsdl access
- private Boolean secureWSDLAccess;
+ private boolean secureWSDLAccess;
// The bean that registers with the ServiceEndpointManager
private String managedEndpointBean =
"org.jboss.ws.core.server.ServiceEndpoint";
@@ -163,19 +163,12 @@
this.transportGuarantee = transportGuarantee;
}
- public Boolean isSecureWSDLAccess()
+ public boolean isSecureWSDLAccess()
{
- // For backward compatiblity we leave wsdl access for jaxrpc endpoints unprotected
- if (secureWSDLAccess == null)
- {
- secureWSDLAccess = (getType() == Type.JAXWS);
- log.debug("Using default for secure wsdl access: " +
secureWSDLAccess);
- }
-
return secureWSDLAccess;
}
- public void setSecureWSDLAccess(Boolean secureWSDLAccess)
+ public void setSecureWSDLAccess(boolean secureWSDLAccess)
{
this.secureWSDLAccess = secureWSDLAccess;
}