[xgws-dev] CVS Update: codes/xsul/java/modules/dsig_globus/xsul/dsig/globus/security/authentication

[Hemapani Srinath Perera]

hperera     06/04/21 16:47:56

  Modified:    xsul/java/modules/dsig_globus/xsul/dsig/globus/security/authentication
                        SOAPBodyIdResolver.java
  Log:
  make our id resolver find id from body as well as first child of body
  
  Revision  Changes    Path
  1.3       +13 -4     codes/xsul/java/modules/dsig_globus/xsul/dsig/globus/security/authentication/SOAPBodyIdResolver.java
  
  Index: SOAPBodyIdResolver.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/dsig_globus/xsul/dsig/globus/security/authentication/SOAPBodyIdResolver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -t -w -r1.2 -r1.3
  --- SOAPBodyIdResolver.java	15 Mar 2005 23:27:38 -0000	1.2
  +++ SOAPBodyIdResolver.java	21 Apr 2006 20:47:56 -0000	1.3
  @@ -83,11 +83,20 @@
           }
   
           if (!id.equals(cId)) {
  +                        selectedElem = (Element)selectedElem.getParentNode();
  +                        cId = selectedElem.getAttributeNS(WSConstants.WSU_NS, "Id");
  +
  +            if ((cId == null) || (cId.length() == 0)) {
  +                cId = selectedElem.getAttributeNS(WSConstants.SOAP_SEC_NS, "id");
  +            }
  +
  +            if (!id.equals(cId)) {
               throw new ResourceResolverException(
                   "generic.EmptyMessage", new Object[] { "Id not found" }, uri,
                   BaseURI
               );
           }
  +        }
   
           try {
               resultNodes =