1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java Thu Apr 04 19:05:24 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java Tue Apr 09 14:51:13 2013 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -37,12 +37,10 @@ 1.11 import com.sun.xml.internal.ws.addressing.model.InvalidAddressingHeaderException; 1.12 import static com.sun.xml.internal.ws.addressing.W3CAddressingConstants.ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED; 1.13 import static com.sun.xml.internal.ws.addressing.W3CAddressingConstants.ONLY_ANONYMOUS_ADDRESS_SUPPORTED; 1.14 -import com.sun.xml.internal.ws.resources.AddressingMessages; 1.15 import com.sun.istack.internal.NotNull; 1.16 import com.sun.istack.internal.Nullable; 1.17 1.18 import javax.xml.ws.soap.AddressingFeature; 1.19 -import javax.xml.ws.WebServiceException; 1.20 1.21 /** 1.22 * @author Rama Pulavarthi 1.23 @@ -135,57 +133,4 @@ 1.24 } 1.25 } 1.26 1.27 - /* 1.28 - @Override 1.29 - protected boolean isAnonymousRequired(@Nullable WSDLBoundOperation wbo) { 1.30 - return getResponseRequirement(wbo) == AddressingFeature.Responses.ANONYMOUS; 1.31 - } 1.32 - 1.33 - private AddressingFeature.Responses getResponseRequirement(@Nullable WSDLBoundOperation wbo) { 1.34 - if (af.getResponses() == AddressingFeature.Responses.ALL && wbo != null) { 1.35 - //wsaw wsdl binding case will have some value set on wbo 1.36 - WSDLBoundOperation.ANONYMOUS anon = wbo.getAnonymous(); 1.37 - if (wbo.getAnonymous() == WSDLBoundOperation.ANONYMOUS.required) 1.38 - return AddressingFeature.Responses.ANONYMOUS; 1.39 - else if (wbo.getAnonymous() == WSDLBoundOperation.ANONYMOUS.prohibited) 1.40 - return AddressingFeature.Responses.NON_ANONYMOUS; 1.41 - else 1.42 - return AddressingFeature.Responses.ALL; 1.43 - 1.44 - } else 1.45 - return af.getResponses(); 1.46 - } 1.47 - 1.48 - @Override 1.49 - protected void checkAnonymousSemantics(WSDLBoundOperation wbo, WSEndpointReference replyTo, WSEndpointReference faultTo) { 1.50 - String replyToValue = null; 1.51 - String faultToValue = null; 1.52 - 1.53 - if (replyTo != null) 1.54 - replyToValue = replyTo.getAddress(); 1.55 - 1.56 - if (faultTo != null) 1.57 - faultToValue = faultTo.getAddress(); 1.58 - AddressingFeature.Responses responseRequirement = getResponseRequirement(wbo); 1.59 - 1.60 - switch (responseRequirement) { 1.61 - case NON_ANONYMOUS: 1.62 - if (replyToValue != null && replyToValue.equals(addressingVersion.anonymousUri)) 1.63 - throw new InvalidAddressingHeaderException(addressingVersion.replyToTag, ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED); 1.64 - 1.65 - if (faultToValue != null && faultToValue.equals(addressingVersion.anonymousUri)) 1.66 - throw new InvalidAddressingHeaderException(addressingVersion.faultToTag, ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED); 1.67 - break; 1.68 - case ANONYMOUS: 1.69 - if (replyToValue != null && !replyToValue.equals(addressingVersion.anonymousUri)) 1.70 - throw new InvalidAddressingHeaderException(addressingVersion.replyToTag, ONLY_ANONYMOUS_ADDRESS_SUPPORTED); 1.71 - 1.72 - if (faultToValue != null && !faultToValue.equals(addressingVersion.anonymousUri)) 1.73 - throw new InvalidAddressingHeaderException(addressingVersion.faultToTag, ONLY_ANONYMOUS_ADDRESS_SUPPORTED); 1.74 - break; 1.75 - default: 1.76 - // ALL: no check 1.77 - } 1.78 - } 1.79 - */ 1.80 }